From 1bfd730c9bafbdfaba03ecf565e1e5be771b2fc7 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Thu, 18 Jan 2007 15:08:01 +0000 Subject: [PATCH] . More 2.0 UI improvements: - CSS improvements to pop-up menus - Navigator, Sidebar and Shelf rendering/sizing improvements for IE - Shelf components up to date with new 2.0 look - Shelf width improvement for Firefox - All wizards and dialogs now use the new "greyround" image set for Steps and Command Buttons panels - Replacement yellow info panel image sets git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/ui/repo/component/UINavigator.java | 9 ++-- .../web/ui/repo/component/UISidebar.java | 4 +- .../component/shelf/UIClipboardShelfItem.java | 4 +- .../web/ui/repo/component/shelf/UIShelf.java | 6 +-- source/web/css/main.css | 47 ++++++------------ source/web/images/parts/greyround_01.gif | Bin 73 -> 73 bytes source/web/images/parts/greyround_02.gif | Bin 68 -> 68 bytes source/web/images/parts/greyround_03.gif | Bin 73 -> 73 bytes source/web/images/parts/greyround_04.gif | Bin 70 -> 70 bytes source/web/images/parts/greyround_06.gif | Bin 69 -> 69 bytes source/web/images/parts/greyround_07.gif | Bin 73 -> 73 bytes source/web/images/parts/greyround_08.gif | Bin 68 -> 68 bytes source/web/images/parts/greyround_09.gif | Bin 73 -> 73 bytes source/web/images/parts/yellowInner_01.gif | Bin 170 -> 73 bytes source/web/images/parts/yellowInner_02.gif | Bin 104 -> 68 bytes source/web/images/parts/yellowInner_03.gif | Bin 270 -> 73 bytes source/web/images/parts/yellowInner_04.gif | Bin 100 -> 70 bytes source/web/images/parts/yellowInner_06.gif | Bin 72 -> 69 bytes source/web/images/parts/yellowInner_07.gif | Bin 168 -> 73 bytes source/web/images/parts/yellowInner_08.gif | Bin 70 -> 68 bytes source/web/images/parts/yellowInner_09.gif | Bin 162 -> 73 bytes source/web/images/parts/yellow_01.gif | Bin 73 -> 73 bytes source/web/images/parts/yellow_02.gif | Bin 68 -> 68 bytes source/web/images/parts/yellow_03.gif | Bin 73 -> 73 bytes source/web/images/parts/yellow_04.gif | Bin 70 -> 70 bytes source/web/images/parts/yellow_06.gif | Bin 69 -> 69 bytes source/web/images/parts/yellow_07.gif | Bin 73 -> 73 bytes source/web/images/parts/yellow_08.gif | Bin 68 -> 68 bytes source/web/images/parts/yellow_09.gif | Bin 73 -> 73 bytes 29 files changed, 25 insertions(+), 45 deletions(-) diff --git a/source/java/org/alfresco/web/ui/repo/component/UINavigator.java b/source/java/org/alfresco/web/ui/repo/component/UINavigator.java index 2439c2ae67..1ab621e0b7 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UINavigator.java +++ b/source/java/org/alfresco/web/ui/repo/component/UINavigator.java @@ -235,13 +235,12 @@ public class UINavigator extends SelfRenderingComponent // generate the javascript method to capture the tree node click events if (treePanel) { - out.write("\n\n"); - + out.write("}"); + // generate the active panel containing the tree out.write("
"); UITree tree = (UITree)context.getApplication().createComponent( diff --git a/source/java/org/alfresco/web/ui/repo/component/UISidebar.java b/source/java/org/alfresco/web/ui/repo/component/UISidebar.java index 161825223b..8287caed8b 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UISidebar.java +++ b/source/java/org/alfresco/web/ui/repo/component/UISidebar.java @@ -83,7 +83,7 @@ public class UISidebar extends SelfRenderingComponent out.write("/images/parts/sidebar_grey_01.gif\" width=5 height=5>" + ""); + out.write("/images/parts/sidebar_top_grey_bg.gif)\" height=24>"); // generate the required child components if not present if (this.getChildCount() == 1) @@ -171,7 +171,7 @@ public class UISidebar extends SelfRenderingComponent ""); // render the plugin - out.write("
"); + out.write("
"); UIComponent plugin = (UIComponent)getChildren().get(2); Utils.encodeRecursive(context, plugin); out.write("
"); diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java index d849bd071f..1582f956e1 100644 --- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java +++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java @@ -211,9 +211,9 @@ public class UIClipboardShelfItem extends UIShelfItem } // output general actions if any clipboard items are present - out.write(""); + out.write(""); out.write(buildActionLink(ACTION_PASTE_ALL, -1, bundle.getString(MSG_PASTE_ALL), null)); - out.write(" "); + out.write(" | "); out.write(buildActionLink(ACTION_REMOVE_ALL, -1, bundle.getString(MSG_REMOVE_ALL), null)); out.write(""); } diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java index 758f8859f6..614b33fda9 100644 --- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java +++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java @@ -170,8 +170,8 @@ public class UIShelf extends SelfRenderingComponent ResponseWriter out = context.getResponseWriter(); - // TODO: allow config of spacing between ShelfGroup components - out.write(""); + out.write("
"); + out.write("
"); } /** @@ -294,7 +294,7 @@ public class UIShelf extends SelfRenderingComponent ResponseWriter out = context.getResponseWriter(); - out.write("
"); + out.write("
"); } /** diff --git a/source/web/css/main.css b/source/web/css/main.css index c90d4904e7..c8f51fb963 100644 --- a/source/web/css/main.css +++ b/source/web/css/main.css @@ -216,11 +216,11 @@ a.headbarLink .moreActionsMenu { - background-color: #eeeeee; - border-top: thin solid #FFFFFF; - border-left: thin solid #FFFFFF; - border-right: thin solid #444444; - border-bottom: thin solid #444444; + background-color: #f5f5f5; + border-top: thin solid #cacfd3; + border-left: thin solid #cacfd3; + border-right: thin solid #cacfd3; + border-bottom: thin solid #cacfd3; } .welcomeHeader @@ -364,8 +364,7 @@ a.topToolbarLink, a.topToolbarLink:link, a.topToolbarLink:visited .topToolbarHighlight { background-color:#FFFFFF; - border:solid #5D6B71; - border-width:1px; + border: 1px solid #5D6B71; } a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighlight:visited @@ -377,8 +376,7 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl .statusListHighlight { background-color:#FFFFFF; - border:solid #71828A; - border-width:1px; + border: 1px solid #babfc5; } .statusListDisabled @@ -563,11 +561,6 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl padding-bottom: 8px; } -.navigator -{ - width:220px; -} - .selectListTable { border: 1px solid #999999; @@ -598,32 +591,20 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl border-color: #DDDDDD; } -.navigatorPanelTitle +#shelf { - background-color: #efefef; - color: #004488; - padding: 5px; - border-top: 1px solid #aaaaaa; + min-width: 220px; + *width: 100%; } -.navigatorPanelTitle a +#pluginBox { - font-weight: bold; + border: 1px solid #babfc5; } -.navigatorPanelTitle a:hover +.navigator { - color: #4272b4; - font-weight: bold; -} - -.navigatorPanelTitleSelected -{ - width: 220px; - font-weight: bold; - background-color: #7b7b7b; - color: white; - padding: 5px; + min-width: 220px; } .navigatorPanelBody diff --git a/source/web/images/parts/greyround_01.gif b/source/web/images/parts/greyround_01.gif index 0633b64056788c4f395bf7e451b2d517e9999949..4e923ef5a153c218f7c558f5b19f2aec1c24e141 100644 GIT binary patch delta 46 zcmebDlyvuWv#?BLXJBVo!~g>S|NlRA{_@waUnfc`@m;#5yvajd_R+C5KYbaj0e%4! A2mk;8 delta 46 zcmebDlyvuWv#?BLXJBVo!~g>S|NnpW>eZPuXC_K2@m;>9w8=wV^zpGZKYbaj0eh7a A*Z=?k diff --git a/source/web/images/parts/greyround_02.gif b/source/web/images/parts/greyround_02.gif index acebcbb99b7ebf55ec52b4ff09af8cfaf0635322..dd0b59e59b3d518b0bf8193438b4f81515cca4f7 100644 GIT binary patch delta 43 xcmZ>9k#zTTv#?BLXJBVo!~g>S|NlRA{_@waUnfc`aBJ)``e$&;GnI+K8UQ9k#zTTv#?BLXJBVo!~g>S|NnpW>eZPuXC_K2a9iwB{%3H?GnI+K8UQ))59R;> diff --git a/source/web/images/parts/greyround_03.gif b/source/web/images/parts/greyround_03.gif index 93d3d7454aa03ce482ac2201ec28bf8ceb0a74fe..66d47ef939ab1f8b88ed30da2bc07153a2ef9e57 100644 GIT binary patch delta 48 zcmebDlyvuWv#?BLXJBVo!~g>S|NlRA{_@waUnfc`2xxfud_HZfv3x~Ynym{HgEat_ CZxQeS delta 48 zcmebDlyvuWv#?BLXJBVo!~g>S|NnpW>eZPuXC_K22v~Ued^&Bb@q9&DnywoYgEat_ C(-H^( diff --git a/source/web/images/parts/greyround_04.gif b/source/web/images/parts/greyround_04.gif index d30fcca523b366c6b8835c9f7a15e8c1727cae32..4798bf7bc4e44d31593e3aeaae6aa7ae6f235c23 100644 GIT binary patch delta 45 zcmZ>BlXUlVv#?BLXJBVo!~g>S|NlRA{_@waUnfc`@M>&cv*+E>Zwa!+stncuY%mg8 delta 45 zcmZ>BlXUlVv#?BLXJBVo!~g>S|NnpW>eZPuXC_K2@LFtIv*+E>ZwaEsstncuYQPdV diff --git a/source/web/images/parts/greyround_06.gif b/source/web/images/parts/greyround_06.gif index f5ecb290660fd6a72ca99d01954017583f8ced27..2779c1e63693c726781c7ccf2311afca17b83854 100644 GIT binary patch delta 44 ycmZ>Dm2~%Xv#?BLXJBVo!~g>S|NlRA{_@waUnfc`@L25H^k$Xg%NMgb8LRDm2~%Xv#?BLXJBVo!~g>S|NnpW>eZPuXC_K2@M!GX{AQKo%NMgb8LRS|NlRA{_@waUnfc`2xx3xv*+E!9nYjwj?HQHXRrnU DtwI!b delta 48 zcmebDlyvuWv#?BLXJBVo!~g>S|NnpW>eZPuXC_K22v}@dv**ahA1t*hr{=W#Ggt!v DrxFv` diff --git a/source/web/images/parts/greyround_08.gif b/source/web/images/parts/greyround_08.gif index d012e57b78052f0b714f3105a3cd5c2fdd5bd005..6cb81e6aaf0f2dedef37a3cc3d123d441550ce27 100644 GIT binary patch delta 43 xcmZ>9k#zTTv#?BLXJBVo!~g>S|NlRA{_@waUnfc`a9ixU^Y22Zrz;bKH2_3~5eEPO delta 43 xcmZ>9k#zTTv#?BLXJBVo!~g>S|NnpW>eZPuXC_K2aBJ+k^Y22hr#lmaH2^|85Yzww diff --git a/source/web/images/parts/greyround_09.gif b/source/web/images/parts/greyround_09.gif index a69b9c5dfa59a6888831b9166473a1dbc344698d..60c70bb40bd85b2eeec0fdadf6ad946da4b45a7c 100644 GIT binary patch delta 48 zcmebDlyvuWv#?BLXJBVo!~g>S|NlRA{_@waUnfc`2w3de^k$W%qeAMG4qq!z25SJG CJ`#oi delta 48 zcmebDlyvuWv#?BLXJBVo!~g>S|NnpW>eZPuXC_K22x#ou{ASfoM}^cWJ-$|+4Auak CT@um& diff --git a/source/web/images/parts/yellowInner_01.gif b/source/web/images/parts/yellowInner_01.gif index 8d7cc10a09676e36d4e509d4944b4ecbbbe9372f..b34221a59554ba2a7f9c9df02c39a02b0b6f2562 100644 GIT binary patch literal 73 zcmZ?wbhEHbWM^P!Si}GV|Ns9#b^h}I|7U;+|z`(+w1LAR5YXATM literal 170 zcmV;b09F4-Nk%w1VFv&Q0K@r; Yc+P?t1wx0BFi0W;&g4*tKm;KGJI1hF*8l(j diff --git a/source/web/images/parts/yellowInner_02.gif b/source/web/images/parts/yellowInner_02.gif index d511ea9dca472814b0bed6f629e5dcc50628edec..b8d148e93b650a27396b66223659a59517f67dbd 100644 GIT binary patch literal 68 zcmZ?wbhEHbWM^P!Si}GV|Ns9#b^h}I|7U;+|z`(+w1LA@xai LaLO~4iNP8G;4KpA literal 104 zcmZ?wbhEHbWM^P!*vtR||3To)g9n>0UR?g?+ZFrV66dupSm(sTU=0AA%_Zaj diff --git a/source/web/images/parts/yellowInner_03.gif b/source/web/images/parts/yellowInner_03.gif index 1fe4c98e55e918592796e1242f8e9ff93e3e174a..10ea4ef6572eec9e417aa7b67ce6e27420149c28 100644 GIT binary patch literal 73 zcmZ?wbhEHbWM^P!Si}GV|Ns9#b^h}I|7U;+|z`(+w1LA!j QZL6_-MOm7y3loDi07sS-!2kdN literal 270 zcmZ?wbhEHbWM^P!xXJ(m|3To)zkjEH{W|gW>ygi&4}JJ>;PvZ0FJJC@`gHrlhg%*z z*nI!~raN~wT)MR4!i8mL&o24%=hW}tC%=C`_U+rzPoECGd9(N4y-hc6tX;KY#foLi zmM&hrc;Uj$8#gXouweW4?VC1jTC-*i&-*aQF tK7|P<+JaLOWM;Ofl{l)1@Sa~0WFRBNJu$^;L4=TEV}im$83#uOYXHK-X(Rvu diff --git a/source/web/images/parts/yellowInner_04.gif b/source/web/images/parts/yellowInner_04.gif index 3212024ce4b2a8f8fee4c30cb824efa69f4f36cd..4b19ecbff5698b619d6dc829a41e708d3519705a 100644 GIT binary patch literal 70 zcmZ?wbhEHbWM^P!Si}GV|Ns9#b^h}I|7U;+|z`(+w1LA6lL@JtlaY2yKH%a4Aua5FCe`D diff --git a/source/web/images/parts/yellowInner_06.gif b/source/web/images/parts/yellowInner_06.gif index 15e5fada62d634be93bd85fd63a3e96df182f9be..74b4f76a6e843f5081e310af62ba542625422c07 100644 GIT binary patch literal 69 zcmZ?wbhEHbWM^P!Si}GV|Ns9#b^h}I|7U;+|z`(+w1LAj-^Au#N^=!vum%7V6B>j7 diff --git a/source/web/images/parts/yellowInner_07.gif b/source/web/images/parts/yellowInner_07.gif index 3b114fa15f4d3f68a620a05f4d0bd9f485f6210c..dae4da34819db98b77e28fe8962060c31cdacc72 100644 GIT binary patch literal 73 zcmZ?wbhEHbWM^P!Si}GV|Ns9#b^h}I|7U;+|z`(+w1LAygi&4}JJ>;PvZ0FJJC@`gHq)2b=%= zIraPZ$?xBfefxIw)2Bmk-|l73?b@}=moHzo zY#Go*u-OcXKUo+V7-SiAKwOZW46LdTwz=>tbKFsys&206T3i;HB+z^z^VCCwX20c5 PjTRhEiqDcb85yhrnO<7Y diff --git a/source/web/images/parts/yellowInner_08.gif b/source/web/images/parts/yellowInner_08.gif index 99a3e7903b078c820a7a377c024c5752ff521646..754cef5aef205b9c6c32180c09a64a4c632dbb4a 100644 GIT binary patch literal 68 zcmZ?wbhEHbWM^P!Si}GV|Ns9#b^h}I|7U;+|z`(+w1LA+|z`(+w1LAXZ&&D^CV%08eEVR{#J2 literal 162 zcmZ?wbhEHbWM^P!IKlt||3To)zkjEH{W|gW>ybZyPW}FU^85E=-@Y9^d;0XrW e3*8lanIHN*N>DhTBGaS|NlRA{__9-wSLE!exnKLI!D)C*urL@UIUG(v>H9vhBtO0T|5?TNN diff --git a/source/web/images/parts/yellow_02.gif b/source/web/images/parts/yellow_02.gif index 83d79a719746b2bf40f24ea85d1bd9f36e8443b3..33db922df837973aa12a2c907bb947c21d24cf90 100644 GIT binary patch delta 43 xcmZ>9k#zTTv#?BLXJBVo!~g>S|NlRA{__9-w9k#zTTv#?BLXJBVo!~g>SLE!exnKLI!DsWruQvPRf$}^RT!5RQE2M=ff diff --git a/source/web/images/parts/yellow_03.gif b/source/web/images/parts/yellow_03.gif index c9a616b05d39c14a63bae7b8de8c817dacb664d3..686be6b772206de047029505c304f0389efd9fe3 100644 GIT binary patch delta 48 zcmebDlyvuWv#?BLXJBVo!~g>S|NlRA{__9-wSLE!exnKLI!DhOD3`FuKUtMPnAS(>gJ6N5DXjC2u- diff --git a/source/web/images/parts/yellow_04.gif b/source/web/images/parts/yellow_04.gif index 7222359234036677e8362ded913b2c7b85e90a0e..94974d1ff52c97ababb68d919fe51abe9df7025b 100644 GIT binary patch delta 45 zcmZ>BlXUlVv#?BLXJBVo!~g>S|NlRA{__9-w&cv*+E>Zwa!+stncuYvK}9 delta 45 wcmZ>BlXUlVv#?BLXJBVo!~g>SLE!exnKLI!D)3rtTC?Zf(QgT&#i|U}0Abq^xc~qF diff --git a/source/web/images/parts/yellow_06.gif b/source/web/images/parts/yellow_06.gif index bb7646a73c5ba5d4262ee30c8cc3a5541fc1562b..01a112e9122250c06b6093fc6666f4dd57b7f43d 100644 GIT binary patch delta 44 ycmZ>Dm2~%Xv#?BLXJBVo!~g>S|NlRA{__9-wDm2~%Xv#?BLXJBVo!~g>SLE!exnKLI!D)4CR+WcmfS|NlRA{__9-wSLE!exnKLI!DhOC?TC?Zf#2wFsQ;yAP_h+yM0HGBV A*Z=?k diff --git a/source/web/images/parts/yellow_08.gif b/source/web/images/parts/yellow_08.gif index 5901455497ff7c797986b8d88529523d703002b5..4b85fa0dfb6a8963a33d1397f7fe8549e36a7513 100644 GIT binary patch delta 43 xcmZ>9k#zTTv#?BLXJBVo!~g>S|NlRA{__9-w9k#zTTv#?BLXJBVo!~g>SLE!exnKLI!DsXG;y7TWsuctc`gEas;QV>=E diff --git a/source/web/images/parts/yellow_09.gif b/source/web/images/parts/yellow_09.gif index 913341c98ec1274fd520bb8969f86b239fa94934..de36e85e7a8317096abd894bcf9c8de19ccd6e74 100644 GIT binary patch delta 48 zcmebDlyvuWv#?BLXJBVo!~g>S|NlRA{__9-wSLE!exnKLI!DhO!o+WcnKPC