Merge pull request #1253 from kwemi/design-update-v1

Design update

lib/classes/eventsmanager/notify/orderdeliver.php

@@ -26,7 +26,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
      */
     public function icon_url()
     {
-        return '/skins/prod/000000/images/disktt_history.gif';
+        return '/skins/prod/000000/images/disktt_history.png';
     }
 
     /**

lib/classes/eventsmanager/notify/ordernotdelivered.php

@@ -24,7 +24,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
 
     public function icon_url()
     {
-        return '/skins/prod/000000/images/disktt_history.gif';
+        return '/skins/prod/000000/images/disktt_history.png';
     }
 
     public function datas(array $data, $unread)

templates/web/prod/WorkZone/Basket.html.twig

@@ -2,29 +2,30 @@
 {% set basket_length = basket.getElements()|length %}
     <div class="tools">
 
+      <label>Actions</label>
 
       <button class="ui-corner-all TOOL_disktt_btn basket_window" title="{{ 'action : exporter' | trans }}">
-        <img src="/skins/prod/000000/images/disktt_history.gif"/>
+        <img src="/skins/prod/000000/images/disktt_history.png"/>
       </button>
       <button class="ui-corner-all TOOL_print_btn basket_window" title="{{ 'action : print' | trans }}">
-        <img src="/skins/prod/000000/images/print_history.gif"/>
+        <img src="/skins/prod/000000/images/print_history.png"/>
       </button>
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('modifyrecord') %}
       <button class="ui-corner-all TOOL_ppen_btn basket_window" title="{{ 'action : editer' | trans }}">
-        <img src="/skins/prod/000000/images/ppen_history.gif"/>
+        <img src="/skins/prod/000000/images/ppen_history.png"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('changestatus') %}
       <button class="ui-corner-all TOOL_chgstatus_btn basket_window" title="{{ 'action : status' | trans }}">
-        <img src="/skins/prod/000000/images/chgstatus_history.gif"/>
+        <img src="/skins/prod/000000/images/chgstatus_history.png"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('deleterecord') and app['acl'].get(app['authentication'].getUser()).has_right('addrecord') %}
       <button class="ui-corner-all TOOL_chgcoll_btn basket_window" title="{{ 'action : collection' | trans }}">
-        <img src="/skins/prod/000000/images/chgcoll_history.gif"/>
+        <img src="/skins/prod/000000/images/chgcoll_history.png"/>
       </button>
       {% endif %}
 
@@ -50,7 +51,7 @@
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('doctools') %}
       <button class="ui-corner-all TOOL_imgtools_btn basket_window" title="{{ 'action : outils' | trans }}">
-        <img src="/skins/prod/000000/images/imgtools_history.gif"/>
+        <img src="/skins/prod/000000/images/imgtools_history.png"/>
       </button>
       {% endif %}
       <button class="ui-corner-all TOOL_trash_btn basket_window" title="{{ 'action : supprimer' | trans }}">

templates/web/prod/WorkZone/Macros.html.twig

@@ -15,7 +15,7 @@
                     {% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}">
           <a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}">
             <span>
-              <!--img src='/skins/icons/basket.gif' title=''/-->
+              <img src='/skins/icons/basket.png' title=''/>
               {{basket.getName()}}
             </span>
           </a>
@@ -85,7 +85,7 @@
                     {% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}">
           <a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}" style="">
             <span>
-              <!--img src='/skins/icons/basket.gif' title=''/-->
+              <img src='/skins/icons/basket.png' title=''/>
               {{basket.getName()}}
             </span>
           </a>

templates/web/prod/WorkZone/Story.html.twig

@@ -3,27 +3,27 @@
     <div class="tools">
 
       <button class="ui-corner-all TOOL_disktt_btn story_window" title="{{ 'action : exporter' | trans }}">
-        <img src="/skins/prod/000000/images/disktt_history.gif"/>
+        <img src="/skins/prod/000000/images/disktt_history.png"/>
       </button>
       <button class="ui-corner-all TOOL_print_btn story_window" title="{{ 'action : print' | trans }}">
-        <img src="/skins/prod/000000/images/print_history.gif"/>
+        <img src="/skins/prod/000000/images/print_history.png"/>
       </button>
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('modifyrecord') %}
       <button class="ui-corner-all TOOL_ppen_btn story_window" title="{{ 'action : editer' | trans }}">
-        <img src="/skins/prod/000000/images/ppen_history.gif"/>
+        <img src="/skins/prod/000000/images/ppen_history.png"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('changestatus') %}
       <button class="ui-corner-all TOOL_chgstatus_btn story_window" title="{{ 'action : status' | trans }}">
-        <img src="/skins/prod/000000/images/chgstatus_history.gif"/>
+        <img src="/skins/prod/000000/images/chgstatus_history.png"/>
       </button>
       {% endif %}
 
       {% if app['acl'].get(app['authentication'].getUser()).has_right('deleterecord') and app['acl'].get(app['authentication'].getUser()).has_right('addrecord') %}
       <button class="ui-corner-all TOOL_chgcoll_btn story_window" title="{{ 'action : collection' | trans }}">
-        <img src="/skins/prod/000000/images/chgcoll_history.gif"/>
+        <img src="/skins/prod/000000/images/chgcoll_history.png"/>
       </button>
       {% endif %}
 

templates/web/prod/index.html.twig

@@ -547,7 +547,7 @@
                     <span class="dropdownButton">
                         <div class="btn-group">
                             <button class="default_action TOOL_disktt_btn results_window btn btn-inverse">
-                                <img src="/skins/prod/000000/images/disktt_history.gif" height="16" width="16" /> {{ 'action : exporter' | trans }}
+                                <img src="/skins/prod/000000/images/disktt_history.png" height="16" width="16" /> {{ 'action : exporter' | trans }}
                             </button>
                             <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                             <ul class="dropdown-menu">
@@ -566,7 +566,7 @@
                         {% set label %}
                             {{ 'action : editer' | trans }}
                         {% endset %}
-                        {% set actions = actions|merge( { 'edit' : {'icon': "/skins/prod/000000/images/ppen_history.gif", 'class':'TOOL_ppen_btn', 'label' : label} }) %}
+                        {% set actions = actions|merge( { 'edit' : {'icon': "/skins/prod/000000/images/ppen_history.png", 'class':'TOOL_ppen_btn', 'label' : label} }) %}
                     {% endif %}
                     {% if app['acl'].get(app['authentication'].getUser()).has_right('changestatus') %}
                         {% set label %}

templates/web/prod/preview/caption.html.twig

@@ -3,7 +3,7 @@
   {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id, 'canmodifrecord') %}
     <div class="edit_button" style="text-align:right">
       <a href="#" onclick="editThis('IMGT','{{record.get_serialize_key()}}');">
-        <img style="vertical-align:middle" src="/skins/prod/000000/images/ppen_history.gif" />
+        <img style="vertical-align:middle" src="/skins/prod/000000/images/ppen_history.png" />
         {{ 'action : editer' | trans }}
       </a>
     </div>

www/skins/prod/000000/prodcolor.css

@@ -187,7 +187,7 @@ span.ww_winTitle {
 }
 
 #idFrameC .wrapper {
-    background-color: #333333;
+    background-color: #3b3b3b;
     right: 10px;
 }
 
@@ -237,7 +237,7 @@ span.ww_winTitle {
     width: auto;
     height: 81px;
     display: inline-block;
-    background-color: #333333;
+    background-color: #3b3b3b;
     z-index: 10;
 }
 
@@ -254,13 +254,14 @@ span.ww_winTitle {
     margin-left: 5px;
 }
 
+#idFrameC .ui-tabs .ui-tabs-nav li {
+    border-radius: 0;
+}
+
 #idFrameC .ui-tabs .ui-tabs-nav li a {
-    padding: 5px;
+    padding: 0;
-    margin: 5px;
+    margin: 0;
-    border-radius: 4px;
+    border-radius: 0;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    margin:8px 0;
 }
 
 #idFrameC .ui-tabs .ui-tabs-nav li a.escamote {
@@ -273,6 +274,7 @@ span.ww_winTitle {
 
 #idFrameC .ui-tabs .ui-tabs-nav li.ui-state-active a {
     background-color: #666666;
+    border-bottom: 3px solid #076882;
 }
 
 #idFrameC ul.icon-menu {
@@ -283,22 +285,26 @@ span.ww_winTitle {
     display: block;
     background-image: url("/skins/icons/workzone32.png");
     background-repeat: no-repeat;
-    background-position: 8px 5px;
+    background-position: 18px 18px;
-    width: 54px;
+    width: 91px;
-    height: 32px;
+    height: 78px;
 }
 
 #idFrameC .icon-menu .WZtabs {
     display: block;
-    width: 32px;
+    width: 91px;
-    height: 32px;
+    height: 78px;
+    line-height: 78px;
+    vertical-align: middle;
+    text-align: center;
 }
 
 #basket_menu_trigger {
-     padding: 7px 3px;
+    padding: 34px 9px 0 0;
-     float: right;
+    float: right;
-     font-size: 12px;
+    font-size: 9px;
-     cursor: pointer;
+    cursor: pointer;
+    cursor: pointer;
 }
 
 #idFrameC.closed .icon-menu li {
@@ -315,11 +321,6 @@ span.ww_winTitle {
     display: none;
 }
 
-#idFrameC li.proposals_WZ.active img.proposals_on,
-#idFrameC li.proposals_WZ img.proposals_off {
-    display: block;
-}
-
 .ui-tabs .ui-tabs-nav li a {
     padding: 10px 8px;
     font-size: 0.8em;
@@ -343,7 +344,7 @@ span.ww_winTitle {
     display: block;
     border-width: 0;
     padding: 0px;
-    background-color: #333333;
+    background-color: #3b3b3b;
 }
 
 .ui-tabs .ui-tabs-panel.tabBox {
@@ -424,7 +425,7 @@ span.ww_winTitle {
     margin-bottom: 0;
     height: 44px;
     line-height: 44px;
-    background-color: #333333;
+    background-color: #3b3b3b;
     border-top: 1px solid #000;
     border-radius: 0;
 }
@@ -710,20 +711,37 @@ div.diapo {
     margin-bottom: 0px;
     margin-top: 0px;
     height: 30px;
-    background-color: #333333;
+    background-color: #3b3b3b;
     font-size:10px;
     z-index:100;
     height:45px;
 }
 
+#idFrameC .tools {
+    text-align: left !important;
+}
+
+#idFrameC .tools label {
+    display: inline;
+    margin: 0 15px 0 0;
+    float: left;
+    font-size: 11px;
+    color: #7f7f7f;
+    line-height: 22px;
+    vertical-align: middle;
+}
+
 #idFrameT .tools .classicButton button.btn,
 #idFrameT .tools .dropdownButton {
     margin: 0;
 }
 
+#idFrameT .tools:first-child .btn-group {
+    border-left: 1px solid #000;
+}
+
 #idFrameT .tools .btn-group {
     float: left;
-    border-right: 1px solid #000;
 }
 
 #idFrameT .tools .classicButton button.btn,
@@ -751,7 +769,7 @@ div.diapo {
     padding-left: 5px;
     */
     background-image: none;
