From 582f8e4c5fd21d8c86e021ec0b9e9dde2e8d720a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 24 Jul 2022 18:14:33 +0200 Subject: [PATCH] Fix tabs and pills for bootstrap 5 --- templates/AdminPages/CategoryAdmin.html.twig | 4 ++-- .../AdminPages/CompanyAdminBase.html.twig | 2 +- templates/AdminPages/EntityAdminBase.html.twig | 18 +++++++++--------- templates/AdminPages/GroupAdmin.html.twig | 2 +- .../AdminPages/LabelProfileAdmin.html.twig | 4 ++-- .../AdminPages/StorelocationAdmin.html.twig | 2 +- templates/AdminPages/UserAdmin.html.twig | 6 +++--- templates/Form/permissionLayout.html.twig | 2 +- templates/LabelSystem/dialog.html.twig | 6 +++--- templates/Parts/edit/edit_part_info.html.twig | 16 ++++++++-------- templates/Parts/info/show_part_info.html.twig | 16 ++++++++-------- templates/Parts/lists/_info_card.html.twig | 12 ++++++------ templates/Statistics/statistics.html.twig | 6 +++--- templates/Users/_2fa_settings.html.twig | 10 +++++----- templates/Users/user_settings.html.twig | 4 ++-- templates/_navbar.html.twig | 4 ++-- templates/base.html.twig | 2 +- 17 files changed, 58 insertions(+), 58 deletions(-) diff --git a/templates/AdminPages/CategoryAdmin.html.twig b/templates/AdminPages/CategoryAdmin.html.twig index e39ea3d0..64cf7c6a 100644 --- a/templates/AdminPages/CategoryAdmin.html.twig +++ b/templates/AdminPages/CategoryAdmin.html.twig @@ -5,8 +5,8 @@ {% endblock %} {% block additional_pills %} -
  • {% trans %}admin.options{% endtrans %}
    • -
  • {% trans %}admin.advanced{% endtrans %}
    • +
  • {% trans %}admin.options{% endtrans %}
    • +
  • {% trans %}admin.advanced{% endtrans %}
    • {% endblock %} {% block edit_title %} diff --git a/templates/AdminPages/CompanyAdminBase.html.twig b/templates/AdminPages/CompanyAdminBase.html.twig index 6219d62f..c89372fa 100644 --- a/templates/AdminPages/CompanyAdminBase.html.twig +++ b/templates/AdminPages/CompanyAdminBase.html.twig @@ -12,7 +12,7 @@ {% block comment %}{% endblock %} {% block additional_pills %} -
  • {% trans %}admin.advanced{% endtrans %}
    • +
  • {% trans %}admin.advanced{% endtrans %}
    • {% endblock %} {% block additional_panes %} diff --git a/templates/AdminPages/EntityAdminBase.html.twig b/templates/AdminPages/EntityAdminBase.html.twig index 1b6e4b0f..35280bd2 100644 --- a/templates/AdminPages/EntityAdminBase.html.twig +++ b/templates/AdminPages/EntityAdminBase.html.twig @@ -66,16 +66,16 @@ {{ form_errors(form) }} @@ -88,15 +88,15 @@ diff --git a/templates/AdminPages/GroupAdmin.html.twig b/templates/AdminPages/GroupAdmin.html.twig index 7952d06f..409cb6d0 100644 --- a/templates/AdminPages/GroupAdmin.html.twig +++ b/templates/AdminPages/GroupAdmin.html.twig @@ -6,7 +6,7 @@ {% block additional_pills %} -
  • {% trans %}user.edit.permissions{% endtrans %}
    • +
  • {% trans %}user.edit.permissions{% endtrans %}
    • {% endblock %} diff --git a/templates/AdminPages/LabelProfileAdmin.html.twig b/templates/AdminPages/LabelProfileAdmin.html.twig index 2d008448..83dc5a5d 100644 --- a/templates/AdminPages/LabelProfileAdmin.html.twig +++ b/templates/AdminPages/LabelProfileAdmin.html.twig @@ -5,8 +5,8 @@ {% endblock %} {% block additional_pills %} -
  • {% trans %}label_profile.advanced{% endtrans %}
    • -
  • {% trans %}label_profile.comment{% endtrans %}
    • +
  • {% trans %}label_profile.advanced{% endtrans %}
    • +
  • {% trans %}label_profile.comment{% endtrans %}
    • {% endblock %} {% block additional_panes %} diff --git a/templates/AdminPages/StorelocationAdmin.html.twig b/templates/AdminPages/StorelocationAdmin.html.twig index 8ed65d82..3bbeb1ae 100644 --- a/templates/AdminPages/StorelocationAdmin.html.twig +++ b/templates/AdminPages/StorelocationAdmin.html.twig @@ -16,7 +16,7 @@ {% endblock %} {% block additional_pills %} -
  • {% trans %}admin.options{% endtrans %}
    • +
  • {% trans %}admin.options{% endtrans %}
    • {% endblock %} {% block additional_panes %} diff --git a/templates/AdminPages/UserAdmin.html.twig b/templates/AdminPages/UserAdmin.html.twig index 33c44626..dfbf5b32 100644 --- a/templates/AdminPages/UserAdmin.html.twig +++ b/templates/AdminPages/UserAdmin.html.twig @@ -11,9 +11,9 @@ {% block comment %}{% endblock %} {% block additional_pills %} -
  • {% trans %}user.edit.configuration{% endtrans %}
    • -
  • {% trans %}user.edit.password{% endtrans %}
    • -
  • {% trans %}user.edit.permissions{% endtrans %}
    • +
  • {% trans %}user.edit.configuration{% endtrans %}
    • +
  • {% trans %}user.edit.password{% endtrans %}
    • +
  • {% trans %}user.edit.permissions{% endtrans %}
    • {% endblock %} {% block master_picture_block %}{% endblock %} diff --git a/templates/Form/permissionLayout.html.twig b/templates/Form/permissionLayout.html.twig index 120783f6..a48d0693 100644 --- a/templates/Form/permissionLayout.html.twig +++ b/templates/Form/permissionLayout.html.twig @@ -73,7 +73,7 @@ {% for group in form %}
  • {{ group.vars.label | trans }} + data-bs-toggle="tab" role="tab" href="#group_row_{{ group.vars.name }}">{{ group.vars.label | trans }}
    • {% endfor %} diff --git a/templates/LabelSystem/dialog.html.twig b/templates/LabelSystem/dialog.html.twig index f31670d4..cfcfafa8 100644 --- a/templates/LabelSystem/dialog.html.twig +++ b/templates/LabelSystem/dialog.html.twig @@ -12,15 +12,15 @@ diff --git a/templates/Parts/edit/edit_part_info.html.twig b/templates/Parts/edit/edit_part_info.html.twig index 7b850c3c..bdeb3241 100644 --- a/templates/Parts/edit/edit_part_info.html.twig +++ b/templates/Parts/edit/edit_part_info.html.twig @@ -17,49 +17,49 @@