From d70e81c42593174cab67f0c8abaeda99950ea92b Mon Sep 17 00:00:00 2001 From: znek Date: Thu, 21 Jul 2005 16:41:34 +0000 Subject: [PATCH] Reworked CSS stuff for appointments - this is much more logical now git-svn-id: http://svn.opengroupware.org/SOGo/trunk@885 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SOGo.xcodeproj/project.pbxproj | 69 ++---------------- SOGo/UI/Scheduler/ChangeLog | 14 ++++ SOGo/UI/Scheduler/UIxCalInlineAptView.m | 40 +++++++++-- SOGo/UI/Scheduler/UIxCalMonthOverview.m | 3 +- SOGo/UI/Scheduler/UIxCalView.m | 2 - SOGo/UI/Scheduler/Version | 2 +- SOGo/UI/Templates/ChangeLog | 3 + SOGo/UI/Templates/UIxCalDayChartview.wox | 6 +- SOGo/UI/Templates/UIxCalDayListview.wox | 6 +- SOGo/UI/Templates/UIxCalDayOverview.wox | 8 +-- SOGo/UI/Templates/UIxCalMonthOverview.wox | 6 +- SOGo/UI/WebServerResources/calendar.css | 87 ++++++++++++++--------- 12 files changed, 124 insertions(+), 122 deletions(-) diff --git a/SOGo/SOGo.xcodeproj/project.pbxproj b/SOGo/SOGo.xcodeproj/project.pbxproj index ff254036..75d50af9 100644 --- a/SOGo/SOGo.xcodeproj/project.pbxproj +++ b/SOGo/SOGo.xcodeproj/project.pbxproj @@ -28,9 +28,6 @@ AD00163206ECCF5C00012B62 /* French */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/Localizable.strings; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; AD0134C306DF41C5000910D8 /* UIxSortButton.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxSortButton.m; sourceTree = ""; }; AD0134DC06DF4C11000910D8 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; - AD01374F06DF67B0000910D8 /* downward_sorted.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = downward_sorted.gif; sourceTree = ""; }; - AD01375006DF67B0000910D8 /* non_sorted.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = non_sorted.gif; sourceTree = ""; }; - AD01375106DF67B0000910D8 /* upward_sorted.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = upward_sorted.gif; sourceTree = ""; }; AD01376806DF6A59000910D8 /* English */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; AD01376906DF6A69000910D8 /* French */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/Localizable.strings; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; AD01377506DF6BC7000910D8 /* English */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; @@ -65,10 +62,6 @@ AD2C74AA071A9FF70087E027 /* UIxMailFormatter.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = UIxMailFormatter.h; sourceTree = ""; }; AD2C74AB071A9FF70087E027 /* UIxMailFormatter.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxMailFormatter.m; sourceTree = ""; }; AD2C74AC071A9FF70087E027 /* UIxMailMainFrame.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxMailMainFrame.m; sourceTree = ""; }; - AD2C74AE071A9FF70087E027 /* UIxMailPartAlternativeViewer.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartAlternativeViewer.m; sourceTree = ""; }; - AD2C74B0071A9FF70087E027 /* UIxMailPartImageViewer.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartImageViewer.m; sourceTree = ""; }; - AD2C74B2071A9FF70087E027 /* UIxMailPartMixedViewer.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartMixedViewer.m; sourceTree = ""; }; - AD2C74B4071A9FF70087E027 /* UIxMailPartTextViewer.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartTextViewer.m; sourceTree = ""; }; AD2C74B6071A9FF70087E027 /* UIxMailPartViewer.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = UIxMailPartViewer.h; sourceTree = ""; }; AD2C74B7071A9FF70087E027 /* UIxMailPartViewer.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartViewer.m; sourceTree = ""; }; AD2C74B8071A9FF70087E027 /* UIxMailRenderingContext.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = UIxMailRenderingContext.h; sourceTree = ""; }; @@ -171,8 +164,6 @@ AD770DA307AE4F7000F5C7A1 /* SOGoImageMailBodyPart.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = SOGoImageMailBodyPart.m; sourceTree = ""; }; AD770DA407AE4F7000F5C7A1 /* SOGoMessageMailBodyPart.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = SOGoMessageMailBodyPart.m; sourceTree = ""; }; AD770DAC07AE4FB200F5C7A1 /* UIxFilterList.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = UIxFilterList.m; sourceTree = ""; }; - AD770DAE07AE4FB200F5C7A1 /* UIxMailPartLinkViewer.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartLinkViewer.m; sourceTree = ""; }; - AD770DB007AE4FB200F5C7A1 /* UIxMailPartMessageViewer.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = UIxMailPartMessageViewer.m; sourceTree = ""; }; AD770DB407AE4FB200F5C7A1 /* UIxMailTreeBlock.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = UIxMailTreeBlock.h; sourceTree = ""; }; AD770DB507AE4FB200F5C7A1 /* UIxMailTreeBlock.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = UIxMailTreeBlock.m; sourceTree = ""; }; AD770DB607AE4FB200F5C7A1 /* UIxSieveEditor.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = UIxSieveEditor.m; sourceTree = ""; }; @@ -433,23 +424,6 @@ E872074D0692E3D20099CBBD /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; indentWidth = 8; path = GNUmakefile; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; E872074E0692E3D20099CBBD /* GNUmakefile.postamble */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; indentWidth = 8; path = GNUmakefile.postamble; sourceTree = ""; tabWidth = 8; }; E872074F0692E3D20099CBBD /* GNUmakefile.preamble */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; indentWidth = 8; path = GNUmakefile.preamble; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; - E87207A40692E3D20099CBBD /* box_botleft.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = box_botleft.gif; sourceTree = ""; }; - E87207A50692E3D20099CBBD /* box_botright.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = box_botright.gif; sourceTree = ""; }; - E87207A60692E3D20099CBBD /* box_bottom.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = box_bottom.gif; sourceTree = ""; }; - E87207A70692E3D20099CBBD /* box_left.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = box_left.gif; sourceTree = ""; }; - E87207A80692E3D20099CBBD /* box_right.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = box_right.gif; sourceTree = ""; }; - E87207A90692E3D20099CBBD /* box_top.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = box_top.gif; sourceTree = ""; }; - E87207AA0692E3D20099CBBD /* box_topleft.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = box_topleft.gif; sourceTree = ""; }; - E87207AB0692E3D20099CBBD /* box_topright.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = box_topright.gif; sourceTree = ""; }; - E87207AC0692E3D20099CBBD /* closewindow.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = closewindow.gif; sourceTree = ""; }; - E87207AD0692E3D20099CBBD /* corner_right.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = corner_right.gif; sourceTree = ""; }; - E87207AE0692E3D20099CBBD /* line_left.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = line_left.gif; sourceTree = ""; }; - E87207AF0692E3D20099CBBD /* line_right.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = line_right.gif; sourceTree = ""; }; - E87207B00692E3D20099CBBD /* line_stretch.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = line_stretch.gif; sourceTree = ""; }; - E87207B10692E3D20099CBBD /* menu_logo_top.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = menu_logo_top.gif; sourceTree = ""; }; - E87207B20692E3D20099CBBD /* OGoLogo.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = OGoLogo.gif; sourceTree = ""; }; - E87207B30692E3D20099CBBD /* tab_.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = tab_.gif; sourceTree = ""; }; - E87207B40692E3D20099CBBD /* tab_selected.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = tab_selected.gif; sourceTree = ""; }; E87207C40692E3D20099CBBD /* product.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = product.plist; sourceTree = ""; }; E87207DA0692E3D20099CBBD /* UIxAppNavView.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxAppNavView.m; sourceTree = ""; }; E87207DE0692E3D20099CBBD /* UIxElemBuilder.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxElemBuilder.m; sourceTree = ""; }; @@ -494,13 +468,14 @@ /* End PBXFileReference section */ /* Begin PBXGroup section */ - AD01374506DF6731000910D8 /* CSS */ = { + AD01374506DF6731000910D8 /* WebServerResources */ = { isa = PBXGroup; children = ( - E87207480692E3D20099CBBD /* calendar.css */, E87207E70692E3D20099CBBD /* uix.css */, + E87207480692E3D20099CBBD /* calendar.css */, ); - name = CSS; + name = WebServerResources; + path = ../WebServerResources; sourceTree = ""; }; AD0137A406DF8875000910D8 /* Appointment */ = { @@ -1239,10 +1214,6 @@ AD2C74A6071A9FF70087E027 /* UIxMailAccountsView.m */, AD2C74A8071A9FF70087E027 /* UIxMailAccountView.m */, AD2C74AC071A9FF70087E027 /* UIxMailMainFrame.m */, - AD2C74AE071A9FF70087E027 /* UIxMailPartAlternativeViewer.m */, - AD2C74B0071A9FF70087E027 /* UIxMailPartImageViewer.m */, - AD2C74B2071A9FF70087E027 /* UIxMailPartMixedViewer.m */, - AD2C74B4071A9FF70087E027 /* UIxMailPartTextViewer.m */, AD2C74BA071A9FF70087E027 /* UIxMailToolbar.m */, AD2C74BC071A9FF70087E027 /* UIxMailTree.m */, ADDF4DCA06DE0E9A00C4E7F8 /* UIxMailEditor.m */, @@ -1255,8 +1226,6 @@ ADDF4DCE06DE0E9A00C4E7F8 /* UIxMailView.m */, AD0A0ACC07A8093400D3B8EF /* UIxMailWindowCloser.m */, AD770DAC07AE4FB200F5C7A1 /* UIxFilterList.m */, - AD770DAE07AE4FB200F5C7A1 /* UIxMailPartLinkViewer.m */, - AD770DB007AE4FB200F5C7A1 /* UIxMailPartMessageViewer.m */, ); name = Components; sourceTree = ""; @@ -1457,8 +1426,7 @@ E87207C40692E3D20099CBBD /* product.plist */, AD01376706DF6A59000910D8 /* Localizable.strings */, E8720A490692E4CE0099CBBD /* Makefiles */, - AD01374506DF6731000910D8 /* CSS */, - E87207500692E3D20099CBBD /* images */, + AD01374506DF6731000910D8 /* WebServerResources */, E8720A6B0692E4EC0099CBBD /* Classes */, E8720A570692E4DF0099CBBD /* Components */, ); @@ -1466,33 +1434,6 @@ path = UI/Common; sourceTree = SOURCE_ROOT; }; - E87207500692E3D20099CBBD /* images */ = { - isa = PBXGroup; - children = ( - E87207A40692E3D20099CBBD /* box_botleft.gif */, - E87207A50692E3D20099CBBD /* box_botright.gif */, - E87207A60692E3D20099CBBD /* box_bottom.gif */, - E87207A70692E3D20099CBBD /* box_left.gif */, - E87207A80692E3D20099CBBD /* box_right.gif */, - E87207A90692E3D20099CBBD /* box_top.gif */, - E87207AA0692E3D20099CBBD /* box_topleft.gif */, - E87207AB0692E3D20099CBBD /* box_topright.gif */, - E87207AC0692E3D20099CBBD /* closewindow.gif */, - E87207AD0692E3D20099CBBD /* corner_right.gif */, - E87207AE0692E3D20099CBBD /* line_left.gif */, - E87207AF0692E3D20099CBBD /* line_right.gif */, - E87207B00692E3D20099CBBD /* line_stretch.gif */, - E87207B10692E3D20099CBBD /* menu_logo_top.gif */, - E87207B20692E3D20099CBBD /* OGoLogo.gif */, - E87207B30692E3D20099CBBD /* tab_.gif */, - E87207B40692E3D20099CBBD /* tab_selected.gif */, - AD01375006DF67B0000910D8 /* non_sorted.gif */, - AD01374F06DF67B0000910D8 /* downward_sorted.gif */, - AD01375106DF67B0000910D8 /* upward_sorted.gif */, - ); - path = images; - sourceTree = ""; - }; E87207EA0692E3D20099CBBD /* Scheduler */ = { isa = PBXGroup; children = ( diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 49dbb8f0..9d9f0a52 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,17 @@ +2005-07-21 Marcus Mueller + + * v0.9.144 + + * UIxCalInlineAptView.m: reworked the way styles are produced now. + UIxCalInlineAptView gets a lot more information from the appointment + now in order to produce a suitable style for it + + * UIxCalMonthOverview.m: setup formatter properly for private + appointments + + * UIxCalView.m: don't generate style information at all - + UIxCalInlineAptView does this now + 2005-07-20 Helge Hess * UIxAppointmentEditor.m: added fragile base class check (v0.9.143) diff --git a/SOGo/UI/Scheduler/UIxCalInlineAptView.m b/SOGo/UI/Scheduler/UIxCalInlineAptView.m index 5198e3da..eabc1bd9 100644 --- a/SOGo/UI/Scheduler/UIxCalInlineAptView.m +++ b/SOGo/UI/Scheduler/UIxCalInlineAptView.m @@ -38,6 +38,8 @@ #include "common.h" #include +#include +#include @implementation UIxCalInlineAptView @@ -81,14 +83,40 @@ } - (void)setStyle:(id)_style { - ASSIGN(self->style, _style); -} -- (id)style { - NSNumber *prio; - + NSMutableString *ms; + NSNumber *prio; + NSString *s; + NSString *email; + + if (_style) { + ms = [NSMutableString stringWithString:_style]; + } + else { + ms = (NSMutableString *)[NSMutableString string]; + } if ((prio = [self->appointment valueForKey:@"priority"])) { - return [NSString stringWithFormat:@"%@ apt_prio%@", self->style, prio]; + [ms appendFormat:@" apt_prio%@", prio]; } + email = [[[self context] activeUser] email]; + if ((s = [self->appointment valueForKey:@"orgmail"])) { + if ([s rangeOfString:email].length > 0) { + [ms appendString:@" apt_organizer"]; + } + else { + [ms appendString:@" apt_other"]; + } + } + if ((s = [self->appointment valueForKey:@"partmails"])) { + if ([s rangeOfString:email].length > 0) { + [ms appendString:@" apt_participant"]; + } + else { + [ms appendString:@" apt_nonparticipant"]; + } + } + ASSIGNCOPY(self->style, ms); +} +- (id)style { return self->style; } diff --git a/SOGo/UI/Scheduler/UIxCalMonthOverview.m b/SOGo/UI/Scheduler/UIxCalMonthOverview.m index 7aca5917..728c6144 100644 --- a/SOGo/UI/Scheduler/UIxCalMonthOverview.m +++ b/SOGo/UI/Scheduler/UIxCalMonthOverview.m @@ -14,7 +14,8 @@ - (void)configureFormatters { [super configureFormatters]; - [self->aptFormatter setShortTitleOnly]; + [self->aptFormatter setShortTitleOnly]; + [self->privateAptFormatter setPrivateTitleOnly]; } - (void)setDayIndex:(int)_idx { diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m index 2bf44d1f..9f99b6bd 100644 --- a/SOGo/UI/Scheduler/UIxCalView.m +++ b/SOGo/UI/Scheduler/UIxCalView.m @@ -225,8 +225,6 @@ static BOOL shouldDisplayWeekend = NO; } - (NSString *)aptStyle { - if (![self isMyApt]) - return @"apt_other"; return nil; } diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 37038f62..4aaaaf8b 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=143 +SUBMINOR_VERSION:=144 # v0.9.136 requires SOGoUI v0.9.30 # v0.9.123 requires Appointments v0.9.35 diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog index 15a1b28d..13eb8b91 100644 --- a/SOGo/UI/Templates/ChangeLog +++ b/SOGo/UI/Templates/ChangeLog @@ -1,5 +1,8 @@ 2005-07-21 Marcus Mueller + * UIxCalDayOverview.wox, UIxCalDayChartview.wox, UIxCalDayListview.wox, + UIxCalMonthOverview.wox: reworked the style bindings + * UIxMailToSelection.wox: commented debug output * UIxMailEditor.wox: added inline attachment view which is only diff --git a/SOGo/UI/Templates/UIxCalDayChartview.wox b/SOGo/UI/Templates/UIxCalDayChartview.wox index 15afe4ba..a6f0a21b 100644 --- a/SOGo/UI/Templates/UIxCalDayChartview.wox +++ b/SOGo/UI/Templates/UIxCalDayChartview.wox @@ -46,9 +46,7 @@ /> - + @@ -222,7 +220,7 @@ formatter="aptFormatter" tooltipFormatter="aptTooltipFormatter" url="appointmentViewURL" - style="aptStyle" + const:style="daychartview" queryDictionary="currentDayQueryParameters" referenceDate="currentDate" canAccess="canAccessApt" diff --git a/SOGo/UI/Templates/UIxCalDayListview.wox b/SOGo/UI/Templates/UIxCalDayListview.wox index 4698f5d7..1111be3e 100644 --- a/SOGo/UI/Templates/UIxCalDayListview.wox +++ b/SOGo/UI/Templates/UIxCalDayListview.wox @@ -46,9 +46,7 @@ /> - + @@ -180,7 +178,7 @@ formatter="aptFormatter" tooltipFormatter="aptTooltipFormatter" url="appointmentViewURL" - style="aptStyle" + const:style="daylistview" queryDictionary="currentDayQueryParameters" referenceDate="currentDate" canAccess="canAccessApt" diff --git a/SOGo/UI/Templates/UIxCalDayOverview.wox b/SOGo/UI/Templates/UIxCalDayOverview.wox index 6272f461..1ab5ea62 100644 --- a/SOGo/UI/Templates/UIxCalDayOverview.wox +++ b/SOGo/UI/Templates/UIxCalDayOverview.wox @@ -41,9 +41,7 @@ /> - + @@ -176,7 +174,7 @@ formatter="aptFormatter" tooltipFormatter="aptTooltipFormatter" url="appointmentViewURL" - style="aptStyle" + const:style="dayoverview" queryDictionary="currentDateQueryParameters" referenceDate="selectedDate" canAccess="canAccessApt" @@ -208,7 +206,7 @@ formatter="aptFormatter" tooltipFormatter="aptTooltipFormatter" url="appointmentViewURL" - style="aptStyle" + const:style="dayoverview" queryDictionary="currentDayQueryParameters" referenceDate="currentDate" canAccess="canAccessApt" diff --git a/SOGo/UI/Templates/UIxCalMonthOverview.wox b/SOGo/UI/Templates/UIxCalMonthOverview.wox index 7d168e95..d591e09d 100644 --- a/SOGo/UI/Templates/UIxCalMonthOverview.wox +++ b/SOGo/UI/Templates/UIxCalMonthOverview.wox @@ -125,7 +125,7 @@ formatter="aptFormatter" tooltipFormatter="aptTooltipFormatter" url="appointmentViewURL" - style="aptStyle" + const:style="monthoverview" referenceDate="currentDay" canAccess="canAccessApt" /> @@ -160,13 +160,13 @@ >[] --> - + diff --git a/SOGo/UI/WebServerResources/calendar.css b/SOGo/UI/WebServerResources/calendar.css index 53b4364f..73fb38be 100644 --- a/SOGo/UI/WebServerResources/calendar.css +++ b/SOGo/UI/WebServerResources/calendar.css @@ -11,27 +11,49 @@ color: #000000; } +/* appointments */ + +.apt_organizer { + color: #0033cc ! important; +} +.apt_organizer a { + color: #0033cc ! important; +} .apt_other { - color: #000000; + color: #000000 ! important; +} +.apt_other a { + color: #000000 ! important; } -.apt_other_print { - font-style: italic; +.apt_nonparticipant { + font-style: italic ! important; +} +.apt_participant { } -.aptprintview_apt_other { - font-style: italic; +.apt_private { } .apt_prio0, .apt_prio5, .apt_prio6, .apt_prio7, .apt_prio8, .apt_prio9 { - font-weight: normal; + font-weight: normal ! important; } - .apt_prio1, .apt_prio2, .apt_prio3, .apt_prio4 { - font-weight: bold; + font-weight: bold ! important; +} + + +.apt_other_print { + font-style: italic; +} + +.aptprintview_apt_other { + font-style: italic; } +/* Anais */ + .anais_me { color: #0000FF; } @@ -99,18 +121,22 @@ td.schedoverview { /* day overview */ +.dayoverview { + font-size: 8pt; +} + .dayoverview_content { padding: 1px; margin: 0px 0px 0px 0px; vertical-align: top; font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; letter-spacing: 0pt; - font-size: 9pt; } .dayoverview_content_time { background-color: #d2d2cc; text-align: center; + font-size: 9pt; } .dayoverview_content_time_link { @@ -537,19 +563,18 @@ h1.weekprintview { .monthoverview { color: #000000; font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - font-size: 10pt; - letter-spacing: 0pt; - padding: 2px; -} - -.monthoverview a { - color: #0033cc; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; font-size: 7pt; font-style: normal; font-weight: normal; letter-spacing: 0pt; text-decoration: none; + + text-align: left; + vertical-align: top; +} + +.monthoverview a { + color: #0033cc; } .monthoverview a:hover { @@ -558,6 +583,7 @@ h1.weekprintview { .monthoverview_title { background-color: #d2d2cc; + font-size: 10pt; text-align: center; } @@ -587,49 +613,46 @@ h1.weekprintview { .monthoverview_content { background-color: #e8e8e0; - font-size: 9pt; + font-size: 7pt; height: 60; + text-align: left; + vertical-align: top; } .monthoverview_content a { font-style: italic; font-weight: bold; } -.monthoverview_content td { - text-align: left; - vertical-align: top; -} .monthoverview_content_hilite { background-color: #fffff0; - font-size: 9pt; + font-size: 7pt; height: 60; + text-align: left; + vertical-align: top; } .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; + font-size: 7pt; height: 60; + text-align: left; + vertical-align: top; } .monthoverview_content_dimmed a { font-style: normal; font-weight: normal; } -.monthoverview_content_dimmed td { - text-align: left; - vertical-align: top; +.monthoverview_day { +// text-align: left; +// vertical-align: top; } .monthoverview_day a { color: #000000; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; font-size: 12pt; } -- 2.39.5