From: znek Date: Wed, 28 Jul 2004 14:35:15 +0000 (+0000) Subject: completed UIxCalWeekview and some refactoring X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b555533385fcdc8a0e7e4a018325321a788e91d;p=scalable-opengroupware.org completed UIxCalWeekview and some refactoring git-svn-id: http://svn.opengroupware.org/SOGo/trunk@160 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog index 39381c5c..c0225016 100644 --- a/SOGo/UI/Common/ChangeLog +++ b/SOGo/UI/Common/ChangeLog @@ -1,3 +1,7 @@ +2004-07-28 Marcus Mueller + + * calendar.css: added CSS for weekcolumnsview (v0.9.3) + 2004-07-27 Marcus Mueller * v0.9.2 diff --git a/SOGo/UI/Common/calendar.css b/SOGo/UI/Common/calendar.css index 501f05c6..7b4f3460 100644 --- a/SOGo/UI/Common/calendar.css +++ b/SOGo/UI/Common/calendar.css @@ -198,6 +198,161 @@ text-decoration: none; } + +.weekcolumnsview { +} + +.weekcolumnsview_title { + font-size: 10pt; + font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; + letter-spacing: 0pt; + color: #000000; + background-color: #d2d2cc; + padding: 4px; +} + +.weekcolumnsview_title a { + color: #0033cc; + text-decoration: none; +} + +.weekcolumnsview_title_hilite { + font-size: 10pt; + font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; + letter-spacing: 0pt; + color: #000000; + background-color: #d2d2cc; + font-weight: bold; + padding: 4px; +} + +.weekcolumnsview_title_hilite a { + color: #0033cc; + text-decoration: none; +} + +.weekcolumnsview_title_daylink { + font-size: 12pt; + color: #0033cc; + font-weight: bold; +} + +.weekcolumnsview_title_newlink { + font-size: 8pt; +} + +.weekcolumnsview_holidayinfo { + font-size: 8pt; + font-weight: bold; +} + +.weekcolumnsview_content { + color: #FFFFFF; + background-color: #e8e8e0; +} + +.weekcolumnsview_content a { + color: #0000FF; + font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; + letter-spacing: 0pt; + text-decoration: none; +} + +.weekcolumnsview_content_hilite { + background-color: #fffff0; +} + +.weekcolumnsview_content_hilite a { + color: #0000FF; + font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; + letter-spacing: 0pt; + text-decoration: none; +} + +.weekcolumnsview_cal { + 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; +} + +.weekcolumnsview_cal table { + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; +} + +.weekcolumnsview_cal td { + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; +} + +.weekcolumnsview_cal a { + color: #000000; + font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; + font-size: 10pt; + letter-spacing: 0pt; + padding: 0px; + text-decoration: none; +} +.weekcolumnsview_cal a:hover { + text-decoration: underline; +} + +.weekcolumnsview_cal_title { + background-color: #d2d2cc; + text-align: center; + font-size: 10pt; + font-weight: bold; + letter-spacing: 0pt; +} + +.weekcolumnsview_cal_day_header { + background-color: #d2d2cc; + text-align: center; + vertical-align: middle; + font-size: 11pt; + width: 20px; + padding: 2px 2px 2px 2px; + margin: 2px 2px 2px 2px; +} + +.weekcolumnsview_cal_content { + color: #000000; + background-color: #e8e8e0; + text-align: center; + vertical-align: middle; + font-size: 10pt; + letter-spacing: 0pt; +} + +.weekcolumnsview_cal_content_hilite { + color: #000000; + background-color: #fffff0; + text-align: center; + vertical-align: middle; + font-size: 10pt; + letter-spacing: 0pt; +} + +.weekcolumnsview_cal_content_dimmed { + color: #5a5a5a; + background-color: #d2d2cc; + text-align: center; + vertical-align: middle; + font-size: 10pt; + letter-spacing: 0pt; +} + +.weekcolumnsview_cal_week { + background-color: #d2d2cc; + width: 16pt; + text-align: center; + vertical-align: middle; +} + + .monthoverview { color: #000000; font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 67352e27..7a5247c2 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,16 @@ +2004-07-28 Marcus Mueller + + * v0.9.9 + + * UIxCalWeekColumnsview.[m|wox]: implemented. + + * UIxCalWeekCharview.*, UIxCalWeekListview.*, UIxCalDayChartView.*, + UIxCalDayListview.*: enhanced templates. + + * UIxCalDayView.[hm]: removed -thisMonth and -nextMonth. + + * UIxCalView.[hm]: added -thisMonth and -nextMonth + 2004-07-28 Marcus Mueller * v0.9.8 diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.m b/SOGo/UI/Scheduler/UIxCalDayChartview.m index 8d62f7b8..b7a01d7e 100644 --- a/SOGo/UI/Scheduler/UIxCalDayChartview.m +++ b/SOGo/UI/Scheduler/UIxCalDayChartview.m @@ -21,10 +21,10 @@ // $Id$ -#include +#include "UIxCalDayView.h" +#include "common.h" - -@interface UIxCalDayChartview : WOComponent +@interface UIxCalDayChartview : UIxCalDayView { } diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.wox b/SOGo/UI/Scheduler/UIxCalDayChartview.wox index 0f892b31..3418bb4f 100644 --- a/SOGo/UI/Scheduler/UIxCalDayChartview.wox +++ b/SOGo/UI/Scheduler/UIxCalDayChartview.wox @@ -17,7 +17,7 @@ diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.m b/SOGo/UI/Scheduler/UIxCalDayListview.m index 567514e3..146a0fd1 100644 --- a/SOGo/UI/Scheduler/UIxCalDayListview.m +++ b/SOGo/UI/Scheduler/UIxCalDayListview.m @@ -21,10 +21,10 @@ // $Id$ -#include +#include "UIxCalDayView.h" +#include "common.h" - -@interface UIxCalDayListview : WOComponent +@interface UIxCalDayListview : UIxCalDayView { } diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.wox b/SOGo/UI/Scheduler/UIxCalDayListview.wox index 03350d79..577a74d7 100644 --- a/SOGo/UI/Scheduler/UIxCalDayListview.wox +++ b/SOGo/UI/Scheduler/UIxCalDayListview.wox @@ -17,7 +17,7 @@ diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.m b/SOGo/UI/Scheduler/UIxCalDayOverview.m index b5647dd9..fae83bef 100644 --- a/SOGo/UI/Scheduler/UIxCalDayOverview.m +++ b/SOGo/UI/Scheduler/UIxCalDayOverview.m @@ -22,9 +22,7 @@ #include "UIxCalDayView.h" -#include -#include - +#include "common.h" @interface UIxCalDayOverview : UIxCalDayView { diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.wox b/SOGo/UI/Scheduler/UIxCalDayOverview.wox index abe7b1df..1724763f 100644 --- a/SOGo/UI/Scheduler/UIxCalDayOverview.wox +++ b/SOGo/UI/Scheduler/UIxCalDayOverview.wox @@ -17,7 +17,7 @@ @@ -105,7 +105,7 @@ - +
-
@@ -144,7 +144,7 @@
+ @@ -159,7 +159,7 @@ >] -
+ +#include "UIxCalWeekView.h" +#include "common.h" - -@interface UIxCalWeekChartview : WOComponent +@interface UIxCalWeekChartview : UIxCalWeekView { } diff --git a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.m b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.m index 35cc41b4..e6f315ec 100644 --- a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.m +++ b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.m @@ -21,12 +21,12 @@ // $Id$ -#include +#include "UIxCalWeekView.h" +#include "common.h" - -@interface UIxCalWeekColumnsview : WOComponent +@interface UIxCalWeekColumnsview : UIxCalWeekView { - + int dayIndex; } @end @@ -34,4 +34,46 @@ @implementation UIxCalWeekColumnsview +- (NSArray *)appointments { + return [self fetchCoreInfos]; +} + +- (void)setDayIndex:(char)_idx { + NSCalendarDate *d; + + if ((self->dayIndex == _idx) && (self->currentDay != nil)) + return; + + self->dayIndex = _idx; + + if (_idx > 0) { + d = [[self startDate] + dateByAddingYears:0 months:0 days:_idx + hours:0 minutes:0 seconds:0]; + } + else + d = [self startDate]; + + [self setCurrentDay:d]; +} + +- (int)dayIndex { + return self->dayIndex; +} + + +/* style sheet */ + +- (NSString *)titleStyle { + if([self->currentDay isToday]) + return @"weekcolumnsview_title_hilite"; + return @"weekcolumnsview_title"; +} + +- (NSString *)contentStyle { + if([self->currentDay isToday]) + return @"weekcolumnsview_content_hilite"; + return @"weekcolumnsview_content"; +} + @end diff --git a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox index 944b1c57..23bbb235 100644 --- a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox +++ b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox @@ -15,7 +15,11 @@ + @@ -108,54 +112,103 @@
-
- - - - - - diff --git a/SOGo/UI/Scheduler/UIxCalWeekListview.m b/SOGo/UI/Scheduler/UIxCalWeekListview.m index 2c56f31c..8cc0a78f 100644 --- a/SOGo/UI/Scheduler/UIxCalWeekListview.m +++ b/SOGo/UI/Scheduler/UIxCalWeekListview.m @@ -21,10 +21,10 @@ // $Id$ -#include +#include "UIxCalWeekView.h" +#include "common.h" - -@interface UIxCalWeekListview : WOComponent +@interface UIxCalWeekListview : UIxCalWeekView { } diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox index c30d1571..2db49a0a 100644 --- a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox +++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox @@ -15,7 +15,11 @@
- + + + -
+ + + + + + + +
+ +
+ +
-
- [] + 		+ + + + + + + +
+ + +
+ [] +
+ + + + + + + + + + + + +
+ +
- - - - - - - - - - - - -
- - +
+ diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 97fd1482..f979db5f 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,5 +1,5 @@ # $Id$ -SUBMINOR_VERSION:=8 +SUBMINOR_VERSION:=9 # 1.1.0 requires NGObjWeb 4.2.202
-