From 8434399794ee50bcdd865a14ad40d9b6ae3e0ef0 Mon Sep 17 00:00:00 2001 From: Mathieu De Keyzer Date: Sat, 17 Feb 2024 17:46:18 +0100 Subject: [PATCH] ref: dropdown-item --- .../elements/object-views-button.html.twig | 16 ++++++------- .../elements/revision-toolbar.html.twig | 24 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/object-views-button.html.twig b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/object-views-button.html.twig index 267d23af7..2e2270d81 100644 --- a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/object-views-button.html.twig +++ b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/object-views-button.html.twig @@ -22,7 +22,7 @@ source: source }) %} -
  • +
  • {{ template.label }}
  • {% endif %} {% elseif template.renderOption is constant('EMS\\CoreBundle\\Form\\Field\\RenderOptionType::JOB') %} {% if (is_granted(template.role)) or template.role == "not-defined" %} -
  • +
  • {{ template.label }}
  • @@ -55,13 +55,13 @@ {% elseif template.renderOption is constant('EMS\\CoreBundle\\Form\\Field\\RenderOptionType::IMPORT') %} {%- if (is_granted(template.role)) or template.role == "not-defined" -%} {%- set importModalUrl = path('emsco_data_action_import', { 'actionId': template.id, 'ouuid': ouuid}) -%} -
  • {{ template.label }}
  • +
  • {{ template.label }}
  • {%- endif -%} {% else %}
  • + templateId: template.id}) }}" class="dropdown-item"> {{ template.label }}
  • @@ -73,7 +73,7 @@ {% endfor %} {% if is_granted('ROLE_COPY_PASTE') %}
  • - + {{ 'views.elements.object-views-button.copy-data'|trans }} @@ -84,12 +84,12 @@ 'url': path('emsco_duplicate_revision', {'environment': environment.name, 'type': contentType.name, 'ouuid': ouuid}), 'label': 'Duplicate', 'icon': 'clone', - 'btnClass': '' + 'btnClass': 'dropdown-item' }%}
  • {% endif %}
  • - + {{ 'views.elements.object-views-button.raw-view'|trans }} diff --git a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/revision-toolbar.html.twig b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/revision-toolbar.html.twig index e3b109b34..8769daf5e 100644 --- a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/revision-toolbar.html.twig +++ b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/revision-toolbar.html.twig @@ -35,7 +35,7 @@ @@ -94,13 +94,13 @@ {% if draft %}
  • {% include '@EMSAdminUI/bootstrap5/elements/get-button.html.twig' with { 'url': path('emsco_edit_revision', {'revisionId': revisionId}), - 'btnClass': '', + 'btnClass': 'dropdown-item', 'label': 'views.elements.revision-toolbar-html.edit-draft-label'|trans, 'icon': 'pencil' }%}
  • {% if autoSave %}
  • {% include '@EMSAdminUI/bootstrap5/elements/post-button.html.twig' with { 'url': path('revision.cancel', {'revision': revisionId}), - 'btnClass': '', + 'btnClass': 'dropdown-item', 'label': 'views.elements.revision-toolbar-html.cancel-last-updates-label'|trans, 'icon': 'remove' }%}
  • @@ -109,21 +109,21 @@ {% if is_granted('ROLE_PUBLISHER') and revision.id|default(false) %}
  • {% include '@EMSAdminUI/bootstrap5/elements/get-button.html.twig' with { 'url': path('emsco_pick_a_release', {revision: revision.id}), - 'btnClass': '', + 'btnClass': 'dropdown-item', 'label': 'views.elements.revision-toolbar-html.add-to-release'|trans(), - 'icon': 'glyphicon glyphicon-pushpin' }%}
  • + 'icon': 'fa fa-map-pin' }%} {% endif %} {% if is_granted('ROLE_SUPER') and instance.contentType.environment not in environmentsRevision.environments %}
  • {% include '@EMSAdminUI/bootstrap5/elements/get-button.html.twig' with { 'url': path('emsco_edit_revision', {'revisionId': revisionId}), - 'btnClass': ' ', + 'btnClass': 'dropdown-item', 'label': 'views.elements.revision-toolbar-html.edit-revision-label'|trans, 'icon': 'pencil' }%}
  • {% endif %} {% if autoSave %}
  • {% include '@EMSAdminUI/bootstrap5/elements/post-button.html.twig' with { 'url': path('revision.cancel', {'revision': revisionId}), - 'btnClass': '', + 'btnClass': 'dropdown-item', 'message': 'views.elements.revision-toolbar-html.cancel-last-updates-message'|trans, 'label': 'views.elements.revision-toolbar-html.cancel-last-updates-label'|trans, 'icon': 'remove' @@ -131,7 +131,7 @@ {% endif %}
  • {% include '@EMSAdminUI/bootstrap5/elements/post-button.html.twig' with { 'url': path('revision.revert', {'id': revisionId}), - 'btnClass': '', + 'btnClass': 'dropdown-item', 'label': 'views.elements.revision-toolbar-html.revert-revision-label'|trans, 'icon': 'undo' }%}
  • {% endif %} @@ -144,7 +144,7 @@ 'compareId': rev.id < revision.id ? rev.id :revision.id, 'page': page }), - 'btnClass': '', + 'btnClass': 'dropdown-item', 'label': 'views.elements.revision-toolbar-html.compare-label'|trans, 'icon': 'compress' }%} {% endif %} @@ -164,7 +164,7 @@ @@ -179,7 +179,7 @@ @@ -194,7 +194,7 @@