-    background-color: #333333;
+    background-color: #3b3b3b;
     border-radius: 0;
     margin: 0;
     height: 45px;
@@ -1060,8 +1078,9 @@ div.diapo {
 
 #baskets .SSTT img {
     max-height: 18px;
-    vertical-align: top;
+    vertical-align: middle;
     cursor: help;
+    margin-right: 9px;
 }
 
 #baskets .SSTT.grouping.active {
@@ -1832,7 +1851,7 @@ H4 {
 
 .bodyprofile .ui-tabs .ui-tabs-panel {
     background-color: #a3a3a3;
-    color: #333333;
+    color: #3b3b3b;
 }
 
 .bodyprofile .ui-tabs .ui-tabs-nav li.ui-tabs-active {
@@ -2766,7 +2785,7 @@ DIV.thesaurus U.w {
 }
 
 #mainMenu, .publi_group {
-    background-color: #333333;
+    background-color: #3b3b3b;
 }
 
 .context-menu-item a {
@@ -4023,7 +4042,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
 #uploadBox .well {
     margin: 0;
     padding: 0.5%;
-    color: #333333;
+    color: #3b3b3b;
 }
 
 #uploadBox #fileupload {
@@ -4274,7 +4293,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
 #lazaretBox .lazaret-file a,
 #lazaretBox .lazaret-proposals a {
     font-weight: normal;
-    color: #333333;
+    color: #3b3b3b;
 }
 
 #lazaretBox .lazaret-file a:hover,