hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2382 from mike-esokia/PHRAS-1727_PORT_PHRAS-1577

Browse Source 
PHRAS-1727 Port PHRAS-1577
This commit is contained in:
Nicolas Maillat
2018-01-08 12:01:48 +01:00
committed by GitHub
parent dffb227dc1 e838b6f166
commit bdab445192
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -41,9 +41,9 @@
</button> </button>
{% endif %} {% endif %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %} {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %}
<button class="ui-corner-all TOOL_bridge_btn basket_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}"> {#<button class="ui-corner-all TOOL_bridge_btn basket_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}">#}
<img src="/assets/common/images/icons/door.png"/> {#<img src="/assets/common/images/icons/door.png"/>#}
</button> {#</button>#}
<button class="ui-corner-all TOOL_publish_btn basket_window" title="{{ 'action : publier' | trans }}" data-selection-source="basket"> <button class="ui-corner-all TOOL_publish_btn basket_window" title="{{ 'action : publier' | trans }}" data-selection-source="basket">
<img src="/assets/common/images/icons/rss16.png"/> <img src="/assets/common/images/icons/rss16.png"/>
</button> </button>

6
templates/web/prod/WorkZone/Story.html.twig
View File

@@ -41,9 +41,9 @@
</button> </button>
{% endif %} {% endif %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %} {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %}
<button class="ui-corner-all TOOL_bridge_btn story_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}" data-selection-source="story"> {#<button class="ui-corner-all TOOL_bridge_btn story_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}" data-selection-source="story">#}
<img src="/assets/common/images/icons/door.png"/> {#<img src="/assets/common/images/icons/door.png"/>#}
</button> {#</button>#}
<button class="ui-corner-all TOOL_publish_btn story_window" title="{{ 'action : publier' | trans }}" data-selection-source="story"> <button class="ui-corner-all TOOL_publish_btn story_window" title="{{ 'action : publier' | trans }}" data-selection-source="story">
<img src="/assets/common/images/icons/rss16.png"/> <img src="/assets/common/images/icons/rss16.png"/>
</button> </button>

62
templates/web/prod/toolbar.html.twig
View File

@@ -139,13 +139,13 @@
{{ 'Feedback' | trans }} {{ 'Feedback' | trans }}
</a> </a>
</li> </li>
<li class="divider"></li> {#<li class="divider"></li>#}
<li> {#<li>#}
<a class="TOOL_bridge_btn results_window" href="{{ path("prod_bridge_manager") }}" data-selection-source="search-result"> {#<a class="TOOL_bridge_btn results_window" href="{{ path("prod_bridge_manager") }}" data-selection-source="search-result">#}
<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/> {#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/>#}
{{ 'action : bridge' | trans }} {#{{ 'action : bridge' | trans }}#}
</a> {#</a>#}
</li> {#</li>#}
<li class="divider"></li> <li class="divider"></li>
<li> <li>
<a class="TOOL_publish_btn results_window" data-selection-source="search-result"> <a class="TOOL_publish_btn results_window" data-selection-source="search-result">
@@ -211,36 +211,36 @@
{% elseif acl.has_right(constant('\\ACL::BAS_CHUPUB')) %} {% elseif acl.has_right(constant('\\ACL::BAS_CHUPUB')) %}
<span class="dropdownButton"> <span class="dropdownButton">
<div class="btn-group"> <div class="btn-group">
<button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse" data-selection-source="search-result"> {#<button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse" data-selection-source="search-result">#}
<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/> {{ 'action : bridge' | trans }} {#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/> {{ 'action : bridge' | trans }}#}
{#</button>#}
<button class="TOOL_publish_btn results_window btn btn-inverse">
<img src="/assets/common/images/icons/rss16.png" height="16" width="16" class="btn-image"/>
{{ 'action : publier' | trans }}
</button> </button>
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button> class="caret"></span></button>
<ul class="submenu dropdown-menu"> {% if plugins.actionbar is not empty %}
<li> <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
<a class="TOOL_publish_btn results_window" data-selection-source="search-result"> class="caret"></span></button>
<img src="/assets/common/images/icons/rss16.png" height="16" width="16" class="btn-image"/> <ul class="submenu dropdown-menu">
{{ 'action : publier' | trans }} {% for plugin in plugins.actionbar %}
</a> <li class="divider"></li>
</li> {% for key, action in plugin.getActionBar().push|default([]) %}
{% if plugins.actionbar is not empty %}
{% for plugin in plugins.actionbar %}
<li class="divider"></li>
{% for key, action in plugin.getActionBar().push|default([]) %}
<li> <li>
<a class="results_window {{ action.classes|default('') }}" data-selection-source="search-result"> <a class="results_window {{ action.classes|default('') }}">
{% if action.icon %} {% if action.icon %}
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/> <img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/>
{% endif %} {% endif %}
{% set label = action.label %} {% set label = action.label %}
{% trans from plugin.PluginLocale %}label{% endtrans %} {% trans from plugin.PluginLocale %}label{% endtrans %}
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% endif %} </ul>
</ul> {% endif %}
</div> </div>
</span> </span>
{% elseif plugins.actionbar is not empty %} {% elseif plugins.actionbar is not empty %}