From 8b0adda292f7b27bcd001e0d82d0ab55576fe83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Adamczyk?= <mikadamczyk@gmail.com>
Date: Thu, 14 Dec 2017 13:29:39 +0100
Subject: [PATCH] EZP-28525: New icons for assign user and assign section
 buttons

---
 src/bundle/Resources/public/img/ez-icons.svg    |  6 ++++++
 .../public/img/icons/assign-section.svg         |  4 ++++
 .../Resources/public/img/icons/assign-user.svg  |  4 ++++
 .../Resources/views/admin/role/list.html.twig   |  2 +-
 .../views/admin/role_assignment/list.html.twig  |  8 +++++---
 .../admin/section/assigned_content.html.twig    |  5 +++--
 .../views/admin/section/list.html.twig          |  2 +-
 .../views/admin/section/view.html.twig          |  2 --
 .../parts/form/assign_section_widget.html.twig  | 17 +++++++++++++++++
 9 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 src/bundle/Resources/public/img/icons/assign-section.svg
 create mode 100644 src/bundle/Resources/public/img/icons/assign-user.svg
 create mode 100644 src/bundle/Resources/views/parts/form/assign_section_widget.html.twig

diff --git a/src/bundle/Resources/public/img/ez-icons.svg b/src/bundle/Resources/public/img/ez-icons.svg
index 9de2e4b646..c99cc1672e 100644
--- a/src/bundle/Resources/public/img/ez-icons.svg
+++ b/src/bundle/Resources/public/img/ez-icons.svg
@@ -20,6 +20,12 @@
 <symbol id="article" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
 <path d="M8.667 16.667c0-0.736 0.597-1.333 1.333-1.333v0h6.667c0.736 0 1.333 0.597 1.333 1.333s-0.597 1.333-1.333 1.333v0h-6.667c-0.736 0-1.333-0.597-1.333-1.333v0zM10 22.667h12c0.736 0 1.333-0.597 1.333-1.333s-0.597-1.333-1.333-1.333v0h-12c-0.736 0-1.333 0.597-1.333 1.333s0.597 1.333 1.333 1.333v0zM22 24.667h-12c-0.736 0-1.333 0.597-1.333 1.333s0.597 1.333 1.333 1.333v0h12c0.736 0 1.333-0.597 1.333-1.333s-0.597-1.333-1.333-1.333v0zM27.667 9.733l-8.21-9.283c-0.245-0.277-0.602-0.45-0.999-0.45-0 0-0.001 0-0.001 0h-13.123c-0.736 0-1.333 0.597-1.333 1.333v0 29.333c0 0.736 0.597 1.333 1.333 1.333v0h21.333c0.736 0 1.333-0.597 1.333-1.333v0-20.050c0-0 0-0.001 0-0.001 0-0.339-0.126-0.648-0.335-0.883l0.001 0.001zM24.93 10.667h-3.597c-1.92 0-2.667-0.753-2.667-2.687v-4.397zM6.667 29.333v-26.667h9.333v5.313c0 3.403 1.953 5.353 5.333 5.353h4v16z"></path>
 </symbol>
