diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index a3af72dd17..6509b540b5 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -1,90 +1,106 @@ -
-{% set basket_length = basket.getElements()|length %} -
- - - - - - - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %} - - {% endif %} - - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CHGSTATUS')) %} - - {% endif %} - - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANDELETERECORD')) and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADDRECORD')) %} - - {% endif %} - - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANPUSH')) %} - - {% endif %} - - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANPUSH')) %} - - {% endif %} - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %} - {##} - - {% endif %} - - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::IMGTOOLS')) %} - - {% endif %} - - - {% if plugins['actionbar'] is not empty %} - {% for plugin in plugins['actionbar'] %} - {% for key, action in plugin.getBasketActionBar() %} - {% set label = action.label %} - +
+ + +
+ {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %} + - {% endfor %} - {% endfor %} - {% endif %} + {% endif %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CHGSTATUS')) %} + + {% endif %} + + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANDELETERECORD')) and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADDRECORD')) %} + + {% endif %} + +
+ + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANPUSH')) %} + + {% endif %} + + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANPUSH')) %} + + {% endif %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %} + {##} + + {% endif %} + + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::IMGTOOLS')) %} + + {% endif %} + +
+ + + + {% if plugins['actionbar'] is not empty %} + {% for plugin in plugins['actionbar'] %} + {% for key, action in plugin.getBasketActionBar() %} + {% set label = action.label %} + + {% endfor %} + {% endfor %} + {% endif %}
-
{{ 'Certaines donnees du panier ont change' | trans }} {{ 'rafraichir' | trans }}
+
+
+ {% set basket_length = basket.getElements()|length %} +
{{ 'Certaines donnees du panier ont change' | trans }} {{ 'rafraichir' | trans }}
{% if basket_length == 0 %} -
+
{% endif %} -{% set basket_scope = 'objects' %} + {% set basket_scope = 'objects' %} -{% import 'prod/WorkZone/Macros.html.twig' as Macros %} + {% import 'prod/WorkZone/Macros.html.twig' as Macros %} -{% if basket.getValidation() %} - {{ Macros.display_validation(app, basket, ordre) }} + {% if basket.getValidation() %} + {{ Macros.display_validation(app, basket, ordre) }} {% else %} {{ Macros.display_basket(app, basket) }} {% endif %} - -
+
+ diff --git a/templates/web/prod/WorkZone/Story.html.twig b/templates/web/prod/WorkZone/Story.html.twig index 54bed30a9a..ec83289eab 100644 --- a/templates/web/prod/WorkZone/Story.html.twig +++ b/templates/web/prod/WorkZone/Story.html.twig @@ -1,73 +1,91 @@ -
-{% set story_length = Story.get_children().get_elements()|length %} -
+
+ +
- + + - - +
- {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %} - - {% endif %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %} + + {% endif %} - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CHGSTATUS')) %} - - {% endif %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CHGSTATUS')) %} + + {% endif %} - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANDELETERECORD')) and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADDRECORD')) %} - - {% endif %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANDELETERECORD')) and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADDRECORD')) %} + + {% endif %} - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANPUSH')) %} - - {% endif %} +
- {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANPUSH')) %} - - {% endif %} - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %} - {##} - - {% endif %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANPUSH')) %} + + {% endif %} - {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::IMGTOOLS')) %} - - {% endif %} - + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANPUSH')) %} + + {% endif %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %} + {##} + + {% endif %} + + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::IMGTOOLS')) %} + + {% endif %} + +
+ +
+
+
+ {% set story_length = Story.get_children().get_elements()|length %}
- {{ 'Certaines donnees du reportage ont change' | trans }} - - {{ 'rafraichir' | trans }} - + {{ 'Certaines donnees du reportage ont change' | trans }} + + {{ 'rafraichir' | trans }} +
{% if story_length == 0 %} -
+
{% endif %} {% set basket_scope = 'groupings' %} @@ -78,6 +96,4 @@ {{ Macros.element('groupings', Story, record, record, record.getNumber()) }} {% endfor %} -
- - +