From 1a5e4b7ccdab40db6e4e792866dd7e320d17456f Mon Sep 17 00:00:00 2001 From: znek Date: Fri, 23 Jul 2004 10:56:08 +0000 Subject: [PATCH] complete style for yearoverview and accompanied fixes git-svn-id: http://svn.opengroupware.org/SOGo/trunk@154 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SOGo.xcode/project.pbxproj | 6 +- SOGo/UI/Common/ChangeLog | 5 + SOGo/UI/Common/calendar.css | 120 +++++++++++++++++- SOGo/UI/Scheduler/ChangeLog | 14 ++ SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m | 8 ++ .../Scheduler/UIxCalInlineMonthOverview.wox | 3 +- SOGo/UI/Scheduler/UIxCalYearOverview.m | 7 +- SOGo/UI/Scheduler/UIxCalYearOverview.wox | 34 +++-- SOGo/UI/Scheduler/Version | 2 +- 9 files changed, 177 insertions(+), 22 deletions(-) diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj index 3eaa5a1c..d26e6488 100644 --- a/SOGo/SOGo.xcode/project.pbxproj +++ b/SOGo/SOGo.xcode/project.pbxproj @@ -656,10 +656,10 @@ }; E87206C30692E3D10099CBBD = { children = ( - E87207470692E3D20099CBBD, - E87207480692E3D20099CBBD, E87207490692E3D20099CBBD, + E87207470692E3D20099CBBD, E87207C40692E3D20099CBBD, + E87207480692E3D20099CBBD, E87207E70692E3D20099CBBD, E87207E60692E3D20099CBBD, E8720A490692E4CE0099CBBD, @@ -695,6 +695,8 @@ path = ChangeLog; refType = 4; sourceTree = ""; + tabWidth = 4; + usesTabs = 1; }; E872074A0692E3D20099CBBD = { fileEncoding = 4; diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog index 3ebb328b..40abc928 100644 --- a/SOGo/UI/Common/ChangeLog +++ b/SOGo/UI/Common/ChangeLog @@ -1,3 +1,8 @@ +2004-07-21 Marcus Mueller + + * calendar.css: complete style for 'yearoverview' and fixed style in + 'monthoverview'. + 2004-07-16 Helge Hess * UIxAppNavView.m: some fixes to navigation URLs diff --git a/SOGo/UI/Common/calendar.css b/SOGo/UI/Common/calendar.css index 34553bb4..94e4f3d7 100644 --- a/SOGo/UI/Common/calendar.css +++ b/SOGo/UI/Common/calendar.css @@ -132,39 +132,42 @@ font-size: 9pt; height: 60; } - .monthoverview_content a { font-style: italic; font-weight: bold; } - .monthoverview_content td { - text-align: let; + text-align: left; vertical-align: top; } - .monthoverview_content_hilite { background-color: #fffff0; font-size: 9pt; height: 60; } - .monthoverview_content_hilite a { font-style: italic; font-weight: bold; } +.monthoverview_content_hilite td { + text-align: left; + vertical-align: top; +} .monthoverview_content_dimmed { background-color: #d2d2cc; font-size: 9pt; height: 60; } - .monthoverview_content_dimmed a { font-style: normal; font-weight: normal; } +.monthoverview_content_dimmed td { + text-align: left; + vertical-align: top; +} .monthoverview_day a { color: #000000; @@ -187,3 +190,108 @@ font-style: normal; font-weight: normal; } + + +.yearoverview { + color: #000000; + font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; + font-size: 10pt; + letter-spacing: 0pt; + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; +} + +.yearoverview table { + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; +} + +.yearoverview td { + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; +} + +.yearoverview a { + color: #000000; + font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; + font-size: 10pt; + letter-spacing: 0pt; + padding: 0px; + text-decoration: none; +} +.yearoverview a:hover { + text-decoration: underline; +} + +.yearoverview_title { + background-color: #d2d2cc; + text-align: center; + font-size: 10pt; + font-weight: bold; + letter-spacing: 0pt; +} + +.yearoverview_day_header { + background-color: #d2d2cc; + text-align: center; + vertical-align: middle; + font-size: 10pt; + width: 18px; /* this delimits all td's! */ +} + +.yearoverview_content { + color: #0033cc; + background-color: #e8e8e0; + text-align: center; + vertical-align: middle; + font-weight: bold; + font-style: italic; +} +.yearoverview_content a { + color: #0033cc; +} +.yearoverview_content a:hover { + color: #ff0000; +} + +.yearoverview_content_hilite { + color: #0033cc; + background-color: #fffff0; + text-align: center; + vertical-align: middle; + font-weight: bold; + font-style: italic; +} +.yearoverview_content_hilite a { + color: #0033cc; +} +.yearoverview_content_hilite a:hover { + color: #ff0000; +} + +.yearoverview_content_dimmed { + color: #0033cc; + background-color: #d2d2cc; + text-align: center; + vertical-align: middle; +} +.yearoverview_content_dimmed a { + color: #0033cc; +} +.yearoverview_content_dimmed a:hover { + color: #ff0000; +} + +.yearoverview_week { + background-color: #d2d2cc; + width: 16pt; + text-align: center; + vertical-align: middle; +} + +.yearoverview_week_hilite { + background-color: #fffff0; + width: 16pt; + text-align: center; + vertical-align: middle; +} diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 1681d01e..bce60ab0 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,17 @@ +2004-07-21 Marcus Mueller + + * v0.9.5 + + * UIxCalInlineMonthOverview.m: new "style" binding for setting the global + style all elements will inherit from. Makes styling much easier. + + * UIxCalYearOverview.wox: uses all appropriate styles now. Slight fixes + to alignment. + + * UIxCalInlineMonthOverview.wox: uses new "style" binding and fixes a bug + + * UIxCalYearOverview.m: fixed warnings. + 2004-07-21 Marcus Mueller * v0.9.4 diff --git a/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m b/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m index cc6fa7b7..6eebf485 100644 --- a/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m +++ b/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m @@ -28,6 +28,7 @@ @interface UIxCalInlineMonthOverview : UIxCalMonthOverview { NSCalendarDate *selectedDate; + NSString *style; NSString *headerStyle; NSString *weekStyle; NSString *todayWeekStyle; @@ -50,6 +51,7 @@ - (void)dealloc { [self->selectedDate release]; + [self->style release]; [self->headerStyle release]; [self->weekStyle release]; [self->todayWeekStyle release]; @@ -73,6 +75,12 @@ - (NSCalendarDate *)selectedDate { return self->selectedDate; } +- (void)setStyle:(NSString *)_style { + ASSIGN(self->style, _style); +} +- (NSString *)style { + return self->style; +} - (void)setHeaderStyle:(NSString *)_style { ASSIGN(self->headerStyle, _style); } diff --git a/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.wox b/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.wox index 5414385f..6aa83379 100644 --- a/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.wox +++ b/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.wox @@ -5,6 +5,7 @@ xmlns:const="http://www.skyrix.com/od/constant" xmlns:rsrc="OGo:url" xmlns:label="OGo:label" + var:class="style" > @@ -33,7 +34,7 @@ #include +#include @interface UIxCalYearOverview : UIxComponent @@ -76,7 +77,7 @@ NSCalendarDate *startDate; NSMutableArray *result, *tmp; unsigned rowIdx, columnIdx; - int month = 0; + int monthOffset = 0; startDate = [self startDate]; result = [[NSMutableArray alloc] initWithCapacity:3]; @@ -86,10 +87,10 @@ NSCalendarDate *date; date = [startDate dateByAddingYears:0 - months:month + months:monthOffset days:0]; [tmp addObject:date]; - month++; + monthOffset++; } [result addObject:tmp]; [tmp release]; diff --git a/SOGo/UI/Scheduler/UIxCalYearOverview.wox b/SOGo/UI/Scheduler/UIxCalYearOverview.wox index 5a36f29f..3e24d92f 100644 --- a/SOGo/UI/Scheduler/UIxCalYearOverview.wox +++ b/SOGo/UI/Scheduler/UIxCalYearOverview.wox @@ -1,10 +1,11 @@ - @@ -13,7 +14,11 @@
+ @@ -52,7 +57,7 @@ >
-
- + @@ -73,7 +86,10 @@ - +
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 38b76bc3..86b0e4dd 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,5 +1,5 @@ # $Id$ -SUBMINOR_VERSION:=4 +SUBMINOR_VERSION:=5 # 1.1.0 requires NGObjWeb 4.2.202 -- 2.39.5