hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PLUG-90 - fix workzone toggle state

Browse Source
This commit is contained in:
Florian BLOUET
2015-09-04 17:42:01 +02:00
committed by Benoît Burnichon
parent 75c9abbd1b
commit 7552d33a8f
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
templates/web/prod/index.html.twig
View File

@@ -183,16 +183,6 @@
{% block tabs_panel %} {% block tabs_panel %}
<div id="retractableButton"></div> <div id="retractableButton"></div>
{% include 'prod/tab_headers.html.twig' %} {% 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"> <div id="baskets" class="PNB">
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %} {% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %}
{{WorkZoneMacros.make_bloc(app, WorkZone)}} {{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')} %} {% include 'prod/tab_thesaurus.html.twig' with {has_access_to_module: app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus')} %}
{% endif %} {% endif %}
{% endblock %} {% 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> </div>
<div id="basket_menu" class="context-menu context-menu-theme-vista" style="display:none;"> <div id="basket_menu" class="context-menu context-menu-theme-vista" style="display:none;">

2
templates/web/prod/tab_headers.html.twig
View File

@@ -23,7 +23,7 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
<li class="ui-tabs-selected ui-corner-top baskets"> <li class="ui-corner-top baskets">
<a href="#baskets" class="WZbasketTab"> <a href="#baskets" class="WZbasketTab">
<div id="basket_menu_trigger">&#9660;</div> <div id="basket_menu_trigger">&#9660;</div>
</a> </a>

4
www/skins/prod/jquery.WorkZone.js
View File

@@ -561,8 +561,7 @@ var p4 = p4 || {};
if (!frame.hasClass('closed')) { if (!frame.hasClass('closed')) {
// hide tabs content // hide tabs content
var activeTabIdx = $('#idFrameC .tabs').tabs("option", "active"); $('#idFrameC .tabs > .ui-tabs-panel').hide();
$('#idFrameC .tabs > div:eq(' + activeTabIdx + ')').hide();
frame.data('openwidth', frame.width()); frame.data('openwidth', frame.width());
frame.animate({width: 100}, frame.animate({width: 100},
@@ -575,7 +574,6 @@ var p4 = p4 || {};
}); });
frame.addClass('closed'); frame.addClass('closed');
$('.escamote', frame).hide(); $('.escamote', frame).hide();
$('li.ui-tabs-selected', frame).removeClass('ui-tabs-selected');
frame.unbind('click.escamote').bind('click.escamote', function () { frame.unbind('click.escamote').bind('click.escamote', function () {
that.open(); that.open();
}); });