From d7581d68327cb64be1af79defd7a373ea32a31ba Mon Sep 17 00:00:00 2001
From: Ysolyne Gresille <ygresille@alchemy.fr>
Date: Tue, 19 Jun 2012 14:57:36 +0200
Subject: [PATCH] workzone view bugfixes

---
 templates/web/prod/index.html.twig  |  7 ++--
 www/skins/prod/000000/prodcolor.css | 60 ++++++++++++++++++++++-------
 www/skins/prod/959595/prodcolor.css | 54 ++++++++++++++++++++++----
 3 files changed, 95 insertions(+), 26 deletions(-)

diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 89c38e7edb..723338ea4f 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -145,19 +145,18 @@
                     <ul class="icon-menu ui-tabs-nav ui-helper-reset">
                         <li class="ui-tabs-selected ui-corner-top">
                             <a href="#baskets" id="WZbaskets">
-                                <img src="/skins/icons/workzone32.png" title="{% trans 'phraseanet:: panier' %}"/>
-                                <span id="basket_menu_trigger" style="cursor:pointer;padding:3px;font-size:12px;">&#9660;</span>
+                                <div id="basket_menu_trigger">&#9660;</div>
                             </a>
                         </li>
                         {% if GV_thesaurus %}
                         <li class="proposals_WZ">
-                            <a href="#proposals">
+                            <a href="#proposals" id="WZproposals">
                                 <img class="proposals_off" src="/skins/icons/proposition_off32.png" title="{% trans 'phraseanet:: propositions' %}"/>
                                 <img class="proposals_on" src="/skins/icons/proposition_on32.png" title="{% trans 'phraseanet:: propositions' %}"/>
                             </a>
                         </li>
                         <li>
-                            <a href="#thesaurus_tab">
+                            <a href="#thesaurus_tab" id="WZthesaurus">
                                 <img src="/skins/icons/thesaurus_32.png" title="{% trans 'phraseanet:: thesaurus' %}"/>
                             </a>
                         </li>
diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index 791cee604f..6960fb2ce5 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -210,31 +210,67 @@ span.ww_winTitle {
     overflow: hidden;
 }
 
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
+    background-color: #404040;
+    border: none;
+}
+
 #idFrameC .ui-tabs .ui-tabs-nav li {
+    width: auto;
+    *width: 74px;
     height: 52px;
-    float: left;
+    display: inline-block;
+    background-color: #404040;
+    z-index: 1000;
 }
 
 #idFrameC .ui-tabs .ui-tabs-nav li a {
     padding: 5px;
     margin: 5px;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
 }
 
-#idFrameC .icon-menu #WZbaskets {
-    *background-image: url("/skins/icons/workzone32.png");
-    *background-repeat: no-repeat;
-    width: 54px;
-    height: 32px;
-}
-
-#idFrameC.closed .icon-menu li {
-    clear: left;
+#idFrameC .ui-tabs .ui-tabs-nav li:hover a {
+    background-color: #666666;
 }
 
 #idFrameC .ui-tabs .ui-tabs-nav li.ui-state-active a {
     background-color: #666666;
 }
 
+#idFrameC ul.icon-menu {
+    width: 100%;
+}
+
+#idFrameC .icon-menu #WZbaskets {
+    display: block;
+    background-image: url("/skins/icons/workzone32.png");
+    background-repeat: no-repeat;
+    background-position: 8px 5px;
+    width: 54px;
+    height: 32px;
+}
+
+#idFrameC .icon-menu #WZproposals,
+#idFrameC .icon-menu #WZthesaurus {
+    display: block;
+    width: 32px;
+    height: 32px;
+}
+
+#idFrameC .icon-menu #WZbaskets #basket_menu_trigger {
+     padding: 7px 3px;
+     float: right;
+     font-size: 12px;
+     cursor: pointer;
+}
+
+#idFrameC.closed .icon-menu li {
+    clear: left;
+}
+
 #idFrameC.closed .ui-tabs-panel,
 #idFrameC.closed .ui-resizable-handle {
     display: none;
@@ -250,10 +286,6 @@ span.ww_winTitle {
     display: block;
 }
 
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
-    background-color: #404040;
-    border: none;
-}
 .ui-tabs .ui-tabs-nav li a {
     padding: 10px 8px;
     font-size: 0.8em;
diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css
index 70eac06c1e..7ff83a24de 100644
--- a/www/skins/prod/959595/prodcolor.css
+++ b/www/skins/prod/959595/prodcolor.css
@@ -210,24 +210,67 @@ span.ww_winTitle {
     overflow: hidden;
 }
 
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
+    background-color: #B1B1B1;
+    border: none;
+}
+
 #idFrameC .ui-tabs .ui-tabs-nav li {
+    width: auto;
+    *width: 74px;
     height: 52px;
-    float: left;
+    display: inline-block;
+    background-color: #B1B1B1;
+    z-index: 1000;
 }
 
 #idFrameC .ui-tabs .ui-tabs-nav li a {
     padding: 5px;
     margin: 5px;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
 }
 
-#idFrameC.closed .icon-menu li {
-    clear: left;
+#idFrameC .ui-tabs .ui-tabs-nav li:hover a {
+    background-color: #666666;
 }
 
 #idFrameC .ui-tabs .ui-tabs-nav li.ui-state-active a {
     background-color: #666666;
 }
 
+#idFrameC ul.icon-menu {
+    width: 100%;
+}
+
+#idFrameC .icon-menu #WZbaskets {
+    display: block;
+    background-image: url("/skins/icons/workzone32.png");
+    background-repeat: no-repeat;
+    background-position: 8px 5px;
+    width: 54px;
+    height: 32px;
+}
+
+#idFrameC .icon-menu #WZproposals,
+#idFrameC .icon-menu #WZthesaurus {
+    display: block;
+    width: 32px;
+    height: 32px;
+}
+
+#idFrameC .icon-menu #WZbaskets #basket_menu_trigger {
+     padding: 7px 3px;
+     float: right;
+     font-size: 12px;
+     cursor: pointer;
+}
+
+#idFrameC.closed .icon-menu li {
+    clear: left;
+}
+
 #idFrameC.closed .ui-tabs-panel,
 #idFrameC.closed .ui-resizable-handle {
     display: none;
@@ -243,11 +286,6 @@ span.ww_winTitle {
     display: block;
 }
 
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
-    background-color: #B1B1B1;
-    border: none;
-}
-
 .ui-tabs .ui-tabs-nav li a {
     padding: 10px 8px;
     font-size: 0.8em;