+<symbol id="assign-section" viewBox="0 0 96 96" xmlns="http://www.w3.org/2000/svg">
+<path d="M70,96A16,16,0,1,1,86,80,16,16,0,0,1,70,96Zm0-24a8,8,0,1,0,8,8A8,8,0,0,0,70,72ZM42,16A16,16,0,1,1,26,0,16,16,0,0,1,42,16ZM84.69,47,74.4,56.32a6.59,6.59,0,0,1-8.8,0L55.31,47A4,4,0,1,1,60.69,41L66,45.86V23.91A4,4,0,0,0,61.87,20H38a4,4,0,0,1,0-8H61.87A12,12,0,0,1,74,23.91v22L79.31,41A4,4,0,1,1,84.69,47Z"/>
+</symbol>
+<symbol id="assign-user" viewBox="0 0 96 96" xmlns="http://www.w3.org/2000/svg">
+<path d="M50,34a6.45,6.45,0,0,1-1.7,4.4L39,48.69A4,4,0,0,1,33,43.31L37.86,38h-11A2.86,2.86,0,0,0,24,40.85V64.53a16,16,0,1,1-8,0V40.85A10.87,10.87,0,0,1,26.85,30h11L33,24.69A4,4,0,1,1,39,19.31L48.32,29.6A6.52,6.52,0,0,1,50,34ZM90.55,61.64A6,6,0,0,1,85.79,64H58.23a6,6,0,0,1-4.75-2.34A7.1,7.1,0,0,1,52.12,56a14.45,14.45,0,0,1,.29-1.91c.19-.84,2.92-13,5.28-16.63a13,13,0,0,1,9.78-5.78,16,16,0,1,1,8.64.1c3.34.46,7.73,2.07,9.94,6.11,2.76,4.15,5.62,16.83,5.65,17a2,2,0,0,1,.06.34l.09.67A7.09,7.09,0,0,1,90.55,61.64ZM72,24.36a8.18,8.18,0,1,0-8-8.18A8.1,8.1,0,0,0,72,24.36ZM83.76,56c-1.1-4.87-3.37-12.25-4.35-13.64a4,4,0,0,1-.34-.56C78.16,40,75,39.65,73.9,39.65H68.43a5.09,5.09,0,0,0-4,2.2c-.84,1.3-2.91,8.25-4.17,14l0,.1v0Z"/>
+</symbol>
 <symbol id="author" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
 <path d="M10.667 16c-4.418 0-8-3.582-8-8s3.582-8 8-8c4.418 0 8 3.582 8 8v0c0 4.418-3.582 8-8 8v0zM10.667 2.667c-2.946 0-5.333 2.388-5.333 5.333s2.388 5.333 5.333 5.333c2.946 0 5.333-2.388 5.333-5.333v0c0-2.946-2.388-5.333-5.333-5.333v0zM12 30.667c0-0.736-0.597-1.333-1.333-1.333v0h-8c-0.005-0.015-0.008-0.033-0.008-0.052s0.003-0.036 0.008-0.053l-0 0.001c0.020-0.073 0.035-0.159 0.040-0.247l0-0.003c0.017-0.207 0.048-0.396 0.092-0.579l-0.005 0.026v-0.040c0.707-2.873 1.943-6.697 2.54-7.517 1.173-1.58 3.297-1.537 3.31-1.537h3.103c0.371 0.004 0.731 0.035 1.083 0.089l-0.043-0.005c0.058 0.009 0.125 0.014 0.193 0.014 0.737 0 1.334-0.597 1.334-1.334 0-0.669-0.492-1.222-1.133-1.319l-0.007-0.001c-0.432-0.065-0.934-0.105-1.445-0.11l-0.005-0h-3c-0.41 0-3.6 0-5.52 2.63-1.29 1.757-2.87 8.037-2.977 8.437-0.071 0.265-0.129 0.583-0.161 0.907l-0.002 0.026c-0.040 0.178-0.063 0.383-0.063 0.593 0 0.647 0.217 1.243 0.581 1.72l-0.005-0.007c0.477 0.625 1.222 1.025 2.060 1.027h8.030c0.736 0 1.333-0.597 1.333-1.333v0zM16.263 31.883l6.023-2.703c0.262-0.122 0.473-0.316 0.613-0.557l0.003-0.007 5.877-10.427c0.108-0.189 0.171-0.414 0.171-0.655 0-0.739-0.599-1.338-1.338-1.338-0.498 0-0.933 0.272-1.163 0.676l-0.003 0.007-5.667 10.047-3.937 1.773-0.49-4.48 5.573-9.94c0.107-0.188 0.17-0.413 0.17-0.653 0-0.739-0.599-1.337-1.337-1.337-0.498 0-0.933 0.273-1.163 0.677l-0.003 0.007-5.783 10.333c-0.096 0.18-0.153 0.393-0.153 0.62 0 0.056 0.004 0.112 0.010 0.166l-0.001-0.006 0.737 6.727c0.054 0.431 0.306 0.793 0.66 0.997l0.006 0.003c0.191 0.111 0.42 0.177 0.664 0.177 0.198 0 0.386-0.043 0.554-0.12l-0.008 0.003zM20.187 25.423l5.617-10c0.107-0.188 0.17-0.413 0.17-0.653 0-0.739-0.599-1.337-1.337-1.337-0.498 0-0.933 0.273-1.163 0.677l-0.003 0.007-5.61 10.003c-0.108 0.188-0.171 0.413-0.171 0.654 0 0.497 0.272 0.93 0.675 1.16l0.007 0.003c0.188 0.107 0.413 0.17 0.652 0.17 0.498 0 0.932-0.273 1.161-0.677l0.003-0.007zM30.637 9.583l-4.857-2.637c-0.361-0.203-0.793-0.322-1.253-0.322-0.257 0-0.505 0.037-0.739 0.107l0.018-0.005c-0.582 0.17-1.053 0.558-1.328 1.068l-0.006 0.012-0.773 1.507c-0.096 0.18-0.152 0.393-0.152 0.619 0 0.503 0.278 0.94 0.689 1.168l0.007 0.003 6.903 3.747c0.183 0.101 0.401 0.16 0.633 0.16 0.001 0 0.002 0 0.004 0h-0c0.138-0.001 0.271-0.021 0.396-0.059l-0.010 0.003c0.348-0.11 0.628-0.349 0.79-0.659l0.003-0.007 0.79-1.507c0.58-1.113 0.087-2.547-1.117-3.197z"></path>
 </symbol>
