From 8a7308c3f4b8e07f0948762ad19f4beda435626c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Thu, 20 May 2021 20:54:27 -0300
Subject: Remove some .pma-fieldset CSS classes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/BrowseForeigners.php       | 18 +++++++++---------
 templates/create_tracking_version.twig       | 15 ++++++++-------
 templates/database/central_columns/edit.twig | 15 +++++++++------
 templates/database/central_columns/main.twig |  6 +++---
 test/classes/BrowseForeignersTest.php        | 28 +++++-----------------------
 test/classes/TrackingTest.php                |  5 ++++-
 6 files changed, 38 insertions(+), 49 deletions(-)

diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php
index 7f1989e8ba..826539e10f 100644
--- a/libraries/classes/BrowseForeigners.php
+++ b/libraries/classes/BrowseForeigners.php
@@ -179,7 +179,7 @@ class BrowseForeigners
         $output = '<form class="ajax" '
             . 'id="browse_foreign_form" name="browse_foreign_from" action="'
             . Url::getFromRoute('/browse-foreigners')
-            . '" method="post"><fieldset class="pma-fieldset">'
+            . '" method="post"><fieldset class="row g-3 align-items-center mb-3">'
             . Url::getHiddenInputs($db, $table)
             . '<input type="hidden" name="field" value="' . htmlspecialchars($field)
             . '">'
@@ -194,17 +194,17 @@ class BrowseForeigners
         $filterValue = (isset($_POST['foreign_filter'])
             ? htmlspecialchars($_POST['foreign_filter'])
             : '');
-        $output .= '<span class="formelement">'
-            . '<label for="input_foreign_filter">' . __('Search:') . '</label>'
-            . '<input type="text" name="foreign_filter" '
+        $output .= '<div class="col-auto">'
+            . '<label class="form-label" for="input_foreign_filter">' . __('Search:') . '</label></div>'
+            . '<div class="col-auto"><input class="form-control" type="text" name="foreign_filter" '
             . 'id="input_foreign_filter" '
-            . 'value="' . $filterValue . '" data-old="' . $filterValue . '" '
-            . '>'
+            . 'value="' . $filterValue . '" data-old="' . $filterValue . '">'
+            . '</div><div class="col-auto">'
             . '<input class="btn btn-primary" type="submit" name="submit_foreign_filter" value="'
             . __('Go') . '">'
-            . '</span>'
-            . '<span class="formelement">' . $gotoPage . '</span>'
-            . '<span class="formelement">' . $foreignShowAll . '</span>'
+            . '</div>'
+            . '<div class="col-auto">' . $gotoPage . '</div>'
+            . '<div class="col-auto">' . $foreignShowAll . '</div>'
             . '</fieldset>'
             . '</form>';
 
diff --git a/templates/create_tracking_version.twig b/templates/create_tracking_version.twig
index ee0dcb3ba4..14a6e656db 100644
--- a/templates/create_tracking_version.twig
+++ b/templates/create_tracking_version.twig
@@ -1,12 +1,11 @@
-<div id="div_create_version">
+<div class="card mt-3">
     <form method="post" action="{{ url(route, url_params) }}">
         {{ get_hidden_inputs(db) }}
         {% for selected_table in selected %}
             <input type="hidden" name="selected[]" value="{{ selected_table }}">
         {% endfor %}
 
