From: znek Date: Tue, 15 Jun 2004 17:52:39 +0000 (+0000) Subject: cosmetic changes X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbaa4c0bb74aa72576230a94f6906ec1d1b8fc3b;p=scalable-opengroupware.org cosmetic changes git-svn-id: http://svn.opengroupware.org/SOGo/trunk@37 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog index 373dcff1..f6ba8d7d 100644 --- a/ZideStore/UI-X/ChangeLog +++ b/ZideStore/UI-X/ChangeLog @@ -1,3 +1,13 @@ +2004-06-15 Marcus Mueller + + * Common/UIxTabView.m: removed class from tag, removed rendering + of headerFooter (what's that good for anyways?) + + * Several resources which resolved to wrong products added statically + in templates. + + * Cosmetic changes in templates. + 2004-06-14 Helge Hess * Scheduler/OGoCalMonthOverview.wox: added missing rsrc namespace diff --git a/ZideStore/UI-X/Common/OGoWinClose.wox b/ZideStore/UI-X/Common/OGoWinClose.wox index a787dd47..35769e42 100644 --- a/ZideStore/UI-X/Common/OGoWinClose.wox +++ b/ZideStore/UI-X/Common/OGoWinClose.wox @@ -3,4 +3,4 @@ xmlns:var="http://www.skyrix.com/od/binding" xmlns:const="http://www.skyrix.com/od/constant" xmlns:rsrc="OGo:url" - href="javascript:history.back()">X + href="javascript:history.back()">X diff --git a/ZideStore/UI-X/Common/UIxTabView.m b/ZideStore/UI-X/Common/UIxTabView.m index 19fb8729..ac635c3e 100644 --- a/ZideStore/UI-X/Common/UIxTabView.m +++ b/ZideStore/UI-X/Common/UIxTabView.m @@ -349,11 +349,6 @@ static NSNumber *YesNumber; [_response appendContentString:@"\" "]; [_response appendContentString: [NSString stringWithFormat:@"name='%@TabLink'", _info->key]]; - if (styleName) { - [_response appendContentString:@" class='"]; - [_response appendContentHTMLAttributeValue:styleName]; - [_response appendContentCharacter:'\'']; - } [_response appendContentString:@">"]; if ([label length] < 1) @@ -797,14 +792,16 @@ static NSNumber *YesNumber; [_ctx deleteLastElementIDComponent]; // 'h' for head [_ctx removeObjectForKey:UIxTabView_HEAD]; - + +#if 0 /* header foot row */ - + [self _appendHeaderFootRowToResponse:_response inContext:_ctx bgcolor:bgcolor doScript:doScript isLeftActive:isLeftActive]; - +#endif + /* body row */ [self _appendBodyRowToResponse:_response inContext:_ctx diff --git a/ZideStore/UI-X/Common/zidestoreui.css b/ZideStore/UI-X/Common/zidestoreui.css index 00804b54..a339b068 100644 --- a/ZideStore/UI-X/Common/zidestoreui.css +++ b/ZideStore/UI-X/Common/zidestoreui.css @@ -54,7 +54,7 @@ font.defaultfont { border-right: 1px solid #06348b; } -a.tab, a.tab:active, a.tab:link, a.tab:visited, a.tab:hover { +.tab a { color: #000000; border: none; text-decoration: none; @@ -72,7 +72,7 @@ a.tab, a.tab:active, a.tab:link, a.tab:visited, a.tab:hover { border-right: 1px solid #06348b; } -a.tab_selected, a.tab_selected:active, a.tab_selected:link, a.tab_selected:visited, a.tab_selected:hover { +.tab_selected a { color: #000000; border: none; text-decoration: none; @@ -106,6 +106,45 @@ a.tab_selected, a.tab_selected:active, a.tab_selected:link, a.tab_selected:visit 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/GNUmakefile b/ZideStore/UI-X/Scheduler/GNUmakefile index d841062a..3dc43ea2 100644 --- a/ZideStore/UI-X/Scheduler/GNUmakefile +++ b/ZideStore/UI-X/Scheduler/GNUmakefile @@ -32,8 +32,15 @@ SchedulerUI_RESOURCE_FILES += \ OGoCalSelectTab.wox \ OGoCalDateLabel.wox \ images/next_week.gif \ - images/previous_week.gif \ - + images/previous_week.gif \ + images/icon_apt_chart.gif \ + images/icon_apt_overview.gif \ + images/icon_apt_chart_inactive.gif \ + images/icon_apt_overview_inactive.gif \ + images/icon_apt_column_view.gif \ + images/icon_apt_list.gif \ + images/icon_apt_list_inactive.gif \ + ifeq ($(FOUNDATION_LIB),apple) ZIDESTORE=$(GNUSTEP_USER_ROOT)/Library/Headers/ZideStore12 diff --git a/ZideStore/UI-X/Scheduler/OGoCalDateLabel.wox b/ZideStore/UI-X/Scheduler/OGoCalDateLabel.wox index 8dfff7be..c5d8b168 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalDateLabel.wox +++ b/ZideStore/UI-X/Scheduler/OGoCalDateLabel.wox @@ -1,9 +1,8 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox b/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox index ceb54d98..70e08a8e 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox +++ b/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox @@ -30,12 +30,12 @@ + previous month
- previous month thismonth - next month + next month
@@ -72,7 +72,7 @@ - + diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox index 73699bea..b2548da0 100644 --- a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox +++ b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox @@ -53,6 +53,37 @@ + + + + + + + +
+ + + + + + + +
OverviewChartList + Columns +
+ 		+ + + + + +
+ printview + + proposal +
+
+ @@ -63,7 +94,7 @@ - + diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_chart.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_chart.gif new file mode 100644 index 00000000..ba0f7404 Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_chart.gif differ diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_chart_inactive.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_chart_inactive.gif new file mode 100644 index 00000000..240f1e88 Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_chart_inactive.gif differ diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_column_view.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_column_view.gif new file mode 100644 index 00000000..4af2fa19 Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_column_view.gif differ diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_list.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_list.gif new file mode 100644 index 00000000..857db76f Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_list.gif differ diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_list_inactive.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_list_inactive.gif new file mode 100644 index 00000000..4e8debf0 Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_list_inactive.gif differ diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_overview.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_overview.gif new file mode 100644 index 00000000..43ac7966 Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_overview.gif differ diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_overview_inactive.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_overview_inactive.gif new file mode 100644 index 00000000..7736f485 Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_overview_inactive.gif differ diff --git a/ZideStore/UI-X/Scheduler/product.plist b/ZideStore/UI-X/Scheduler/product.plist index 50568069..180156a4 100644 --- a/ZideStore/UI-X/Scheduler/product.plist +++ b/ZideStore/UI-X/Scheduler/product.plist @@ -3,7 +3,16 @@ publicResources = ( previous_week.gif, - next_week.gif + next_week.gif, + next_week.gif, + previous_week.gif, + icon_apt_chart.gif, + icon_apt_overview.gif, + icon_apt_chart_inactive.gif, + icon_apt_overview_inactive.gif, + icon_apt_column_view.gif, + icon_apt_list.gif, + icon_apt_list_inactive.gif ); factories = {