Fix renamed Bootstrap 5 classes

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Dec 21, 2020 · 6408b71 · 6408b71
1 parent 7127284
commit 6408b71
Show file tree

Hide file tree

Showing 53 changed files with 322 additions and 275 deletions.
diff --git a/js/src/menu_resizer.js b/js/src/menu_resizer.js
@@ -35,7 +35,7 @@
             'class': 'nav-link dropdown-toggle',
             'id': 'navbarDropdown',
             'role': 'button',
-            'data-toggle': 'dropdown',
+            'data-bs-toggle': 'dropdown',
             'aria-haspopup': 'true',
             'aria-expanded': 'false'
         }).text(Messages.strMore);
@@ -47,7 +47,7 @@
         var $submenu = $('<li></li>', { 'class': 'nav-item dropdown d-none' })
             .append(link)
             .append($('<ul></ul>', {
-                'class': 'dropdown-menu dropdown-menu-right',
+                'class': 'dropdown-menu dropdown-menu-end',
                 'aria-labelledby': 'navbarDropdown'
             }));
         $container.append($submenu);

diff --git a/js/src/sql.js b/js/src/sql.js
@@ -496,7 +496,7 @@ AJAX.registerOnload('sql.js', function () {
         var $varDiv = $('#bookmarkVariables');
         $varDiv.empty();
         for (var i = 1; i <= varCount; i++) {
-            $varDiv.append($('<div class="form-group">'));
+            $varDiv.append($('<div class="mb-3">'));
             $varDiv.append($('<label for="bookmarkVariable' + i + '">' + Functions.sprintf(Messages.strBookmarkVariable, i) + '</label>'));
             $varDiv.append($('<input class="form-control" type="text" size="10" name="bookmark_variable[' + i + ']" id="bookmarkVariable' + i + '">'));
             $varDiv.append($('</div>'));

diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -1343,7 +1343,7 @@ private function getFieldVisibilityParams(
         $display_params = $this->properties['display_params'];
 
         // 1. Displays the full/partial text button (part 1)...
-        $button_html .= '<thead class="thead-light"><tr>' . "\n";
+        $button_html .= '<thead class="table-light"><tr>' . "\n";
 
         $emptyPreCondition = $displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE
                            && $displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE;

diff --git a/libraries/classes/Engines/Innodb.php b/libraries/classes/Engines/Innodb.php
@@ -131,11 +131,11 @@ public function getPageBufferpool()
             . ' OR Variable_name = \'Innodb_page_size\';';
         $status = $dbi->fetchResult($sql, 0, 1);
 
-        $output = '<table class="table table-light table-striped table-hover w-auto float-left">' . "\n"
+        $output = '<table class="table table-light table-striped table-hover w-auto float-start caption-top">' . "\n"
             . '    <caption>' . "\n"
             . '        ' . __('Buffer Pool Usage') . "\n"
             . '    </caption>' . "\n"
-            . '    <tfoot class="thead-light">' . "\n"
+            . '    <tfoot class="table-light">' . "\n"
             . '        <tr>' . "\n"
             . '            <th colspan="2">' . "\n"
             . '                ' . __('Total:') . ' '
@@ -158,7 +158,7 @@ public function getPageBufferpool()
             . '    <tbody>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Free pages') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . Util::formatNumber(
                 $status['Innodb_buffer_pool_pages_free'],
                 0
@@ -167,7 +167,7 @@ public function getPageBufferpool()
             . '        </tr>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Dirty pages') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . Util::formatNumber(
                 $status['Innodb_buffer_pool_pages_dirty'],
                 0
@@ -176,7 +176,7 @@ public function getPageBufferpool()
             . '        </tr>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Pages containing data') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . Util::formatNumber(
                 $status['Innodb_buffer_pool_pages_data'],
                 0
@@ -185,7 +185,7 @@ public function getPageBufferpool()
             . '        </tr>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Pages to be flushed') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . Util::formatNumber(
                 $status['Innodb_buffer_pool_pages_flushed'],
                 0
@@ -194,7 +194,7 @@ public function getPageBufferpool()
             . '        </tr>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Busy pages') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . Util::formatNumber(
                 $status['Innodb_buffer_pool_pages_misc'],
                 0
@@ -206,7 +206,7 @@ public function getPageBufferpool()
         if (isset($status['Innodb_buffer_pool_pages_latched'])) {
             $output .= '        <tr>'
                 . '            <th scope="row">' . __('Latched pages') . '</th>'
-                . '            <td class="text-monospace text-right">'
+                . '            <td class="font-monospace text-end">'
                 . Util::formatNumber(
                     $status['Innodb_buffer_pool_pages_latched'],
                     0
@@ -217,14 +217,14 @@ public function getPageBufferpool()
 
         $output .= '    </tbody>' . "\n"
             . '</table>' . "\n\n"
-            . '<table class="table table-light table-striped table-hover w-auto ml-4 float-left">' . "\n"
+            . '<table class="table table-light table-striped table-hover w-auto ms-4 float-start caption-top">' . "\n"
             . '    <caption>' . "\n"
             . '        ' . __('Buffer Pool Activity') . "\n"
             . '    </caption>' . "\n"
             . '    <tbody>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Read requests') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . Util::formatNumber(
                 $status['Innodb_buffer_pool_read_requests'],
                 0
@@ -233,7 +233,7 @@ public function getPageBufferpool()
             . '        </tr>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Write requests') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . Util::formatNumber(
                 $status['Innodb_buffer_pool_write_requests'],
                 0
@@ -242,7 +242,7 @@ public function getPageBufferpool()
             . '        </tr>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Read misses') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . Util::formatNumber(
                 $status['Innodb_buffer_pool_reads'],
                 0
@@ -251,7 +251,7 @@ public function getPageBufferpool()
             . '        </tr>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Write waits') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . Util::formatNumber(
                 $status['Innodb_buffer_pool_wait_free'],
                 0
@@ -260,7 +260,7 @@ public function getPageBufferpool()
             . '        </tr>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Read misses in %') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . ($status['Innodb_buffer_pool_read_requests'] == 0
                 ? '---'
                 : htmlspecialchars(
@@ -275,7 +275,7 @@ public function getPageBufferpool()
             . '        </tr>' . "\n"
             . '        <tr>' . "\n"
             . '            <th scope="row">' . __('Write waits in %') . '</th>' . "\n"
-            . '            <td class="text-monospace text-right">'
+            . '            <td class="font-monospace text-end">'
             . ($status['Innodb_buffer_pool_write_requests'] == 0
                 ? '---'
                 : htmlspecialchars(

diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php
@@ -235,7 +235,7 @@ public function getHtmlVariables()
             $ret .= '    </td>' . "\n"
                   . '    <th scope="row">' . htmlspecialchars($details['title']) . '</th>'
                   . "\n"
-                  . '    <td class="text-monospace text-right">';
+                  . '    <td class="font-monospace text-end">';
             switch ($details['type']) {
                 case PMA_ENGINE_DETAILS_TYPE_SIZE:
                     $parsed_size = $this->resolveTypeSize($details['value']);

diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
@@ -9,7 +9,7 @@
         <input type="hidden" name="add_new_column" value="add_new_column">
         <div class="table-responsive">
             <table class="table table-light">
-                <thead class="thead-light">
+                <thead class="table-light">
                     <tr>
                         <th></th>
                         <th class="" title="" data-column="name">
@@ -213,7 +213,7 @@
             <table id="table_columns" class="table table-light table-striped table-hover tablesorter">
                 {% set class = 'column_heading' %}
                 {% set title = 'Click to sort.' | trans %}
-                <thead class="thead-light">
+                <thead class="table-light">
                     <tr>
                         <th class="{{ class }}"></th>
                         <th class="hide"></th>

diff --git a/templates/database/events/index.twig b/templates/database/events/index.twig
@@ -12,7 +12,7 @@
     </div>
 
     <table class="table table-light table-striped table-hover{{ items is empty ? ' hide' }}">
-      <thead class="thead-light">
+      <thead class="table-light">
       <tr>
         <th></th>
         <th>{% trans 'Name' %}</th>

diff --git a/templates/database/operations/index.twig b/templates/database/operations/index.twig
@@ -8,14 +8,14 @@
       <div class="card mb-2">
         <div class="card-header">{{ get_icon('b_comment', 'Database comment'|trans, true) }}</div>
         <div class="card-body">
-          <div class="form-row">
+          <div class="row g-3">
             <div class="col-auto">
-              <label class="sr-only" for="databaseCommentInput">{% trans 'Database comment' %}</label>
+              <label class="visually-hidden" for="databaseCommentInput">{% trans 'Database comment' %}</label>
               <input class="form-control textfield" id="databaseCommentInput" type="text" name="comment" value="{{ db_comment }}">
             </div>
           </div>
         </div>
-        <div class="card-footer text-right">
+        <div class="card-footer text-end">
           <input class="btn btn-primary" type="submit" value="{% trans 'Go' %}">
         </div>
       </div>
@@ -28,7 +28,7 @@
     <div class="card mb-2">
       <div class="card-header">{{ get_icon('b_table_add', 'Create table'|trans, true) }}</div>
       <div class="card-body">
-        <div class="form-row">
+        <div class="row g-3">
           <div class="col-auto">
             <label for="exampleInputEmail1">{% trans 'Name' %}</label>
             <input class="form-control" type="text" id="exampleInputEmail1" name="table" required>
@@ -40,7 +40,7 @@
         </div>
       </div>
 
-      <div class="card-footer text-right">
+      <div class="card-footer text-end">
         <input class="btn btn-primary" type="submit" value="{% trans "Go" %}">
       </div>
     </div>
@@ -59,9 +59,9 @@
       <div class="card mb-2">
         <div class="card-header">{{ get_icon('b_edit', 'Rename database to'|trans, true) }}</div>
         <div class="card-body">
-          <div class="form-group form-row">
+          <div class="mb-3 row g-3">
             <div class="col-auto">
-              <label class="sr-only" for="new_db_name">{% trans 'New database name' %}</label>
+              <label class="visually-hidden" for="new_db_name">{% trans 'New database name' %}</label>
               <input class="form-control textfield" id="new_db_name" type="text" name="newname" maxlength="64" required>
             </div>
           </div>
@@ -77,7 +77,7 @@
           </div>
         </div>
 
-        <div class="card-footer text-right">
+        <div class="card-footer text-end">
           <input class="btn btn-primary" type="submit" value="{% trans 'Go' %}">
         </div>
       </div>
@@ -122,14 +122,14 @@
     <div class="card mb-2">
       <div class="card-header">{{ get_icon('b_edit', 'Copy database to'|trans, true) }}</div>
       <div class="card-body">
-        <div class="form-group form-row">
+        <div class="mb-3 row g-3">
           <div class="col-auto">
-            <label class="sr-only" for="renameDbNameInput">{% trans 'Database name' %}</label>
+            <label class="visually-hidden" for="renameDbNameInput">{% trans 'Database name' %}</label>
             <input class="form-control textfield" id="renameDbNameInput" type="text" maxlength="64" name="newname" required>
           </div>
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
           <div class="form-check">
             <input class="form-check-input" type="radio" name="what" id="whatRadio1" value="structure">
             <label class="form-check-label" for="whatRadio1">
@@ -186,7 +186,7 @@
         </div>
       </div>
 
-      <div class="card-footer text-right">
+      <div class="card-footer text-end">
         <input class="btn btn-primary" type="submit" name="submit_copy" value="{% trans 'Go' %}">
       </div>
     </div>
@@ -198,9 +198,9 @@
     <div class="card mb-2">
       <div class="card-header">{{ get_icon('s_asci', 'Collation'|trans, true) }}</div>
       <div class="card-body">
-        <div class="form-group form-row">
+        <div class="mb-3 row g-3">
           <div class="col-auto">
-            <label class="sr-only" for="select_db_collation">{% trans 'Collation' %}</label>
+            <label class="visually-hidden" for="select_db_collation">{% trans 'Collation' %}</label>
             <select class="form-control" lang="en" dir="ltr" name="db_collation" id="select_db_collation">
               <option value=""></option>
               {% for charset in charsets %}
@@ -226,7 +226,7 @@
         </div>
       </div>
 
-      <div class="card-footer text-right">
+      <div class="card-footer text-end">
         <input class="btn btn-primary" type="submit" value="{% trans 'Go' %}">
       </div>
     </div>

diff --git a/templates/database/privileges/index.twig b/templates/database/privileges/index.twig
@@ -11,7 +11,7 @@
 
         <div class="table-responsive jsresponsive">
           <table class="table table-light table-striped table-hover">
-            <thead class="thead-light">
+            <thead class="table-light">
               <tr>
                 <th></th>
                 <th scope="col">{% trans 'User name' %}</th>

diff --git a/templates/database/routines/index.twig b/templates/database/routines/index.twig
@@ -24,7 +24,7 @@
     </div>
 
     <table class="table table-light table-striped table-hover{{ items is empty ? ' hide' }}">
-      <thead class="thead-light">
+      <thead class="table-light">
       <tr>
         <th></th>
         <th>{% trans 'Name' %}</th>

diff --git a/templates/database/structure/body_for_table_summary.twig b/templates/database/structure/body_for_table_summary.twig
@@ -1,4 +1,4 @@
-<tfoot id="tbl_summary_row" class="thead-light">
+<tfoot id="tbl_summary_row" class="table-light">
 <tr>
     <th class="d-print-none"></th>
     <th class="tbl_num text-nowrap">
@@ -34,7 +34,7 @@
     {% else %}
         {% set cell_text = row_count_sum %}
     {% endif %}
-    <th class="value tbl_rows text-monospace text-right">{{ cell_text }}</th>
+    <th class="value tbl_rows font-monospace text-end">{{ cell_text }}</th>
     {% if not (properties_num_columns > 1) %}
         {# MySQL <= 5.5.2 #}
         {% set default_engine = dbi.fetchValue('SELECT @@storage_engine;') %}
@@ -60,12 +60,12 @@
         {% set sum = format_byte_down(sum_size, 3, 1) %}
         {% set sum_formatted = sum[0] %}
         {% set sum_unit = sum[1] %}
-        <th class="value tbl_size text-monospace text-right">{{ sum_formatted }} {{ sum_unit }}</th>
+        <th class="value tbl_size font-monospace text-end">{{ sum_formatted }} {{ sum_unit }}</th>
 
         {% set overhead = format_byte_down(overhead_size, 3, 1) %}
         {% set overhead_formatted = overhead[0] %}
         {% set overhead_unit = overhead[1] %}
-        <th class="value tbl_overhead text-monospace text-right">{{ overhead_formatted }} {{ overhead_unit }}</th>
+        <th class="value tbl_overhead font-monospace text-end">{{ overhead_formatted }} {{ overhead_unit }}</th>
     {% endif %}
 
     {% if show_charset %}
@@ -75,17 +75,17 @@
         <th></th>
     {% endif %}
     {% if show_creation %}
-        <th class="value tbl_creation text-monospace text-right">
+        <th class="value tbl_creation font-monospace text-end">
             {{ create_time_all }}
         </th>
     {% endif %}
     {% if show_last_update %}
-        <th class="value tbl_last_update text-monospace text-right">
+        <th class="value tbl_last_update font-monospace text-end">
             {{ update_time_all }}
         </th>
     {% endif %}
     {% if show_last_check %}
-        <th class="value tbl_last_check text-monospace text-right">
+        <th class="value tbl_last_check font-monospace text-end">
             {{ check_time_all }}
         </th>
     {% endif %}