Merge pull request #16241 from PHPGeorgia/update-button-generation

Remove Html\Generator::getButtonOrImage method
phpmyadmin · Jul 6, 2020 · 22fe838 · 22fe838
2 parents a2cc9eb + 97d50ea
commit 22fe838
Show file tree

Hide file tree

Showing 19 changed files with 84 additions and 256 deletions.
diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php
@@ -948,20 +948,18 @@ public function getTableFooter(string $pmaThemeImage, string $text_dir): string
             'text_dir' => $text_dir,
             'form_name' => 'tableslistcontainer',
         ]);
-        $html_output .= Generator::getButtonOrImage(
-            'edit_central_columns',
-            'mult_submit change_central_columns',
-            __('Edit'),
-            'b_edit',
-            'edit central columns'
-        );
-        $html_output .= Generator::getButtonOrImage(
-            'delete_central_columns',
-            'mult_submit',
-            __('Delete'),
-            'b_drop',
-            'remove_from_central_columns'
-        );
+
+        $html_output .= '<button class="btn btn-link mult_submit change_central_columns" type="submit"'
+            . ' name="edit_central_columns" value="edit central columns"'
+            . ' title="' . __('Edit') . '">' . "\n"
+            . Generator::getIcon('b_edit', __('Edit'))
+            . '</button>' . "\n";
+
+        $html_output .= '<button class="btn btn-link mult_submit" type="submit"'
+            . ' name="delete_central_columns" value="remove_from_central_columns"'
+            . ' title="' . __('Delete') . '">' . "\n"
+            . Generator::getIcon('b_drop', __('Delete'))
+            . '</button>' . "\n";
 
         return $html_output;
     }

diff --git a/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php b/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php
diff --git a/libraries/classes/Html/ActionLinksModes/Factory.php b/libraries/classes/Html/ActionLinksModes/Factory.php
diff --git a/libraries/classes/Html/ActionLinksModes/Image.php b/libraries/classes/Html/ActionLinksModes/Image.php
diff --git a/libraries/classes/Html/ActionLinksModes/Text.php b/libraries/classes/Html/ActionLinksModes/Text.php
diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
@@ -8,7 +8,6 @@
 namespace PhpMyAdmin\Html;
 
 use PhpMyAdmin\Core;
-use PhpMyAdmin\Html\ActionLinksModes\Factory;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
@@ -126,30 +125,6 @@ public static function showHint($message): string
             . '</span>';
     }
 
