diff --git a/resources/www/common/images/icons/Share.png b/resources/www/common/images/icons/Share.png new file mode 100644 index 0000000000..447ced8ba7 Binary files /dev/null and b/resources/www/common/images/icons/Share.png differ diff --git a/resources/www/common/images/icons/archive.png b/resources/www/common/images/icons/archive.png new file mode 100644 index 0000000000..0d63a2e6f6 Binary files /dev/null and b/resources/www/common/images/icons/archive.png differ diff --git a/resources/www/common/images/icons/basket-1.png b/resources/www/common/images/icons/basket-1.png new file mode 100644 index 0000000000..fa62394842 Binary files /dev/null and b/resources/www/common/images/icons/basket-1.png differ diff --git a/resources/www/common/images/icons/detach.png b/resources/www/common/images/icons/detach.png new file mode 100644 index 0000000000..0f9080d04f Binary files /dev/null and b/resources/www/common/images/icons/detach.png differ diff --git a/resources/www/common/images/icons/disktt_history.png b/resources/www/common/images/icons/disktt_history.png index 849c5acdc2..e81e9e383a 100644 Binary files a/resources/www/common/images/icons/disktt_history.png and b/resources/www/common/images/icons/disktt_history.png differ diff --git a/resources/www/common/images/icons/edit-pen.png b/resources/www/common/images/icons/edit-pen.png new file mode 100644 index 0000000000..efba208714 Binary files /dev/null and b/resources/www/common/images/icons/edit-pen.png differ diff --git a/resources/www/common/images/icons/export-shadow.png b/resources/www/common/images/icons/export-shadow.png new file mode 100644 index 0000000000..90ba5c1b53 Binary files /dev/null and b/resources/www/common/images/icons/export-shadow.png differ diff --git a/resources/www/common/images/icons/print-shadow.png b/resources/www/common/images/icons/print-shadow.png new file mode 100644 index 0000000000..8f13ffd61a Binary files /dev/null and b/resources/www/common/images/icons/print-shadow.png differ diff --git a/resources/www/common/images/icons/print_history.png b/resources/www/common/images/icons/print_history.png index c4e4090c41..139cb45458 100644 Binary files a/resources/www/common/images/icons/print_history.png and b/resources/www/common/images/icons/print_history.png differ diff --git a/resources/www/common/images/icons/rename.png b/resources/www/common/images/icons/rename.png new file mode 100644 index 0000000000..f86b6c80b7 Binary files /dev/null and b/resources/www/common/images/icons/rename.png differ diff --git a/resources/www/common/images/icons/set-order.png b/resources/www/common/images/icons/set-order.png new file mode 100644 index 0000000000..e49be67dc8 Binary files /dev/null and b/resources/www/common/images/icons/set-order.png differ diff --git a/resources/www/lightbox/images/lightbox-icon.png b/resources/www/lightbox/images/lightbox-icon.png new file mode 100644 index 0000000000..ef9f72ec70 Binary files /dev/null and b/resources/www/lightbox/images/lightbox-icon.png differ diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index 04f3d3d735..d496cb2e7c 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -136,55 +136,72 @@ -
+
{{ 'action::exporter' | trans }} + data-kind="basket" data-id="{{basket.getId()}}"> + + {{ 'action::exporter' | trans }} + {{ 'action::exporter' | trans }} +
{% if basket.getValidation() %} {% endif %}
- {{ 'Archive' | trans }} -
-
-
-
- {{ 'action : supprimer' | trans }} + + {{ 'Archive' | trans }} + {{ 'Archive' | trans }} +
+ + +
@@ -222,24 +239,33 @@ -
+
{{ 'action::exporter' | trans }} + data-kind="record" data-id="{{story.getRecord(app).get_serialize_key()}}"> + + {{ 'action::exporter' | trans }} + {{ 'action::exporter' | trans }} +
- {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %} + {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %} - {% endif %} + {% endif %} @@ -249,7 +275,8 @@ data-db-id="{{ story.getRecord(app).get_sbas_id }}" data-record-id="{{ story.getRecord(app).get_record_id() }}" href="#"> - {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }} + {{ 'Re-ordonner' | trans }}
diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig index 413cd04769..2d537dd72c 100644 --- a/templates/web/prod/results/record.html.twig +++ b/templates/web/prod/results/record.html.twig @@ -111,25 +111,34 @@ -
+
{% if granted_on_collection(record.baseId, [constant('\\ACL::CANPUTINALBUM')]) and not record.story %}
- {{ 'action : ajouter au panier' | trans }} + + {{ 'action : ajouter au panier' | trans }} + {{ 'action : ajouter au panier' | trans }} +
{% endif %} {% if granted_on_collection(record.baseId, [constant('\\ACL::CANDWNLDPREVIEW')]) or granted_on_collection(record.baseId, [constant('\\ACL::CANDWNLDHD')]) %}
- {{ 'action : exporter' | trans }} + + {{ 'action : exporter' | trans }} + {{ 'action : exporter' | trans }} +
{% endif %}
- {{ 'action : print' | trans }} + + {{ 'action : print' | trans }} + {{ 'action : print' | trans }} +
{% if app['conf'].get(['registry', 'actions', 'social-tools']) == 'all' @@ -138,7 +147,10 @@ {% if record.story is empty %}
{% endif %}