From 591c154984ba89c2fe2a39ab5c280a69bb18957a Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 18 Jul 2005 18:42:36 +0000 Subject: [PATCH] removed old uix.css code cleanups git-svn-id: http://svn.opengroupware.org/SOGo/trunk@804 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/Common/ChangeLog | 21 ++- SOGo/UI/Common/UIxPageFrame.m | 3 +- SOGo/UI/Common/UIxPrintPageFrame.m | 16 +- SOGo/UI/Common/UIxSortButton.m | 12 +- SOGo/UI/Common/UIxTabItem.m | 2 +- SOGo/UI/Common/UIxTabView.h | 3 +- SOGo/UI/Common/UIxWinClose.m | 17 +- SOGo/UI/Common/uix.css | 245 --------------------------- SOGo/UI/SOGoUI/UIxComponent.m | 10 +- SOGo/UI/WebServerResources/ChangeLog | 5 + SOGo/UI/WebServerResources/uix.css | 7 + 11 files changed, 50 insertions(+), 291 deletions(-) delete mode 100644 SOGo/UI/Common/uix.css diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog index b0ba614d..cbcfe033 100644 --- a/SOGo/UI/Common/ChangeLog +++ b/SOGo/UI/Common/ChangeLog @@ -1,13 +1,17 @@ -2005-07-14 Marcus Mueller +2005-07-18 Helge Hess - * v0.9.42 - - * calendar.css: further refined new css + * v0.9.43 + + * various minor code cleanups + + * removed deprecated uix.css (lives in WebServerResources!) - * v0.9.41 +2005-07-14 Marcus Mueller + + * calendar.css: further refined new css (v0.9.42) * calendar.css, uix.css: added homepagefont and added 'title' class - to use in the scheduler overview + to use in the scheduler overview (v0.9.41) 2005-07-13 Marcus Mueller @@ -19,12 +23,11 @@ * v0.9.39 * UIxPageFrame.m: added new - + * English.lproj/Localizable.strings: added new 'Home' and 'Administration' labels - * v0.9.38 - - * English.lproj/Localizable.strings: added new 'Help' label + * English.lproj/Localizable.strings: added new 'Help' label (v0.9.38) 2005-07-05 Marcus Mueller diff --git a/SOGo/UI/Common/UIxPageFrame.m b/SOGo/UI/Common/UIxPageFrame.m index 6c935e08..b3a96731 100644 --- a/SOGo/UI/Common/UIxPageFrame.m +++ b/SOGo/UI/Common/UIxPageFrame.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 SKYRIX Software AG + Copyright (C) 2004-2005 SKYRIX Software AG This file is part of OpenGroupware.org. @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include diff --git a/SOGo/UI/Common/UIxPrintPageFrame.m b/SOGo/UI/Common/UIxPrintPageFrame.m index f72b2078..d1aaf0e4 100644 --- a/SOGo/UI/Common/UIxPrintPageFrame.m +++ b/SOGo/UI/Common/UIxPrintPageFrame.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2004 SKYRIX Software AG + Copyright (C) 2000-2005 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,8 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ - #include @@ -35,17 +33,17 @@ @implementation UIxPrintPageFrame - (void)dealloc { - [self->title release]; - [super dealloc]; + [self->title release]; + [super dealloc]; } /* accessors */ - (void)setTitle:(NSString *)_value { - ASSIGN(self->title, _value); + ASSIGNCOPY(self->title, _value); } - (NSString *)title { - return self->title; + return self->title; } -@end +@end /* UIxPrintPageFrame */ diff --git a/SOGo/UI/Common/UIxSortButton.m b/SOGo/UI/Common/UIxSortButton.m index 931c4e55..fb4d3351 100644 --- a/SOGo/UI/Common/UIxSortButton.m +++ b/SOGo/UI/Common/UIxSortButton.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 SKYRIX Software AG + Copyright (C) 2004-2005 SKYRIX Software AG This file is part of OpenGroupware.org. @@ -18,16 +18,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: UIxSortButton.m 59 2004-06-22 13:40:19Z znek $ -#include +#include @interface UIxSortButton : WOComponent -{ -} - @end - @implementation UIxSortButton -@end +@end /* UIxSortButton */ + diff --git a/SOGo/UI/Common/UIxTabItem.m b/SOGo/UI/Common/UIxTabItem.m index 70add19d..28f40889 100644 --- a/SOGo/UI/Common/UIxTabItem.m +++ b/SOGo/UI/Common/UIxTabItem.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2004 SKYRIX Software AG + Copyright (C) 2000-2005 SKYRIX Software AG This file is part of OpenGroupware.org. diff --git a/SOGo/UI/Common/UIxTabView.h b/SOGo/UI/Common/UIxTabView.h index 8224b442..a2e6a1f1 100644 --- a/SOGo/UI/Common/UIxTabView.h +++ b/SOGo/UI/Common/UIxTabView.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2004 SKYRIX Software AG + Copyright (C) 2000-2005 SKYRIX Software AG This file is part of OpenGroupware.org. @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #ifndef __UIxTabView_H__ #define __UIxTabView_H__ diff --git a/SOGo/UI/Common/UIxWinClose.m b/SOGo/UI/Common/UIxWinClose.m index e8320e69..b93f91f6 100644 --- a/SOGo/UI/Common/UIxWinClose.m +++ b/SOGo/UI/Common/UIxWinClose.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2004 SKYRIX Software AG + Copyright (C) 2000-2005 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,20 +18,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ - - -#include +#include @interface UIxWinClose : WOComponent -{ - -} - @end - @implementation UIxWinClose - -@end +@end /* UIxWinClose */ diff --git a/SOGo/UI/Common/uix.css b/SOGo/UI/Common/uix.css deleted file mode 100644 index 0c5e2be4..00000000 --- a/SOGo/UI/Common/uix.css +++ /dev/null @@ -1,245 +0,0 @@ -/* SOGo UI Stylesheet */ - -/* common stuff */ - -body { - color: #000000; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - font-size: 10pt; - background-color: #FFFFFF; - margin: 0px; - margin-top: 0px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; -} - -a:link { - color: #0033CC; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - text-decoration: none; -} -a:visited { - color: #660066; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - text-decoration: none; -} -a:hover { - color: #FF0000; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - text-decoration: underline; -} - -.linecolor { - background-color: #06348B; -} - -.defaultfont { - text-decoration: none; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - font-size: 8pt; - color: #000000; -} - -.window_label { - color: #06348b; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - font-size: 12pt; - font-weight: bold; -} - -.homepagefont { - text-decoration: none; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - font-size: 10pt; - color: #000000; -} - - -/* tabs */ - -.tab { - color: #000000; - background-color: #e8e8e0; - font-size: 10pt; - text-decoration: none; - width: 100px; - height: 22px; - border-top: 1px solid #06348b; - border-right: 1px solid #06348b; -} - -.tab a { - color: #000000; - border: none; - text-decoration: none; -} - -.tab_selected { - color: #000000; - background-color: #f5f5e9; - font-size: 10pt; - text-decoration: none; - font-weight: bold; - width: 100px; - height: 22px; - border-top: 1px solid #06348b; - border-right: 1px solid #06348b; -} - -.tab_selected a { - color: #000000; - border: none; - text-decoration: none; -} - -.tabview_body { - background-color: #f5f5e9; -} - - -/* buttons */ - -.button_auto_env { - height: 16px; - text-align: center; - vertical-align: middle; - padding: 0px 0px 0px 0px; - margin: 0px 0px 0px 0px; - overflow: hidden; -} - -.button_auto_env a { - text-decoration: none; - color: #000000; -} - -.button_auto_env a:hover { - text-decoration: underline; - color: #ff0000; -} - -.button_auto { - height: 20px; - border-style: outset; - border-color: #DDDDDD; - border-width: 2px; - color: #000000; - background-color: #e8e8e0; - font-size: 8pt; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - letter-spacing: 0pt; - text-decoration: none; - text-color: #000000; - text-align: center; - vertical-align: middle; - padding-left: 5px; - padding-right: 5px; - padding-top: 1px; - padding-bottom: 1px; - overflow: hidden; -} - -.button_submit_env { - height: 24px; - text-align: center; - vertical-align: middle; - padding: 0px 0px 0px 0px; - margin: 0px 0px 0px 0px; - overflow: hidden; -} - -.button_submit_env a { - text-decoration: none; - color: #000000; -} - -.button_submit_env a:hover { - text-decoration: underline; - color: #ff0000; -} - -.button_submit { - height: 30px; - border-style: outset; - border-color: #DDDDDD; - border-width: 2px; - color: #000000; - background-color: #e8e8e0; - font-size: 8pt; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - letter-spacing: 0pt; - text-decoration: none; - text-color: #000000; - text-align: center; - vertical-align: middle; - padding-left: 5px; - padding-right: 5px; - padding-top: 2px; - padding-bottom: 3px; - overflow: hidden; -} - -/* header */ - -div#header { - margin-left: 5px; - margin-right: 5px; - padding: 0; - border-bottom: 1px solid #000000; -} -div#header img.headerlogo { - float: right; - width: 182px; - height: 30px; -} - -div#header div#headerhistory { - font-size: 11px; - color: #000000; - margin: 0px; - padding-top: 18px; - height: 12px; -} -div#header a, div#header span { - margin: 0px; -} -div#header span#navtitle { - font-weight: bold; -} -div#header a:hover { - text-decoration: none; -} - -/* the dock */ - -a.skydockfont { - text-decoration: none; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - font-size: 8pt; - color: #06348B; -} -font.skydockfont { - text-decoration: none; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - font-size: 8pt; - color: #06348B; -} -font.skydockfont_inactiveMail { - text-decoration: none; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - font-size: 8pt; - color: #CCCCCC; - font-weight: bold; -} -font.skydockfont_newMail { - text-decoration: none; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - font-size: 8pt; - color: #06348B; - font-weight: bold; -} -table.skytextdocktable { - padding: 0px; - table-layout: auto; -} diff --git a/SOGo/UI/SOGoUI/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m index 246ccc22..87dfae95 100644 --- a/SOGo/UI/SOGoUI/UIxComponent.m +++ b/SOGo/UI/SOGoUI/UIxComponent.m @@ -111,7 +111,7 @@ static BOOL uixDebugEnabled = NO; NSString *part; e = [[_s componentsSeparatedByString:@"&"] objectEnumerator]; - while ((part = [e nextObject])) { + while ((part = [e nextObject]) != nil) { NSRange r; NSString *key, *value; @@ -129,6 +129,8 @@ static BOOL uixDebugEnabled = NO; [self->queryParameters setObject:value forKey:key]; } } +- (void)addKeepAliveFormValuesToQueryParameters { +} - (NSString *)queryParameterForKey:(NSString *)_key { return [[self _queryParameters] objectForKey:_key]; @@ -163,7 +165,11 @@ static BOOL uixDebugEnabled = NO; qs = [uri substringFromIndex:NSMaxRange(r)]; [self _parseQueryString:qs]; - } + } + + /* add form values */ + [self addKeepAliveFormValuesToQueryParameters]; + return self->queryParameters; } diff --git a/SOGo/UI/WebServerResources/ChangeLog b/SOGo/UI/WebServerResources/ChangeLog index 2fe5564f..574cdefc 100644 --- a/SOGo/UI/WebServerResources/ChangeLog +++ b/SOGo/UI/WebServerResources/ChangeLog @@ -1,3 +1,8 @@ +2005-07-18 Helge Hess + + * uix.css: added .homepagefont class (as it was used in the deprecated + uix.css inside Common + 2005-07-12 Helge Hess * mailer.js: increased size of compose panel by 40px to avoid scrolling diff --git a/SOGo/UI/WebServerResources/uix.css b/SOGo/UI/WebServerResources/uix.css index 9f1a5f8b..3df8746a 100644 --- a/SOGo/UI/WebServerResources/uix.css +++ b/SOGo/UI/WebServerResources/uix.css @@ -48,6 +48,13 @@ a:hover { font-weight: bold; } +.homepagefont { + text-decoration: none; + font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; + font-size: 10pt; + color: #000000; +} + /* tabs */ -- 2.39.5