From 7552d33a8f6762878d0620bd1c309e0ac2d49178 Mon Sep 17 00:00:00 2001
From: Florian BLOUET <florian.blouet@gmail.com>
Date: Fri, 4 Sep 2015 17:42:01 +0200
Subject: [PATCH] PLUG-90 - fix workzone toggle state

---
 templates/web/prod/index.html.twig       | 20 ++++++++++----------
 templates/web/prod/tab_headers.html.twig |  2 +-
 www/skins/prod/jquery.WorkZone.js        |  4 +---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index c337f428c5..bff5ed5fb2 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -183,16 +183,6 @@
                     {% block tabs_panel %}
                         <div id="retractableButton"></div>
                         {% include 'prod/tab_headers.html.twig' %}
-                        {% set workzone_plugins = app['plugin.workzone'] %}
-                        {% set workzone_plugins_class = 'single-plugin' %}
-                        {% if workzone_plugins.keys()|length > 1 %}
-                            {% set workzone_plugins_class = 'multiple-plugin' %}
-                        {% endif %}
-                        <div id="plugins" class="PNB {{ workzone_plugins_class }}" style="top:52px;">
-                            {% for plugin in workzone_plugins.keys() %}
-                                {% include workzone_plugins[plugin].getWorkzoneTemplate() with {'app': app, 'plugin_id': plugin} only %}
-                            {% endfor %}
-                        </div>
                         <div id="baskets" class="PNB">
                             {% import 'prod/WorkZone/Macros.html.twig'  as  WorkZoneMacros %}
                             {{WorkZoneMacros.make_bloc(app, WorkZone)}}
@@ -205,6 +195,16 @@
                             {% include 'prod/tab_thesaurus.html.twig' with {has_access_to_module: app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus')} %}
                         {% endif %}
                     {% endblock %}
+                    {% set workzone_plugins = app['plugin.workzone'] %}
+                    {% set workzone_plugins_class = 'single-plugin' %}
+                    {% if workzone_plugins.keys()|length > 1 %}
+                        {% set workzone_plugins_class = 'multiple-plugin' %}
+                    {% endif %}
+                    <div id="plugins" class="PNB {{ workzone_plugins_class }}" style="top:52px;">
+                        {% for plugin in workzone_plugins.keys() %}
+                            {% include workzone_plugins[plugin].getWorkzoneTemplate() with {'app': app, 'plugin_id': plugin} only %}
+                        {% endfor %}
+                    </div>
                 </div>
             </div>
             <div id="basket_menu" class="context-menu context-menu-theme-vista" style="display:none;">
diff --git a/templates/web/prod/tab_headers.html.twig b/templates/web/prod/tab_headers.html.twig
index 499644b886..ebf3f0b48b 100644
--- a/templates/web/prod/tab_headers.html.twig
+++ b/templates/web/prod/tab_headers.html.twig
@@ -23,7 +23,7 @@
                     </a>
                 </li>
             {% endif %}
-            <li class="ui-tabs-selected ui-corner-top baskets">
+            <li class="ui-corner-top baskets">
                 <a href="#baskets" class="WZbasketTab">
                     <div id="basket_menu_trigger">&#9660;</div>
                 </a>
diff --git a/www/skins/prod/jquery.WorkZone.js b/www/skins/prod/jquery.WorkZone.js
index 810d1886d4..0487adb4f3 100644
--- a/www/skins/prod/jquery.WorkZone.js
+++ b/www/skins/prod/jquery.WorkZone.js
@@ -561,8 +561,7 @@ var p4 = p4 || {};
 
                 if (!frame.hasClass('closed')) {
                     // hide tabs content
-                    var activeTabIdx = $('#idFrameC .tabs').tabs("option", "active");
-                    $('#idFrameC .tabs > div:eq(' + activeTabIdx + ')').hide();
+                    $('#idFrameC .tabs > .ui-tabs-panel').hide();
 
                     frame.data('openwidth', frame.width());
                     frame.animate({width: 100},
@@ -575,7 +574,6 @@ var p4 = p4 || {};
                         });
                     frame.addClass('closed');
                     $('.escamote', frame).hide();
-                    $('li.ui-tabs-selected', frame).removeClass('ui-tabs-selected');
                     frame.unbind('click.escamote').bind('click.escamote', function () {
                         that.open();
                     });