-        <fieldset class="pma-fieldset">
-            <legend>
+        <div class="card-header">
                 {% if selected|length == 1 %}
                     {{ 'Create version %1$s of %2$s'|trans|format(
                         last_version + 1,
@@ -15,7 +14,9 @@
                 {% else %}
                     {{ 'Create version %1$s'|trans|format(last_version + 1) }}
                 {% endif %}
-            </legend>
+        </div>
+
+        <div class="card-body">
             <input type="hidden" name="version" value="{{ last_version + 1 }}">
             <p>{% trans 'Track these data definition statements:' %}</p>
 
@@ -69,11 +70,11 @@
             <input type="checkbox" name="truncate" value="true"
                 {{- 'TRUNCATE' in default_statements ? ' checked="checked"' }}>
             TRUNCATE<br>
-        </fieldset>
+        </div>
 
-        <fieldset class="pma-fieldset tblFooters">
+        <div class="card-footer">
             <input type="hidden" name="submit_create_version" value="1">
             <input class="btn btn-primary" type="submit" value="{% trans 'Create version' %}">
-        </fieldset>
+        </div>
     </form>
 </div>
diff --git a/templates/database/central_columns/edit.twig b/templates/database/central_columns/edit.twig
index 9c7299759c..5869f32556 100644
--- a/templates/database/central_columns/edit.twig
+++ b/templates/database/central_columns/edit.twig
@@ -1,6 +1,8 @@
 <form id="multi_edit_central_columns">
-  <table id="table_columns" class="table caption-top align-middle mb-0 noclick">
-    <caption class="tblHeaders">{% trans 'Structure' %}</caption>
+  <div class="card">
+    <div class="card-header">{% trans 'Structure' %}</div>
+    <div class="card-body">
+  <table id="table_columns" class="table align-middle mb-0 noclick">
     <thead>
       <tr>
         <th>{% trans 'Name' %}</th>
@@ -15,8 +17,9 @@
     </thead>
     {{ rows|raw }}
   </table>
-
-  <fieldset class="pma-fieldset tblFooters">
-    <input class="btn btn-primary" type="submit" name="save_multi_central_column_edit" value="{% trans 'Save' %}">
-  </fieldset>
+    </div>
+    <div class="card-footer">
+      <input class="btn btn-primary" type="submit" name="save_multi_central_column_edit" value="{% trans 'Save' %}">
+    </div>
+  </div>
 </form>
diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
index fb195695e5..e42956b68b 100644
--- a/templates/database/central_columns/main.twig
+++ b/templates/database/central_columns/main.twig
@@ -127,9 +127,9 @@
     </form>
 </div>
 {% if total_rows <= 0 %}
-    <fieldset class="pma-fieldset">
-        {% trans 'The central list of columns for the current database is empty' %}
-    </fieldset>
+  <div class="alert alert-info" role="alert">
+    {% trans 'The central list of columns for the current database is empty' %}
+  </div>
 {% else %}
     <table class="table table-borderless table-sm w-auto d-inline-block navigation">
         <tr>
diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php
index aba2cdbbed..d951741254 100644
--- a/test/classes/BrowseForeignersTest.php
+++ b/test/classes/BrowseForeignersTest.php
@@ -197,10 +197,7 @@ class BrowseForeignersTest extends AbstractTestCase
             $result
         );
 
-        $this->assertStringContainsString(
-            '<fieldset class="pma-fieldset">',
-            $result
-        );
+        $this->assertStringContainsString('<fieldset class="row g-3 align-items-center mb-3">', $result);
 
         $this->assertStringContainsString(
             '<input type="hidden" name="field" value="foo">',
@@ -217,21 +214,11 @@ class BrowseForeignersTest extends AbstractTestCase
             $result
         );
 
+        $this->assertStringContainsString('<div class="col-auto">', $result);
+        $this->assertStringContainsString('<label class="form-label" for="input_foreign_filter">', $result);
         $this->assertStringContainsString(
-            '<span class="formelement">',
-            $result
-        );
-
-        $this->assertStringContainsString(
-            '<label for="input_foreign_filter">',
-            $result
-        );
-
-        $this->assertStringContainsString(
-            '<input type="text" name="foreign_filter" '
-            . 'id="input_foreign_filter" '
-            . 'value="5" data-old="5" '
-            . '>',
+            '<input class="form-control" type="text" name="foreign_filter" '
+            . 'id="input_foreign_filter" value="5" data-old="5">',
             $result
         );
 
@@ -240,11 +227,6 @@ class BrowseForeignersTest extends AbstractTestCase
             $result
         );
 
-        $this->assertStringContainsString(
-            '<span class="formelement">',
-            $result
-        );
-
         $this->assertStringContainsString(
             '<table class="table table-light table-striped table-hover" id="browse_foreign_table">',
             $result
diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php
index bb6d705286..e9a969460d 100644
--- a/test/classes/TrackingTest.php
+++ b/test/classes/TrackingTest.php
@@ -131,7 +131,10 @@ class TrackingTest extends AbstractTestCase
         $this->assertStringContainsString('PMA_db.PMA_table', $html);
         $this->assertStringContainsString('<td>date_created</td>', $html);
         $this->assertStringContainsString(__('Delete version'), $html);
-        $this->assertStringContainsString('<div id="div_create_version">', $html);
+        $this->assertStringContainsString('<div class="card mt-3">', $html);
+        $this->assertStringContainsString('<div class="card-header">', $html);
+        $this->assertStringContainsString('<div class="card-body">', $html);
+        $this->assertStringContainsString('<div class="card-footer">', $html);
         $this->assertStringContainsString(Url::getHiddenInputs($GLOBALS['db']), $html);
         $this->assertStringContainsString(
             sprintf(
-- 
cgit v1.2.3