Bootstrap 5.0.0 beta 1

stephanediondev · stephanediondev · commit 275045d5f412 · 2020-12-14T10:50:49.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,10 +19,10 @@
         "build": "encore production --progress"
     },
     "dependencies": {
-        "bootstrap": "^5.0.0-alpha3",
+        "@popperjs/core": "^2.5.4",
+        "bootstrap": "^5.0.0-beta1",
         "file-saver": "^2.0.5",
         "jquery": "^3.5.1",
-        "popper.js": "^1.16.1-lts",
         "slug": "^4.0.2"
     }
 }
diff --git a/templates/Embed/shard_reroute_cluster_embed.html.twig b/templates/Embed/shard_reroute_cluster_embed.html.twig
@@ -1,6 +1,6 @@
 {% import 'Import/app_import.html.twig' as appImport %}
 
-<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#modal{{ modalReference }}">
+<button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal{{ modalReference }}">
     {{ title }}
 </button>
 
diff --git a/templates/Import/app_import.html.twig b/templates/Import/app_import.html.twig
@@ -171,7 +171,7 @@
         {% set params = params|merge({'size': 'sm'}) %}
     {% endif %}
 
-    <button type="button" class="btn btn-{{ params.button }} btn-{{ params.size }}" data-toggle="modal" data-target="#modal{{ params.id }}">
+    <button type="button" class="btn btn-{{ params.button }} btn-{{ params.size }}" data-bs-toggle="modal" data-bs-target="#modal{{ params.id }}">
         {{ params.title }}
     </button>
     <div class="modal fade" id="modal{{ params.id }}" tabindex="-1" role="dialog" aria-labelledby="modalLabel{{ params.id }}" aria-hidden="true">
diff --git a/templates/Modules/cat/cat_index.html.twig b/templates/Modules/cat/cat_index.html.twig
@@ -36,7 +36,7 @@
 
                 {% if help is defined %}
                     <p>
-                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="collapse" data-target="#collapseHelp" aria-expanded="false" aria-controls="collapseHelp">
+                        <button class="btn btn-secondary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#collapseHelp" aria-expanded="false" aria-controls="collapseHelp">
                             {{ 'help'|trans }}
                         </button>
                     </p>
diff --git a/templates/Modules/dangling_indices/dangling_indices_list.html.twig b/templates/Modules/dangling_indices/dangling_indices_list.html.twig
@@ -91,7 +91,7 @@
                         {% if '_buttons' == column %}
                             <td>
                                 {% if is_granted_dangling_indices_import %}
-                                    <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#modal{{ modalReference }}">
+                                    <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal{{ modalReference }}">
                                         {{ 'dangling_indices_import'|trans }}
                                     </button>
                                     <div class="modal fade" id="modal{{ modalReference }}" tabindex="-1" role="dialog" aria-labelledby="modalLabel{{ modalReference }}" aria-hidden="true">
@@ -122,7 +122,7 @@
                                 {% endif %}
 
                                 {% if is_granted_dangling_indices_delete %}
-                                    <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#modal{{ modalReference }}">
+                                    <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal{{ modalReference }}">
                                         {{ 'dangling_indices_delete'|trans }}
                                     </button>
                                     <div class="modal fade" id="modal{{ modalReference }}" tabindex="-1" role="dialog" aria-labelledby="modalLabel{{ modalReference }}" aria-hidden="true">
diff --git a/templates/Modules/index/index_read_import.html.twig b/templates/Modules/index/index_read_import.html.twig
@@ -22,7 +22,7 @@
             {{ appImport.heading({'level': 3, 'title': 'import_from_file'|trans}) }}
 
             <p>
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="collapse" data-target="#collapseHelp" aria-expanded="false" aria-controls="collapseHelp">
+                <button class="btn btn-secondary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#collapseHelp" aria-expanded="false" aria-controls="collapseHelp">
                     {{ 'help'|trans }}
                 </button>
             </p>
diff --git a/templates/Modules/index/index_read_search_list.html.twig b/templates/Modules/index/index_read_search_list.html.twig
@@ -29,7 +29,7 @@
         {% for row in documents.rows %}
             <tr>
                 <td>
-                    <button type="button" class="btn btn-info btn-sm" data-toggle="modal" data-target="#modal{{ row['_id'] }}">
+                    <button type="button" class="btn btn-info btn-sm" data-bs-toggle="modal" data-bs-target="#modal{{ row['_id'] }}">
                         {{ 'source'|trans }}
                     </button>
 
@@ -75,7 +75,7 @@
                                             {% endfor %}
                                         </ul>
                                     {% else %}
-                                        <button type="button" class="btn btn-info btn-sm" data-toggle="modal" data-target="#modal{{ row['_id'] }}{{ field }}">
+                                        <button type="button" class="btn btn-info btn-sm" data-bs-toggle="modal" data-bs-target="#modal{{ row['_id'] }}{{ field }}">
                                             {{ 'array'|trans }}
                                         </button>
 