diff --git a/src/bundle/Resources/public/img/icons/assign-section.svg b/src/bundle/Resources/public/img/icons/assign-section.svg
new file mode 100644
index 0000000000..2fabbdb0bf
--- /dev/null
+++ b/src/bundle/Resources/public/img/icons/assign-section.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96">
+<title>assign-section</title>
+<path fill="#333" d="M70,96A16,16,0,1,1,86,80,16,16,0,0,1,70,96Zm0-24a8,8,0,1,0,8,8A8,8,0,0,0,70,72ZM42,16A16,16,0,1,1,26,0,16,16,0,0,1,42,16ZM84.69,47,74.4,56.32a6.59,6.59,0,0,1-8.8,0L55.31,47A4,4,0,1,1,60.69,41L66,45.86V23.91A4,4,0,0,0,61.87,20H38a4,4,0,0,1,0-8H61.87A12,12,0,0,1,74,23.91v22L79.31,41A4,4,0,1,1,84.69,47Z"/>
+</svg>
\ No newline at end of file
diff --git a/src/bundle/Resources/public/img/icons/assign-user.svg b/src/bundle/Resources/public/img/icons/assign-user.svg
new file mode 100644
index 0000000000..3497673977
--- /dev/null
+++ b/src/bundle/Resources/public/img/icons/assign-user.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96">
+<title>assign-user</title>
+<path fill="#333" d="M50,34a6.45,6.45,0,0,1-1.7,4.4L39,48.69A4,4,0,0,1,33,43.31L37.86,38h-11A2.86,2.86,0,0,0,24,40.85V64.53a16,16,0,1,1-8,0V40.85A10.87,10.87,0,0,1,26.85,30h11L33,24.69A4,4,0,1,1,39,19.31L48.32,29.6A6.52,6.52,0,0,1,50,34ZM90.55,61.64A6,6,0,0,1,85.79,64H58.23a6,6,0,0,1-4.75-2.34A7.1,7.1,0,0,1,52.12,56a14.45,14.45,0,0,1,.29-1.91c.19-.84,2.92-13,5.28-16.63a13,13,0,0,1,9.78-5.78,16,16,0,1,1,8.64.1c3.34.46,7.73,2.07,9.94,6.11,2.76,4.15,5.62,16.83,5.65,17a2,2,0,0,1,.06.34l.09.67A7.09,7.09,0,0,1,90.55,61.64ZM72,24.36a8.18,8.18,0,1,0-8-8.18A8.1,8.1,0,0,0,72,24.36ZM83.76,56c-1.1-4.87-3.37-12.25-4.35-13.64a4,4,0,0,1-.34-.56C78.16,40,75,39.65,73.9,39.65H68.43a5.09,5.09,0,0,0-4,2.2c-.84,1.3-2.91,8.25-4.17,14l0,.1v0Z"/>
+</svg>
\ No newline at end of file
diff --git a/src/bundle/Resources/views/admin/role/list.html.twig b/src/bundle/Resources/views/admin/role/list.html.twig
index 44933d168f..4b2f33aaae 100644
--- a/src/bundle/Resources/views/admin/role/list.html.twig
+++ b/src/bundle/Resources/views/admin/role/list.html.twig
@@ -67,7 +67,7 @@
                         <a title="{{ 'role.view.list.action.assign_to_users_or_groups'|trans|desc('Assign to Users/Groups') }}"
                            href="{{ path('ezplatform.role_assignment.create', { roleId: role.id }) }}" class="btn btn-icon mx-3">
                             <svg class="ez-icon ez-icon-relations ez-icon--secondary">
-                                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#relations"></use>
+                                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#assign-user"></use>
                             </svg>
                         </a>
                         <a title="{{ 'role.view.list.action.edit'|trans|desc('Edit') }}"
diff --git a/src/bundle/Resources/views/admin/role_assignment/list.html.twig b/src/bundle/Resources/views/admin/role_assignment/list.html.twig
index c337b838ec..2707ae91b8 100644
--- a/src/bundle/Resources/views/admin/role_assignment/list.html.twig
+++ b/src/bundle/Resources/views/admin/role_assignment/list.html.twig
@@ -4,11 +4,13 @@
     <div class="ez-table-header">
         <div class="ez-table-header__headline">{{ 'role_assignment.view.list.header'|trans|desc('Users and Groups') }}</div>
         <div>
