From cbaa4c0bb74aa72576230a94f6906ec1d1b8fc3b Mon Sep 17 00:00:00 2001 From: znek Date: Tue, 15 Jun 2004 17:52:39 +0000 Subject: [PATCH] cosmetic changes git-svn-id: http://svn.opengroupware.org/SOGo/trunk@37 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ZideStore/UI-X/ChangeLog | 10 ++++ ZideStore/UI-X/Common/OGoWinClose.wox | 2 +- ZideStore/UI-X/Common/UIxTabView.m | 13 ++---- ZideStore/UI-X/Common/zidestoreui.css | 43 +++++++++++++++++- ZideStore/UI-X/Scheduler/GNUmakefile | 11 ++++- ZideStore/UI-X/Scheduler/OGoCalDateLabel.wox | 13 +++--- .../UI-X/Scheduler/OGoCalMonthOverview.wox | 6 +-- .../UI-X/Scheduler/OGoCalWeekOverview.wox | 33 +++++++++++++- .../UI-X/Scheduler/images/icon_apt_chart.gif | Bin 0 -> 360 bytes .../images/icon_apt_chart_inactive.gif | Bin 0 -> 181 bytes .../Scheduler/images/icon_apt_column_view.gif | Bin 0 -> 250 bytes .../UI-X/Scheduler/images/icon_apt_list.gif | Bin 0 -> 360 bytes .../images/icon_apt_list_inactive.gif | Bin 0 -> 181 bytes .../Scheduler/images/icon_apt_overview.gif | Bin 0 -> 343 bytes .../images/icon_apt_overview_inactive.gif | Bin 0 -> 165 bytes ZideStore/UI-X/Scheduler/product.plist | 11 ++++- 16 files changed, 117 insertions(+), 25 deletions(-) create mode 100644 ZideStore/UI-X/Scheduler/images/icon_apt_chart.gif create mode 100644 ZideStore/UI-X/Scheduler/images/icon_apt_chart_inactive.gif create mode 100644 ZideStore/UI-X/Scheduler/images/icon_apt_column_view.gif create mode 100644 ZideStore/UI-X/Scheduler/images/icon_apt_list.gif create mode 100644 ZideStore/UI-X/Scheduler/images/icon_apt_list_inactive.gif create mode 100644 ZideStore/UI-X/Scheduler/images/icon_apt_overview.gif create mode 100644 ZideStore/UI-X/Scheduler/images/icon_apt_overview_inactive.gif 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 0000000000000000000000000000000000000000..ba0f74044dbfe41d2d154ffd6973ab167366aacd GIT binary patch literal 360 zcmZ?wbhEHb6lM@$xcZ;r|NsC0{{8#&=g*HHKfZkV^7if97cX8sdGr6?y?eLc{l9hV z*3FwYZ`^)!{nhWw5C5MzbLPZ}6Z>!d-??+=j$==D?AWpW-2ZLcwyj%nc-7u>%Xgh# zHhbHWnOi0;-By`5yC|tYJGvvleN%nsPU_{bFSG(LgUR8yg!dtz2D&1U5D{1_mPr28II%4gg84K=CIFBLjmt zgAPa*WTyjb`2*FUl+3OSFGZaP`}C&voj7d3RWSc^)J>koB~8pHs;3vB*b+e9YZRTNZoWWKds1S6E<$I_NXF&=x$BwGrAUjce27V#41`mF3 hZYwUn-fVGg2g`8RNlpCx>^v@_omy&(RW%eDtN{g>T|xi= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..857db76f8b48bdc2009ef5dd55e0471354eff44d GIT binary patch literal 360 zcmZ?wbhEHb6lM@$IP#z2|NsBLfq;SG+qZ9DzkYrF`t{2vPoF=3{_x?$yLa#2x^?U3 z&6`&l7)}EL14HBDHwjIr1HHU#Y;4%r*jQOvSy)(@n3xzD85tND4jecDB+-E4PZpq@ zB!dn}9Au{hYea&YUrJ_IhLx!=Y> zE&2E9Uj!~jy!KQPlTpkoD5@{>P!bap;^$!P^kRvROYExhbDNXP8pDuZSj^Dip;{q0 qE10h&S4>jAjYn2|oo7$qti{{Anj{pm)-LUGN=`YUqP)zJ!5RP)b%;R# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4e8debf0e3ac4e703c5bcb3b6ad9800357da98a4 GIT binary patch literal 181 zcmV;m080NyNk%w1VG{rl0HXf@|NsB#$BrF6dUVRR|9u;N)-QZjJO4$|l)L#8Z>P3jjI2Hy=;dW&V`HV2 ztE-TpCKJiW<;cdy#=v02z`$_ezyTmhBcS+`g^__lkwFJ!KFCiFY$XRKTyWNrYCW-J z`A1I&2B`y|UwZOM3$F|--lAuJ#w}H#H*9b3iLh6eDQm*J%U0QHOHX%8cQ8LZowu=x zmy?6J%)^_ZyN5weq99y4TOgNxLWW53?2d4GHviPp`U+m5fH_MleX|z!ElH>p=aE?) M=eEPu!;!%n07X1=Y5)KL literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7736f48551c8a4a88ad4bf79c36bd99567c7f86a GIT binary patch literal 165 zcmZ?wbhEHb6lM@$*!-X2|NsBDZr!?k`SO;1mlw`nJ9Fxa>2uaFFfbfAZ~#bR0>z&! zj0_AM3_2hwkQojvK?0u6tEXB>2OJT&YtG)LrnR{_Trgd=Y;n+O z_TM6D&J9H;MY3j`l|8@o5NnCa?f309hvMexxn)1GI)3Es#~Q6;O_AMunmQR6tN{Q6 BK7arK literal 0 HcmV?d00001 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 = { -- 2.39.5