entity action buttons re-designed (#746)

2019-05-03 21:10:16 +02:00
parent 455d772095
commit e92c2d168e
22 changed files with 408 additions and 184 deletions
--- a/templates/macros/actions.html.twig
+++ b/templates/macros/actions.html.twig
@@ -17,7 +17,11 @@

    {% if activity.id is not empty %}
        {% if is_granted('edit', activity) %}
-            {% set actions = actions|merge({'edit': path('admin_activity_edit', {'id': activity.id})}) %}
+            {% set class = '' %}
+            {% if view != 'edit' %}
+                {% set class = 'modal-ajax-form' %}
+            {% endif %}
+            {% set actions = actions|merge({'edit': {'url': path('admin_activity_edit', {'id': activity.id}), 'class': class}}) %}
        {% endif %}
        {% if view == 'index' and is_granted('delete', activity) %}
            {% set actions = actions|merge({'trash': {'url': path('admin_activity_delete', {'id': activity.id}), 'class': 'modal-ajax-form'}}) %}
@@ -30,7 +34,49 @@

    {% set event = trigger('actions.activity', {'actions': actions, 'view': view, 'activity': activity}) %}
    {% if view == 'index' %}
-        {{ widgets.button_group(event.payload.actions) }}
+        {{ widgets.table_actions(event.payload.actions) }}
+    {% else %}
+        {{ widgets.page_actions(event.payload.actions) }}
+    {% endif %}
+{% endmacro %}
+
+{% macro users(view) %}
+    {% import "macros/widgets.html.twig" as widgets %}
+    {% set actions = {'filter': '#collapseUserAdmin', 'visibility': '#modal_user_admin'} %}
+
+    {% if is_granted('create_user') %}
+        {% set actions = actions|merge({'create': path('admin_user_create')}) %}
+    {% endif %}
+
+    {% set event = trigger('actions.users', {'actions': actions, 'view': view}) %}
+    {{ widgets.page_actions(event.payload.actions) }}
+{% endmacro %}
+
+{% macro user(user, view) %}
+    {% import "macros/widgets.html.twig" as widgets %}
+    {% set actions = {} %}
+
+    {% if user.id is not empty %}
+        {% if is_granted('view', user) %}
+            {% set actions = {'profile-stats': {'url': path('user_profile', {'username' : user.username})}} %}
+        {% endif %}
+        {% if is_granted('edit', user) %}
+            {% set actions = actions|merge({'edit': path('user_profile_edit', {'username' : user.username})}) %}
+        {% endif %}
+        {% if is_granted('preferences', user) %}
+            {% set actions = actions|merge({'settings': {'url': path('user_profile_preferences', {'username' : user.username})}}) %}
+        {% endif %}
+        {% if is_granted('view_other_timesheet') %}
+            {% set actions = actions|merge({'timesheet': path('admin_timesheet', {'user' : user.id})}) %}
+        {% endif %}
+        {% if view == 'index' and is_granted('delete', user) %}
+            {% set actions = actions|merge({'trash': {'url': path('admin_user_delete', {'id': user.id}), 'class': 'modal-ajax-form'}}) %}
+        {% endif %}
+    {% endif %}
+
+    {% set event = trigger('actions.user', {'actions': actions, 'view': view, 'user': user}) %}
+    {% if view == 'index' %}
+        {{ widgets.table_actions(event.payload.actions) }}
    {% else %}
        {{ widgets.page_actions(event.payload.actions) }}
    {% endif %}
@@ -54,7 +100,11 @@

    {% if project.id is not empty %}
        {% if is_granted('edit', project) %}
-            {% set actions = actions|merge({'edit': path('admin_project_edit', {'id': project.id})}) %}
+            {% set class = '' %}
+            {% if view != 'edit' %}
+                {% set class = 'modal-ajax-form' %}
+            {% endif %}
+            {% set actions = actions|merge({'edit': {'url': path('admin_project_edit', {'id': project.id}), 'class': class}}) %}
        {% endif %}
        {% if is_granted('view_activity') %}
            {% set actions = actions|merge({'activity': path('admin_activity', {'customer': project.customer.id, 'project': project.id})}) %}
@@ -70,7 +120,7 @@

    {% set event = trigger('actions.project', {'actions': actions, 'view': view, 'project': project}) %}
    {% if view == 'index' %}
-        {{ widgets.button_group(event.payload.actions) }}
+        {{ widgets.table_actions(event.payload.actions) }}
    {% else %}
        {{ widgets.page_actions(event.payload.actions) }}
    {% endif %}
@@ -94,7 +144,11 @@

    {% if customer.id is not empty %}
        {% if is_granted('edit', customer) %}
-            {% set actions = actions|merge({'edit': path('admin_customer_edit', {'id': customer.id})}) %}
+            {% set class = '' %}
+            {% if view != 'edit' %}
+                {% set class = 'modal-ajax-form' %}
+            {% endif %}
+            {% set actions = actions|merge({'edit': {'url': path('admin_customer_edit', {'id': customer.id}), 'class': class}}) %}
        {% endif %}
        {% if is_granted('view_project') %}
            {% set actions = actions|merge({'project': path('admin_project', {'customer': customer.id})}) %}
@@ -110,7 +164,7 @@

    {% set event = trigger('actions.customer', {'actions': actions, 'view': view, 'customer': customer}) %}
    {% if view == 'index' %}
-        {{ widgets.button_group(event.payload.actions) }}
+        {{ widgets.table_actions(event.payload.actions) }}
    {% else %}
        {{ widgets.page_actions(event.payload.actions) }}
    {% endif %}
@@ -134,6 +188,7 @@
 {% endmacro %}

 {% macro timesheet(timesheet, view) %}
+    {%- filter spaceless -%}
    {% import "macros/widgets.html.twig" as widgets %}
    {% set actions = {} %}

@@ -167,10 +222,11 @@

    {% set event = trigger('actions.timesheet', {'actions': actions, 'view': view, 'timesheet': timesheet}) %}
    {% if view == 'index' %}
-        {{ widgets.button_group(event.payload.actions) }}
+        {{ widgets.table_actions(event.payload.actions) }}
    {% else %}
        {{ widgets.page_actions(event.payload.actions) }}
    {% endif %}
+    {%- endfilter -%}
 {% endmacro %}

 {% macro timesheets_team(view) %}
@@ -194,10 +250,6 @@
    {% set actions = {} %}

    {% if timesheet.id is not empty %}
-        {% if not timesheet.end and is_granted('stop', timesheet) %}
-            {% set actions = actions|merge({'stop': path('admin_timesheet_stop', {'id' : timesheet.id})}) %}
-        {% endif %}
-
        {% if is_granted('edit', timesheet) %}
            {% set class = '' %}
            {% if view != 'edit' %}
@@ -206,6 +258,10 @@
            {% set actions = actions|merge({'edit': {'url': path('admin_timesheet_edit', {'id': timesheet.id}), 'class': class}}) %}
        {% endif %}

+        {% if not timesheet.end and is_granted('stop', timesheet) %}
+            {% set actions = actions|merge({'stop': path('admin_timesheet_stop', {'id' : timesheet.id})}) %}
+        {% endif %}
+
        {% if view == 'index' and is_granted('delete', timesheet) %}
            {% set actions = actions|merge({'trash': {'url': path('admin_timesheet_delete', {'id' : timesheet.id}), 'class': 'modal-ajax-form'}}) %}
        {% endif %}
@@ -217,7 +273,7 @@

    {% set event = trigger('actions.timesheet_team', {'actions': actions, 'view': view, 'timesheet': timesheet}) %}
    {% if view == 'index' %}
-        {{ widgets.button_group(event.payload.actions) }}
+        {{ widgets.table_actions(event.payload.actions) }}
    {% else %}
        {{ widgets.page_actions(event.payload.actions) }}
    {% endif %}
@@ -239,7 +295,7 @@

    {% set event = trigger('actions.plugin', {'actions': actions, 'view': view}) %}
    {% if view == 'index' %}
-        {{ widgets.button_group(event.payload.actions) }}
+        {{ widgets.table_actions(event.payload.actions) }}
    {% else %}
        {{ widgets.page_actions(event.payload.actions) }}
    {% endif %}
@@ -256,19 +312,3 @@
    {% set event = trigger('actions.about', {'actions': actions, 'view': view}) %}
    {{ widgets.page_actions(event.payload.actions) }}
 {% endmacro %}
-
-{% macro profile(view, user) %}
-    {% import "macros/widgets.html.twig" as widgets %}
-
-    {% set actions = {'profile-stats': {'url': path('user_profile', {'username' : user.username})}} %}
-
-    {% if is_granted('edit', user) %}
-        {% set actions = actions|merge({'profile': {'url': path('user_profile_edit', {'username' : user.username})}}) %}
-    {% endif %}
-    {% if is_granted('preferences', user) %}
-        {% set actions = actions|merge({'settings': {'url': path('user_profile_preferences', {'username' : user.username})}}) %}
-    {% endif %}
-
-    {% set event = trigger('actions.profile', {'actions': actions, 'view': view}) %}
-    {{ widgets.page_actions(event.payload.actions) }}
-{% endmacro %}
--- a/templates/macros/datatables.html.twig
+++ b/templates/macros/datatables.html.twig
@@ -86,7 +86,7 @@
                        <thead>
                        <tr>
                            {%- for title, class in columns -%}
-                                <th data-field="{{ title }}" class="{{ macro.data_table_column_class(name, columns, title) }}">{{ ('label.' ~ title)|trans }}</th>
+                                <th data-field="{{ title }}" class="{{ macro.data_table_column_class(name, columns, title) }}">{% if title is not empty and title != 'actions' %}{{ ('label.' ~ title)|trans }}{% endif %}</th>
                            {%- endfor -%}
                        </tr>
                        </thead>
--- a/templates/macros/widgets.html.twig
+++ b/templates/macros/widgets.html.twig
@@ -140,60 +140,113 @@
    </div>
 {% endmacro %}

-{% macro button_group(actions) %}
-    {% import _self as macro %}
-    <div class="btn-group">
-        {%- for icon,values in actions  %}
-            {% spaceless %}
-                {% set id = null %}
-                {% set onclick = null %}
-                {% set modal = null %}
-                {% set toggle = null %}
-                {% set url = null %}
-                {% set target = null %}
-                {% set class = "btn btn-default btn-" ~ icon ~ " " %}
+{% macro table_actions(actions) %}
+    {%- import _self as macro -%}
+    {% if actions|length >= 1 %}
+        <div class="btn-group">
+            <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">{{ 'label.actions'|trans }}
+                <span class="fa fa-caret-down"></span></button>
+            <ul class="dropdown-menu dropdown-menu-right">
+                {%- filter spaceless -%}
+                    {%- for icon,values in actions  %}
+                        {% set class = '' %}
+                        {% if icon == 'trash' %}
+                            {% set class = 'delete' %}
+                            <li class="divider"></li>
+                        {% endif %}
+                        <li class="{{ class }}">
+                            {% if values is iterable %}
+                                {{ macro.action_button(icon, values|merge({'title': icon|trans({}, 'actions')}), false) }}
+                            {% else %}
+                                {{ macro.action_button(icon, {'url': values, 'title': icon|trans({}, 'actions')}, false) }}
+                            {% endif %}
+                        </li>
+                    {% endfor -%}
+                {% endfilter %}
+            </ul>
+        </div>
+    {% endif %}
+{% endmacro %}

-                {% if not values is iterable %}
-                    {% set url = values %}
-                    {% if 'onclick:' in url %}
-                        {% set onclick = url|replace({'onclick:': ''}) %}
-                        {% set url = '#' %}
-                    {% endif %}
-                    {% if '#collapse' in url %}
-                        {% set toggle = 'collapse' %}
-                    {% endif %}
-                    {% if '#modal' in url %}
-                        {% set modal = url %}
-                        {% set url = '#' %}
-                    {% endif %}
-                {% else %}
-                    {% set url = values.url ?? '#' %}
-                    {% set onclick = values.onclick ?? null %}
-                    {% set modal = values.modal ?? null %}
-                    {% set toggle = values.toggle ?? null %}
-                    {% set target = values.target ?? null %}
-                    {% set id = values.id ?? null %}
-                    {% set class = class ~ ( values.class | default("")) %}
-                {% endif %}
-            {% endspaceless %}
-            <a class="{{ class | trim }}" href="{{ url }}"
-                    {%- if id is not empty -%}
-                        id="{{ id }}"
-                    {%- endif -%}
-                    {%- if toggle is not empty -%}
-                        data-toggle="{{ toggle }}"
-                    {%- endif -%}
-                    {%- if modal is not empty -%}
-                        data-toggle="modal" data-target="{{ modal }}"
-                    {%- endif -%}
-                    {%- if onclick is not empty -%}
-                        onclick="{{ onclick }}"
-                    {%- endif -%}
-                    {%- if target is not empty -%}
-                        target="{{ target }}"
-                    {%- endif -%}
-            >{{ macro.icon(icon) }}</a>
+{% macro action_button(icon, values, type) %}
+    {%- import _self as macro -%}
+    {%- filter spaceless -%}
+        {% set id = null %}
+        {% set onclick = null %}
+        {% set modal = null %}
+        {% set toggle = null %}
+        {% set url = null %}
+        {% set target = null %}
+        {% set title = null %}
+        {% set disabled = false %}
+        {% if type is same as (false) %}
+            {% set class = "" %}
+        {% elseif type is null %}
+            {% set class = "btn btn-default btn-" ~ icon ~ " " %}
+        {% else %}
+            {% set class = "btn btn-" ~ type ~ " btn-" ~ icon ~ " " %}
+        {% endif %}
+
+        {% if not values is iterable %}
+            {% set url = values %}
+            {% if 'onclick:' in url %}
+                {% set onclick = url|replace({'onclick:': ''}) %}
+                {% set url = '#' %}
+            {% endif %}
+            {% if '#collapse' in url %}
+                {% set toggle = 'collapse' %}
+            {% endif %}
+            {% if '#modal' in url %}
+                {% set modal = url %}
+                {% set url = '#' %}
+            {% endif %}
+        {% else %}
+            {% set disabled = values.disabled ?? false %}
+            {% set url = values.url ?? '#' %}
+            {% set onclick = values.onclick ?? null %}
+            {% set modal = values.modal ?? null %}
+            {% set toggle = values.toggle ?? null %}
+            {% set target = values.target ?? null %}
+            {% set id = values.id ?? null %}
+            {% set title = values.title ?? null %}
+            {% set class = class ~ ( values.class | default("")) %}
+        {% endif %}
+
+        {% if disabled is same as (true) %}
+            {% set class = class ~ " disabled"  %}
+        {% endif %}
+
+        <a class="{{ class | trim }}" href="{{ url }}"
+                {%- if disabled is same as (true) -%}
+                    disabled="disabled"
+                {%- endif -%}
+                {%- if id is not empty -%}
+                    id="{{ id }}"
+                {%- endif -%}
+                {%- if toggle is not empty -%}
+                    data-toggle="{{ toggle }}"
+                {%- endif -%}
+                {%- if modal is not empty -%}
+                    data-toggle="modal" data-target="{{ modal }}"
+                {%- endif -%}
+                {%- if onclick is not empty -%}
+                    onclick="{{ onclick }}"
+                {%- endif -%}
+                {%- if target is not empty -%}
+                    target="{{ target }}"
+                {%- endif -%}
+        >{% if title is not null %}{{ title }}{% else %}{{ macro.icon(icon) }}{% endif %}</a>
+    {% endfilter %}
+{% endmacro %}
+
+{% macro button_group(actions, type) %}
+    {%- import _self as macro -%}
+    <div class="btn-group">
+        {%- filter spaceless -%}
+        {%- for icon,values in actions  %}
+            {{ macro.action_button(icon, values, type) }}
        {% endfor -%}
+        {% endfilter %}
    </div>
 {% endmacro %}