-            <a href="{{ path('ezplatform.role_assignment.create', {roleId: role.id}) }}" class="btn btn-secondary">
+            <a href="{{ path('ezplatform.role_assignment.create', {roleId: role.id}) }}"
+               title="{{ 'role_assignment.view.list.action.add'|trans|desc('Assign users/groups') }}"
+               class="btn btn-secondary">
                 <svg class="ez-icon ez-icon-relations ez-icon--secondary">
-                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#relations"></use>
+                    <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#assign-user"></use>
                 </svg>
-                {{ 'role_assignment.view.list.action.add'|trans|desc('Assign users/groups') }}
+
             </a>
             <button id="delete-role-assignments" class="btn btn-danger btn--trigger" disabled
                     data-click="#role_assignments_delete_delete">
diff --git a/src/bundle/Resources/views/admin/section/assigned_content.html.twig b/src/bundle/Resources/views/admin/section/assigned_content.html.twig
index 4ca6827292..3d91066a6b 100644
--- a/src/bundle/Resources/views/admin/section/assigned_content.html.twig
+++ b/src/bundle/Resources/views/admin/section/assigned_content.html.twig
@@ -1,6 +1,6 @@
 {% trans_default_domain 'section' %}
 
-{% form_theme form_section_content_assign 'EzPlatformAdminUiBundle:parts/form:flat_widgets.html.twig' %}
+{% form_theme form_section_content_assign 'EzPlatformAdminUiBundle:parts/form:flat_widgets.html.twig' 'EzPlatformAdminUiBundle:parts/form:assign_section_widget.html.twig' %}
 
 <section class="container mt-4 px-5">
     <div class="ez-table-header">
@@ -15,7 +15,8 @@
             'action': path("ezplatform.section.assign_content", {"sectionId": section.id}),
             'attr': {'class': 'd-inline-block'}
         }) }}
-            {{ form_widget(form_section_content_assign.locations, { 'label': '' }) }}
+            {{ form_widget(form_section_content_assign.locations.location) }}
+            {{ form_widget(form_section_content_assign.locations.select_content, {'attr': {'class': 'btn btn-secondary btn--open-udw'}}) }}
         {{ form_end(form_section_content_assign) }}
     </div>
     <table class="table">
diff --git a/src/bundle/Resources/views/admin/section/list.html.twig b/src/bundle/Resources/views/admin/section/list.html.twig
index ab72c6b078..2cbd55d1fe 100644
--- a/src/bundle/Resources/views/admin/section/list.html.twig
+++ b/src/bundle/Resources/views/admin/section/list.html.twig
@@ -71,7 +71,7 @@
                            data-form-action="{{ path("ezplatform.section.assign_content", {"sectionId": section.id}) }}"
                            class="btn btn-icon mx-3">
                             <svg class="ez-icon ez-icon-relations ez-icon--secondary btn--open-udw">
-                                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#relations"></use>
+                                <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#assign-section"></use>
                             </svg>
                         </a>
 
diff --git a/src/bundle/Resources/views/admin/section/view.html.twig b/src/bundle/Resources/views/admin/section/view.html.twig
index b8192e6b97..a30cd7303a 100644
--- a/src/bundle/Resources/views/admin/section/view.html.twig
+++ b/src/bundle/Resources/views/admin/section/view.html.twig
@@ -33,7 +33,6 @@
                         <svg class="ez-icon">
                             <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#trash"></use>
                         </svg>
-                        {{ 'section.form.delete'|trans|desc('Delete') }}
                     </button>
                     {% include 'EzPlatformAdminUiBundle:admin/section:delete_confirmation_modal.html.twig' with {'form': form_section_delete} %}
                 {% else %}
@@ -41,7 +40,6 @@
                         <svg class="ez-icon">
                             <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#trash"></use>
                         </svg>
-                        {{ 'section.form.delete'|trans|desc('Delete') }}
                     </button>
                 {% endif %}
             </div>
diff --git a/src/bundle/Resources/views/parts/form/assign_section_widget.html.twig b/src/bundle/Resources/views/parts/form/assign_section_widget.html.twig
new file mode 100644
index 0000000000..936f07e9d4
--- /dev/null
+++ b/src/bundle/Resources/views/parts/form/assign_section_widget.html.twig
@@ -0,0 +1,17 @@
+{%- block button_widget -%}
+    {%- if label is not same as(false) and label is empty -%}
+        {%- if label_format is not empty -%}
+            {% set label = label_format|replace({
+            '%name%': name,
+            '%id%': id,
+            }) %}
+        {%- else -%}
+            {% set label = name|humanize %}
+        {%- endif -%}
+    {%- endif -%}
+    <button type="{{ type|default('button') }}" {{ block('button_attributes') }}>
+        <svg class="ez-icon ez-icon--secondary">
+            <use xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg') }}#assign-section"></use>
+        </svg>
+    </button>
+{%- endblock -%}