From: znek Date: Wed, 16 Jun 2004 13:33:44 +0000 (+0000) Subject: work in progress X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49d4ba98569cb65b591d248d3e2dd6f03c9a7ade;p=scalable-opengroupware.org work in progress git-svn-id: http://svn.opengroupware.org/SOGo/trunk@39 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog index f6ba8d7d..09655897 100644 --- a/ZideStore/UI-X/ChangeLog +++ b/ZideStore/UI-X/ChangeLog @@ -1,3 +1,15 @@ +2004-06-16 Marcus Mueller + + * Common/zidestoreui.css: new style for button_auto. + + * Scheduler/OGoCalView.[hm]: API for completing hrefs with necessary + query parts. + + * Scheduler/OGoCalWeekView.m: bugfix for startDate. + + * Scheduler/product.plist: added still missing views -> point to + weekoverview for the time being. + 2004-06-15 Marcus Mueller * Common/UIxTabView.m: removed class from tag, removed rendering diff --git a/ZideStore/UI-X/Common/zidestoreui.css b/ZideStore/UI-X/Common/zidestoreui.css index a339b068..be032b46 100644 --- a/ZideStore/UI-X/Common/zidestoreui.css +++ b/ZideStore/UI-X/Common/zidestoreui.css @@ -85,13 +85,32 @@ font.defaultfont { /* 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: #FFFFFF; + background-color: #e8e8e0; font-size: 8pt; font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; letter-spacing: 0pt; @@ -106,45 +125,6 @@ font.defaultfont { overflow: hidden; } -.button_bezel { - height: 16px; - background-color: #e8e8e0; - text-align: center; - vertical-align: middle; - padding: 0px; - margin: 0px; - border-top: 1px solid #c0c0c0; - border-left: 1px solid #c0c0c0; - border-bottom: 1px solid #333333; - border-right: 1px solid #333333; - overflow: hidden; -} - -.button_bezel_inner { - font-size: 8pt; - font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif; - letter-spacing: 0pt; - padding-left: 2px; - padding-right: 2px; - padding-top: 0px; - padding-bottom: 0px; - margin: 0px; -// border-top: 1px solid #ffffff; -// border-bottom: 1px solid #8c8c8c; - border-left: 1px solid #ffffff; - border-right: 1px solid #8c8c8c; -} - -.button_bezel a { - text-decoration: none; - color: #000000; -} - -.button_bezel a:hover { - text-decoration: underline; - color: #ff0000; -} - /* header */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m index ae426b74..223a3129 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m +++ b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m @@ -31,6 +31,8 @@ NSCalendarDate *currentDate; } +- (NSString *)completedLinkForOverview:(NSString *)_overview; + @end @@ -58,6 +60,10 @@ return self->currentDate; } + +/* labels */ + + - (NSString *)dayLabel { NSCalendarDate *date; @@ -85,4 +91,32 @@ return [self->currentDate descriptionWithCalendarFormat:@"%Y"]; } + +/* hrefs */ + + +- (NSString *)completedLinkForOverview:(NSString *)_overview { + NSString *dateString; + + dateString = [[[self context] request] formValueForKey:@"startDate"]; + return [_overview stringByAppendingFormat:@"?startDate=%@", dateString]; +} + +- (NSString *)dayoverviewLink { + return [self completedLinkForOverview:@"dayoverview"]; +} + +- (NSString *)weekoverviewLink { + return [self completedLinkForOverview:@"weekoverview"]; +} + +- (NSString *)monthoverviewLink { + return [self completedLinkForOverview:@"monthoverview"]; +} + +- (NSString *)yearoverviewLink { + return [self completedLinkForOverview:@"yearoverview"]; +} + + @end diff --git a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox index d2e54223..532232e7 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox +++ b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox @@ -10,16 +10,16 @@ const:selectedTabStyle="tab_selected" const:bodyStyle="tabview_body" > - + - + - + - + diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.h b/ZideStore/UI-X/Scheduler/OGoCalView.h index a5d99746..6468c7f7 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalView.h +++ b/ZideStore/UI-X/Scheduler/OGoCalView.h @@ -24,6 +24,7 @@ - (NSString *)appointmentViewURL; - (NSString *)ownMethodName; - (NSString *)dateNavigationURLWithNewStartDate:(NSCalendarDate *)_newDate; +- (NSString *)completedLinkForView:(NSString *)_view; /* backend */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.m b/ZideStore/UI-X/Scheduler/OGoCalView.m index 2888ec50..d08551c6 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalView.m +++ b/ZideStore/UI-X/Scheduler/OGoCalView.m @@ -153,4 +153,14 @@ return [NSCalendarDate dateWithString:_dateString calendarFormat:@"%Y%m%d"]; } +- (NSString *)completedLinkForView:(NSString *)_view { + NSString *dateString; + + dateString = [[[self context] request] formValueForKey:@"startDate"]; + if(dateString) + return [_view stringByAppendingFormat:@"?startDate=%@", dateString]; + return _view; +} + + @end /* OGoCalView */ diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox index b2548da0..da13fc59 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox +++ b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox @@ -26,14 +26,14 @@ - +
other stuff -
previous week + thisweek @@ -60,10 +60,10 @@ - - + +
OverviewChartListChartList - Columns + Columns
@@ -72,11 +72,11 @@ 		- -
- printview + + printview - proposal + + proposal
diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekView.m b/ZideStore/UI-X/Scheduler/OGoCalWeekView.m index 310ec860..8ccdcd03 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalWeekView.m +++ b/ZideStore/UI-X/Scheduler/OGoCalWeekView.m @@ -12,9 +12,9 @@ dateString = [[[self context] request] formValueForKey:@"startDate"]; startDate = dateString ? [self dateForDateString:dateString] - : [[NSCalendarDate date] mondayOfWeek]; + : [NSCalendarDate date]; - return startDate; + return [startDate mondayOfWeek]; } - (NSCalendarDate *)endDate { @@ -47,4 +47,13 @@ return [self dateNavigationURLWithNewStartDate:newWeekDate]; } + +- (NSString *)weekprintviewLink { + return [self completedLinkForView:@"weekprintview"]; +} + +- (NSString *)proposalLink { + return [self completedLinkForView:@"proposal"]; +} + @end /* OGoCalWeekView */ diff --git a/ZideStore/UI-X/Scheduler/product.plist b/ZideStore/UI-X/Scheduler/product.plist index 180156a4..8051cd3e 100644 --- a/ZideStore/UI-X/Scheduler/product.plist +++ b/ZideStore/UI-X/Scheduler/product.plist @@ -25,6 +25,22 @@ protectedBy = "View"; pageName = "OGoCalWeekOverview"; }; + "weekchartview" = { + protectedBy = "View"; + pageName = "OGoCalWeekOverview"; + }; + "weeklistview" = { + protectedBy = "View"; + pageName = "OGoCalWeekOverview"; + }; + "weekcolumnview" = { + protectedBy = "View"; + pageName = "OGoCalWeekOverview"; + }; + "weekprintview" = { + protectedBy = "View"; + pageName = "OGoCalWeekOverview"; + }; "monthoverview" = { protectedBy = "View"; pageName = "OGoCalMonthOverview";