@@ -99,7 +99,7 @@
                                 {% endif %}
                             {% else %}
                                 {% if 500 < value|length %}
-                                    <button type="button" class="btn btn-info btn-sm" data-toggle="modal" data-target="#modal{{ row['_id'] }}{{ field }}">
+                                    <button type="button" class="btn btn-info btn-sm" data-bs-toggle="modal" data-bs-target="#modal{{ row['_id'] }}{{ field }}">
                                         {{ 'long_text'|trans }}
                                     </button>
 
diff --git a/templates/Modules/index/index_read_tabs.html.twig b/templates/Modules/index/index_read_tabs.html.twig
@@ -32,7 +32,7 @@
 
     {% if is_granted('INDEX_IMPORT', index) %}
         <li class="nav-item dropdown">
-            <a class="nav-link text-light dropdown-toggle{% if 'import_from_' in active %} active bg-dark{% endif %}" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{{ 'import'|trans }}</a>
+            <a class="nav-link text-light dropdown-toggle{% if 'import_from_' in active %} active bg-dark{% endif %}" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{{ 'import'|trans }}</a>
             <div class="dropdown-menu dropdown-menu-dark">
                 <a class="dropdown-item{% if 'import_from_file' == active %} active bg-dark{% endif %}" href="{{ path('indices_read_import', {'index': index.name}) }}">{{ 'import_from_file'|trans }}</a>
                 <a class="dropdown-item{% if 'import_from_database' == active %} active bg-dark{% endif %}" href="{{ path('index_database_import', {'index': index.name}) }}">{{ 'import_from_database'|trans }}</a>
diff --git a/templates/Modules/repository/repository_tabs.html.twig b/templates/Modules/repository/repository_tabs.html.twig
@@ -6,7 +6,7 @@
 
     {% if is_granted('REPOSITORIES_CREATE', 'global') %}
         <li class="nav-item dropdown">
-            <a class="nav-link text-light dropdown-toggle{% if 'create_repository_' in active %} active bg-dark{% endif %}" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{{ 'create_repository'|trans }}</a>
+            <a class="nav-link text-light dropdown-toggle{% if 'create_repository_' in active %} active bg-dark{% endif %}" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{{ 'create_repository'|trans }}</a>
             <div class="dropdown-menu dropdown-menu-dark">
                 <a class="dropdown-item{% if 'create_repository_fs' == active %} active bg-dark{% endif %}" href="{{ path('repositories_create', {'type': 'fs'}) }}">{{ 'create_repository_fs'|trans }}</a>
                 <a class="dropdown-item{% if 'create_repository_s3' == active %} active bg-dark{% endif %}" href="{{ path('repositories_create', {'type': 's3'}) }}">{{ 'create_repository_s3'|trans }}{% if false == hasPlugin('repository-s3') %}{{ appImport.badge({'title': 'disabled'|trans, 'context': 'warning'}) }}{% endif %}</a>
diff --git a/templates/Modules/shard/shard_list.html.twig b/templates/Modules/shard/shard_list.html.twig
@@ -209,7 +209,7 @@
                                 {% endif %}
 
                                 {% if row.unassignedDetails %}
-                                        <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#modal{{ modalReference }}">
+                                        <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal{{ modalReference }}">
                                             {{ 'unassigned_details'|trans }}
                                         </button>
                                         <div class="modal fade" id="modal{{ modalReference }}" tabindex="-1" role="dialog" aria-labelledby="modalLabel{{ modalReference }}" aria-hidden="true">
diff --git a/templates/Modules/sql/sql_index.html.twig b/templates/Modules/sql/sql_index.html.twig
@@ -28,13 +28,13 @@
         <ul class="nav nav-tabs mb-4">
             {% if query is defined %}
                 <li class="nav-item">
-                    <a class="nav-link text-light bg-dark active" id="query-tab" data-toggle="tab" href="#query" role="tab" aria-controls="query" aria-selected="true">{{ 'query'|trans }}</a>
+                    <a class="nav-link text-light bg-dark active" id="query-tab" data-bs-toggle="tab" href="#query" role="tab" aria-controls="query" aria-selected="true">{{ 'query'|trans }}</a>
                 </li>
             {% endif %}
 
             {% if translation_to_dsl is defined %}
                 <li class="nav-item">
-                    <a class="nav-link text-light bg-dark" id="translation_to_dsl-tab" data-toggle="tab" href="#translation_to_dsl" role="tab" aria-controls="translation_to_dsl" aria-selected="true">{{ 'translation_to_dsl'|trans }}</a>
+                    <a class="nav-link text-light bg-dark" id="translation_to_dsl-tab" data-bs-toggle="tab" href="#translation_to_dsl" role="tab" aria-controls="translation_to_dsl" aria-selected="true">{{ 'translation_to_dsl'|trans }}</a>
                 </li>
             {% endif %}
         </ul>