-    /**
-     * Generate a button or image tag
-     *
-     * @param string $button_name  name of button element
-     * @param string $button_class class of button or image element
-     * @param string $text         text to display
-     * @param string $image        image to display
-     * @param string $value        value
-     *
-     * @return string              html content
-     *
-     * @access public
-     */
-    public static function getButtonOrImage(
-        $button_name,
-        $button_class,
-        $text,
-        $image,
-        $value = ''
-    ): string {
-        return Factory::build($GLOBALS['cfg']['ActionLinksMode'])
-            ->generate($button_name, $button_class, $text, $image, $value);
-    }
-
     /**
      * returns html code for db link to default db page
      *

diff --git a/libraries/classes/Twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php
@@ -46,11 +46,6 @@ public function getFunctions()
                 '\PhpMyAdmin\Html\Generator::formatSql',
                 ['is_safe' => ['html']]
             ),
-            new TwigFunction(
-                'get_button_or_image',
-                '\PhpMyAdmin\Html\Generator::getButtonOrImage',
-                ['is_safe' => ['html']]
-            ),
             new TwigFunction(
                 'get_docu_link',
                 '\PhpMyAdmin\Html\MySQLDocumentation::getDocumentationLink',

diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
@@ -399,20 +399,14 @@
                 'text_dir'       : text_dir,
                 'form_name'      : 'tableslistcontainer',
             } only %}
-            {{ get_button_or_image(
-                'edit_central_columns',
-                'mult_submit change_central_columns',
-                'Edit' | trans,
-                'b_edit',
-                'edit central columns'
-            ) | raw }}
-            {{ get_button_or_image(
-            'delete_central_columns',
-            'mult_submit',
-            'Delete' | trans,
-            'b_drop',
-            'remove_from_central_columns'
-            ) | raw }}
+            <button class="btn btn-link mult_submit change_central_columns" type="submit" name="edit_central_columns"
+                    value="edit central columns" title="{% trans 'Edit' %}">
+                {{ get_icon('b_edit', 'Edit'|trans) }}
+            </button>
+            <button class="btn btn-link mult_submit" type="submit" name="delete_central_columns"
+                    value="remove_from_central_columns" title="{% trans 'Delete' %}">
+                {{ get_icon('b_drop', 'Delete'|trans) }}
+            </button>
         </form>
     </div>
 {% endif %}
diff --git a/templates/database/events/index.twig b/templates/database/events/index.twig
@@ -84,8 +84,12 @@
         <label for="rteListForm_checkall">{% trans 'Check all' %}</label>
         <em class="with-selected">{% trans 'With selected:' %}</em>
 
-        {{ get_button_or_image('submit_mult', 'mult_submit', 'Export'|trans, 'b_export', 'export') }}
-        {{ get_button_or_image('submit_mult', 'mult_submit', 'Drop'|trans, 'b_drop', 'drop') }}
+        <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="export" title="{% trans 'Export' %}">
+          {{ get_icon('b_export', 'Export'|trans) }}
+        </button>
+        <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="drop" title="{% trans 'Drop' %}">
+          {{ get_icon('b_drop', 'Drop'|trans) }}
+        </button>
       </div>
     {% endif %}
   </fieldset>

diff --git a/templates/database/privileges/index.twig b/templates/database/privileges/index.twig
@@ -113,7 +113,9 @@
           <input type="checkbox" id="usersForm_checkall" class="checkall_box" title="{% trans 'Check all' %}">
           <label for="usersForm_checkall">{% trans 'Check all' %}</label>
           <em class="with-selected">{% trans 'With selected:' %}</em>
-          {{ get_button_or_image('submit_mult', 'mult_submit', 'Export'|trans, 'b_tblexport', 'export') }}
+          <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="export" title="{% trans 'Export' %}">
+            {{ get_icon('b_tblexport', 'Export'|trans) }}
+          </button>
         </div>
       </fieldset>
     </div>

diff --git a/templates/database/routines/list.twig b/templates/database/routines/list.twig
@@ -31,8 +31,12 @@
         <label for="rteListForm_checkall">{% trans 'Check all' %}</label>
         <em class="with-selected">{% trans 'With selected:' %}</em>
 
-        {{ get_button_or_image('submit_mult', 'mult_submit', 'Export'|trans, 'b_export', 'export') }}
-        {{ get_button_or_image('submit_mult', 'mult_submit', 'Drop'|trans, 'b_drop', 'drop') }}
+        <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="export" title="{% trans 'Export' %}">
+          {{ get_icon('b_export', 'Export'|trans) }}
+        </button>
+        <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="drop" title="{% trans 'Drop' %}">
+          {{ get_icon('b_drop', 'Drop'|trans) }}
+        </button>
       </div>
     {% endif %}
   </fieldset>

diff --git a/templates/database/tracking/tables.twig b/templates/database/tracking/tables.twig
@@ -98,13 +98,10 @@
                 'text_dir': text_dir,
                 'form_name': 'trackedForm'
             } only %}
-            {{ get_button_or_image(
-                'submit_mult',
-                'mult_submit',
-                'Delete tracking'|trans,
-                'b_drop',
-                'delete_tracking'
-            ) }}
+            <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="delete_tracking"
+                    title="{% trans 'Delete tracking' %}">
+                {{ get_icon('b_drop', 'Delete tracking'|trans) }}
+            </button>
         </form>
     </div>
 {% endif %}
@@ -153,12 +150,8 @@
             'text_dir': text_dir,
             'form_name': 'untrackedForm'
         } only %}
-        {{ get_button_or_image(
-            'submit_mult',
-            'mult_submit',
-            'Track table'|trans,
-            'eye',
-            'track'
-        ) }}
+        <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="track" title="{% trans 'Track table' %}">
+            {{ get_icon('eye', 'Track table'|trans) }}
+        </button>
     </form>
 {% endif %}
diff --git a/templates/database/triggers/list.twig b/templates/database/triggers/list.twig
@@ -34,8 +34,12 @@
         <label for="rteListForm_checkall">{% trans 'Check all' %}</label>
         <em class="with-selected">{% trans 'With selected:' %}</em>
 
-        {{ get_button_or_image('submit_mult', 'mult_submit', 'Export'|trans, 'b_export', 'export') }}
-        {{ get_button_or_image('submit_mult', 'mult_submit', 'Drop'|trans, 'b_drop', 'drop') }}
+        <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="export" title="{% trans 'Export' %}">
+          {{ get_icon('b_export', 'Export'|trans) }}
+        </button>
+        <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="drop" title="{% trans 'Drop' %}">
+          {{ get_icon('b_drop', 'Drop'|trans) }}
+        </button>
       </div>
     {% endif %}
   </fieldset>

diff --git a/templates/display/results/table.twig b/templates/display/results/table.twig
@@ -207,14 +207,22 @@
       <label for="resultsForm_{{ unique_id }}_checkall">{% trans 'Check all' %}</label>
       <em class="with-selected">{% trans 'With selected:' %}</em>
 
-      {{ get_button_or_image('submit_mult', 'mult_submit', 'Edit'|trans, 'b_edit', 'edit') }}
+      <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="edit" title="{% trans 'Edit' %}">
+        {{ get_icon('b_edit', 'Edit'|trans) }}
+      </button>
 
-      {{ get_button_or_image('submit_mult', 'mult_submit', 'Copy'|trans, 'b_insrow', 'copy') }}
+      <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="copy" title="{% trans 'Copy' %}">
+        {{ get_icon('b_insrow', 'Copy'|trans) }}
+      </button>
 
-      {{ get_button_or_image('submit_mult', 'mult_submit', 'Delete'|trans, 'b_drop', 'delete') }}
+      <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="delete" title="{% trans 'Delete' %}">
+        {{ get_icon('b_drop', 'Delete'|trans) }}
+      </button>
 
       {% if bulk_links.has_export_button %}
-        {{ get_button_or_image('submit_mult', 'mult_submit', 'Export'|trans, 'b_tblexport', 'export') }}
+        <button class="btn btn-link mult_submit" type="submit" name="submit_mult" value="export" title="{% trans 'Export' %}">
+          {{ get_icon('b_tblexport', 'Export'|trans) }}
+        </button>
       {% endif %}
     </div>
 

diff --git a/templates/server/databases/index.twig b/templates/server/databases/index.twig
@@ -301,12 +301,9 @@
           'form_name': 'dbStatsForm'
         } only %}
 
-        {{ get_button_or_image(
-          '',
-          'mult_submit ajax',
-          'Drop'|trans,
-          'b_deltbl'
-        ) }}
+          <button class="btn btn-link mult_submit ajax" type="submit" name="" value="Drop" title="{% trans 'Drop' %}">
+              {{ get_icon('b_deltbl', 'Drop'|trans) }}
+          </button>
       {% endif %}
 
       {# Enable statistics #}