From a49acb03e4e5b035b569ee709664b47b96424cc4 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Mon, 23 Feb 2015 15:15:55 +0900 Subject: [PATCH] Design update --- .../eventsmanager/notify/orderdeliver.php | 2 +- .../notify/ordernotdelivered.php | 2 +- templates/web/prod/WorkZone/Basket.html.twig | 13 +-- templates/web/prod/WorkZone/Macros.html.twig | 4 +- templates/web/prod/WorkZone/Story.html.twig | 10 +-- templates/web/prod/index.html.twig | 4 +- templates/web/prod/preview/caption.html.twig | 2 +- www/skins/icons/basket.png | Bin 0 -> 1892 bytes www/skins/icons/chgcoll_history.png | Bin 0 -> 1900 bytes www/skins/icons/chgstatus_history.png | Bin 0 -> 2746 bytes www/skins/icons/delete.png | Bin 720 -> 2308 bytes www/skins/icons/disktt_history.png | Bin 0 -> 2513 bytes www/skins/icons/imgtools_history.png | Bin 0 -> 2595 bytes www/skins/icons/ppen_history.png | Bin 0 -> 2114 bytes www/skins/icons/print_history.png | Bin 0 -> 2105 bytes www/skins/icons/proposition_off32.png | Bin 1561 -> 4235 bytes www/skins/icons/push16.png | Bin 947 -> 2793 bytes www/skins/icons/rss16.png | Bin 439 -> 2835 bytes www/skins/icons/thesaurus_32.png | Bin 2713 -> 4295 bytes www/skins/icons/workzone32.png | Bin 2405 -> 3905 bytes .../prod/000000/images/chgcoll_history.png | Bin 0 -> 1900 bytes .../prod/000000/images/chgstatus_history.png | Bin 0 -> 2746 bytes www/skins/prod/000000/images/delete.png | Bin 0 -> 2308 bytes .../prod/000000/images/disktt_history.png | Bin 0 -> 2513 bytes .../prod/000000/images/imgtools_history.png | Bin 0 -> 2595 bytes www/skins/prod/000000/images/ppen_history.png | Bin 0 -> 2114 bytes .../prod/000000/images/print_history.png | Bin 0 -> 2105 bytes www/skins/prod/000000/images/push16.png | Bin 0 -> 2793 bytes www/skins/prod/000000/images/rss16.png | Bin 0 -> 2835 bytes www/skins/prod/000000/prodcolor.css | 83 +++++++++++------- 30 files changed, 70 insertions(+), 50 deletions(-) create mode 100644 www/skins/icons/basket.png create mode 100644 www/skins/icons/chgcoll_history.png create mode 100644 www/skins/icons/chgstatus_history.png create mode 100644 www/skins/icons/disktt_history.png create mode 100644 www/skins/icons/imgtools_history.png create mode 100644 www/skins/icons/ppen_history.png create mode 100644 www/skins/icons/print_history.png create mode 100644 www/skins/prod/000000/images/chgcoll_history.png create mode 100644 www/skins/prod/000000/images/chgstatus_history.png create mode 100644 www/skins/prod/000000/images/delete.png create mode 100644 www/skins/prod/000000/images/disktt_history.png create mode 100644 www/skins/prod/000000/images/imgtools_history.png create mode 100644 www/skins/prod/000000/images/ppen_history.png create mode 100644 www/skins/prod/000000/images/print_history.png create mode 100644 www/skins/prod/000000/images/push16.png create mode 100644 www/skins/prod/000000/images/rss16.png diff --git a/lib/classes/eventsmanager/notify/orderdeliver.php b/lib/classes/eventsmanager/notify/orderdeliver.php index 968d639f1b..794a386526 100644 --- a/lib/classes/eventsmanager/notify/orderdeliver.php +++ b/lib/classes/eventsmanager/notify/orderdeliver.php @@ -26,7 +26,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract */ public function icon_url() { - return '/skins/prod/000000/images/disktt_history.gif'; + return '/skins/prod/000000/images/disktt_history.png'; } /** diff --git a/lib/classes/eventsmanager/notify/ordernotdelivered.php b/lib/classes/eventsmanager/notify/ordernotdelivered.php index cee7bc9ba3..e36f8ffe48 100644 --- a/lib/classes/eventsmanager/notify/ordernotdelivered.php +++ b/lib/classes/eventsmanager/notify/ordernotdelivered.php @@ -24,7 +24,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac public function icon_url() { - return '/skins/prod/000000/images/disktt_history.gif'; + return '/skins/prod/000000/images/disktt_history.png'; } public function datas(array $data, $unread) diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index 9e35f794bd..266e810f60 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -2,29 +2,30 @@ {% set basket_length = basket.getElements()|length %}
+ {% if app['acl'].get(app['authentication'].getUser()).has_right('modifyrecord') %} {% endif %} {% if app['acl'].get(app['authentication'].getUser()).has_right('changestatus') %} {% endif %} {% if app['acl'].get(app['authentication'].getUser()).has_right('deleterecord') and app['acl'].get(app['authentication'].getUser()).has_right('addrecord') %} {% endif %} @@ -50,7 +51,7 @@ {% if app['acl'].get(app['authentication'].getUser()).has_right('doctools') %} {% endif %} {% if app['acl'].get(app['authentication'].getUser()).has_right('modifyrecord') %} {% endif %} {% if app['acl'].get(app['authentication'].getUser()).has_right('changestatus') %} {% endif %} {% if app['acl'].get(app['authentication'].getUser()).has_right('deleterecord') and app['acl'].get(app['authentication'].getUser()).has_right('addrecord') %} {% endif %} diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index ae0faf1c56..7e27453728 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -547,7 +547,7 @@