diff --git a/templates/Modules/subscription/subscription_tabs.html.twig b/templates/Modules/subscription/subscription_tabs.html.twig
@@ -5,7 +5,7 @@
     </li>
 
     <li class="nav-item dropdown">
-        <a class="nav-link text-light dropdown-toggle{% if 'create_subscription_' in active %} active bg-dark{% endif %}" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{{ 'create_subscription'|trans }}</a>
+        <a class="nav-link text-light dropdown-toggle{% if 'create_subscription_' in active %} active bg-dark{% endif %}" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{{ 'create_subscription'|trans }}</a>
         <div class="dropdown-menu dropdown-menu-dark">
             <a class="dropdown-item{% if 'create_subscription_push' == active %} active bg-dark{% endif %}" href="{{ path('app_subscriptions_create', {'type': 'push'}) }}">{{ 'create_subscription_push'|trans }}{% if false == app.request.isSecure or false == applicationServerKey %}{{ appImport.badge({'title': 'disabled'|trans, 'context': 'warning'}) }}{% endif %}</a>
             <a class="dropdown-item{% if 'create_subscription_email' == active %} active bg-dark{% endif %}" href="{{ path('app_subscriptions_create', {'type': 'email'}) }}">{{ 'create_subscription_email'|trans }}{% if 'smtp://replace' == mailerDsn %}{{ appImport.badge({'title': 'disabled'|trans, 'context': 'warning'}) }}{% endif %}</a>
diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -28,7 +28,7 @@
         <div id="toast-container">
         </div>
         <nav class="navbar sticky-top navbar-expand-lg navbar-dark bg-dark">
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="{{ 'toggle_navigation'|trans }}">
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="{{ 'toggle_navigation'|trans }}">
                 <span class="navbar-toggler-icon"></span>
             </button>
             <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
@@ -58,7 +58,7 @@
 
                         {% if menus['configuration'] is defined %}
                             <li class="nav-item dropdown">
-                                <a class="nav-link text-light dropdown-toggle" href="#" id="configurationDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <a class="nav-link text-light dropdown-toggle" href="#" id="configurationDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                     {{ 'configuration'|trans }}
                                 </a>
                                 <div class="dropdown-menu dropdown-menu-dark border border-secondary" aria-labelledby="configurationDropdown">
@@ -74,7 +74,7 @@
 
                         {% if menus['tools'] is defined %}
                             <li class="nav-item dropdown">
-                                <a class="nav-link text-light dropdown-toggle" href="#" id="toolsDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <a class="nav-link text-light dropdown-toggle" href="#" id="toolsDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                     {{ 'tools'|trans }}
                                 </a>
                                 <div class="dropdown-menu dropdown-menu-dark border border-secondary" aria-labelledby="toolsDropdown">
@@ -90,7 +90,7 @@
 
                         {% if menus['stats'] is defined %}
                             <li class="nav-item dropdown">
-                                <a class="nav-link text-light dropdown-toggle" href="#" id="statsDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <a class="nav-link text-light dropdown-toggle" href="#" id="statsDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                     {{ 'stats'|trans }}
                                 </a>
                                 <div class="dropdown-menu dropdown-menu-dark border border-secondary" aria-labelledby="statsDropdown">
@@ -106,7 +106,7 @@
 
                         {% if menus['application'] is defined %}
                             <li class="nav-item dropdown">
-                                <a class="nav-link text-light dropdown-toggle" href="#" id="applicationDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <a class="nav-link text-light dropdown-toggle" href="#" id="applicationDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                     {{ 'application'|trans }}
                                 </a>
                                 <div class="dropdown-menu dropdown-menu-dark border border-secondary" aria-labelledby="applicationDropdown">
@@ -126,7 +126,7 @@
                         {% endif %}
 
                         <li class="nav-item dropdown">
-                            <a class="nav-link text-light dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <a class="nav-link text-light dropdown-toggle" href="#" id="userDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                 {{ app.user.email }}
                             </a>
                             <div class="dropdown-menu dropdown-menu-dark border border-secondary" aria-labelledby="userDropdown">

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@`
`19`	`19`	`"build": "encore production --progress"`
`20`	`20`	`},`
`21`	`21`	`"dependencies": {`
`22`		`- "bootstrap": "^5.0.0-alpha3",`
	`22`	`+ "@popperjs/core": "^2.5.4",`
	`23`	`+ "bootstrap": "^5.0.0-beta1",`
`23`	`24`	`"file-saver": "^2.0.5",`
`24`	`25`	`"jquery": "^3.5.1",`
`25`		`- "popper.js": "^1.16.1-lts",`
`26`	`26`	`"slug": "^4.0.2"`
`27`	`27`	`}`
`28`	`28`	`}`