Remove div_for_slider_effect template

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Apr 26, 2020 · b757d79 · b757d79
1 parent b0a728f
commit b757d79
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 154 deletions.
diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
@@ -215,37 +215,6 @@ public static function getExternalBug(
         return $ext_but_html;
     }
 
-    /**
-     * Generates a slider effect (jQjuery)
-     * Takes care of generating the initial <div> and the link
-     * controlling the slider; you have to generate the </div> yourself
-     * after the sliding section.
-     *
-     * @param string      $id              the id of the <div> on which to apply the effect
-     * @param string      $message         the message to show as a link
-     * @param string|null $overrideDefault override InitialSlidersState config
-     *
-     * @return string         html div element
-     *
-     * @throws Throwable
-     * @throws Twig_Error_Loader
-     * @throws Twig_Error_Runtime
-     * @throws Twig_Error_Syntax
-     */
-    public static function getDivForSliderEffect($id = '', $message = '', $overrideDefault = null): string
-    {
-        $template = new Template();
-        return $template->render(
-            'div_for_slider_effect',
-            [
-                'id' => $id,
-                'initial_sliders_state' => $overrideDefault != null ? $overrideDefault
-                    : $GLOBALS['cfg']['InitialSlidersState'],
-                'message' => $message,
-            ]
-        );
-    }
-
     /**
      * Creates an AJAX sliding toggle button
      * (or and equivalent form when AJAX is disabled)

diff --git a/templates/database/multi_table_query/form.twig b/templates/database/multi_table_query/form.twig
@@ -12,11 +12,8 @@
   </li>
 </ul>
 
-{% include 'div_for_slider_effect.twig' with {
-    'id': 'query_div',
-    'message': 'Query window'|trans,
-    'initial_sliders_state': 'open',
-} only %}
+<div id="query_div" class="pma_auto_slider" title="{% trans 'Query window' %}">
+
 <form action="" id="multi_table_query_form" class="multi_table_query_form query_form">
     <input type="hidden" id="db_name" value="{{ db }}">
     <fieldset>
@@ -52,11 +49,9 @@
                 <input type="checkbox"
                     title="{% trans 'Use this column in criteria' %}"
                     class="criteria_col">
-                {% include 'div_for_slider_effect.twig' with {
-                    'id': 'criteria_div' ~ id,
-                    'initial_sliders_state': 'closed',
-                    'message': 'criteria'|trans
-                } %}
+
+                <div id="criteria_div{{ id }}" class="pma_auto_slider" title="{% trans 'criteria' %}" style="display: none; overflow:auto;">
+
                 <div>
                     <table>
 
@@ -177,5 +172,5 @@
         <input class="btn btn-primary" type="button" id="submit_query" value="{% trans 'Submit query' %}">
     </fieldset>
 </form>
-</div>{# Slider div #}
+</div>
 <div id="sql_results"></div>
diff --git a/templates/display/results/table.twig b/templates/display/results/table.twig
@@ -28,11 +28,9 @@
       'display_options_form': 1
     }) }}
 
-    {% include 'div_for_slider_effect.twig' with {
-      'id': '',
-      'message': 'Options'|trans,
-      'initial_sliders_state': default_sliders_state
-    } only %}
+    <div{% if default_sliders_state != 'disabled' -%}
+      {{- default_sliders_state == 'closed' ? ' style="display: none; overflow:auto;"' }} class="pma_auto_slider" title="{% trans 'Options' %}"
+    {%- endif %}>
 
       <fieldset>
         <div class="formelement">
@@ -101,7 +99,7 @@
       <fieldset class="tblFooters">
         <input class="btn btn-primary" type="submit" value="{% trans 'Go' %}">
       </fieldset>
-    </div>{# slider effect div #}
+    </div>
   </form>
 {% endif %}
 

diff --git a/templates/div_for_slider_effect.twig b/templates/div_for_slider_effect.twig
diff --git a/templates/table/index_form.twig b/templates/table/index_form.twig
@@ -48,11 +48,9 @@
               </select>
             </div>
 
-            {% include 'div_for_slider_effect.twig' with {
-                'id': 'indexoptions',
-                'message': 'Advanced Options'|trans,
-                'initial_sliders_state': default_sliders_state
-            } only %}
+            <div id="indexoptions"{% if default_sliders_state != 'disabled' -%}
+                {{- default_sliders_state == 'closed' ? ' style="display: none; overflow:auto;"' }} class="pma_auto_slider" title="{% trans 'Advanced options' %}"
+            {%- endif %}>
 
             <div>
                 <div class="label">
@@ -229,6 +227,7 @@
                     value="{{ 'Add %s column(s) to index'|trans|format(1) }}">
             </div>
         </div>
+        </div>
     </fieldset>
     <fieldset class="tblFooters">
         <button class="btn btn-secondary" type="submit" id="preview_index_frm">{% trans 'Preview SQL' %}</button>

diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig
@@ -100,11 +100,9 @@
 
     {% if cfg_relation['relwork'] %}
         {% if is_foreign_key_supported(tbl_storage_engine) %}
-            {% include 'div_for_slider_effect.twig' with {
-                'id': 'ir_div',
-                'message': 'Internal relationships'|trans,
-                'initial_sliders_state': default_sliders_state
-            } only %}
+            <div id="ir_div"{% if default_sliders_state != 'disabled' -%}
+                {{- default_sliders_state == 'closed' ? ' style="display: none; overflow:auto;"' }} class="pma_auto_slider" title="{% trans 'Internal relationships' %}"
+            {%- endif %}>
         {% endif %}
 
         <fieldset>

diff --git a/templates/table/search/index.twig b/templates/table/search/index.twig
@@ -95,11 +95,9 @@
       <div id="popup_background"></div>
     </fieldset>
 
-    {% include 'div_for_slider_effect.twig' with {
-      'id': 'searchoptions',
-      'message': 'Options'|trans,
-      'initial_sliders_state': default_sliders_state
-    } only %}
+    <div id="searchoptions"{% if default_sliders_state != 'disabled' -%}
+      {{- default_sliders_state == 'closed' ? ' style="display: none; overflow:auto;"' }} class="pma_auto_slider" title="{% trans 'Options' %}"
+    {%- endif %}>
 
     {# Displays columns select list for selecting distinct columns in the search #}
     <fieldset id="fieldset_select_fields">
@@ -155,6 +153,7 @@
 
     </fieldset>
     <div class="clearfloat"></div>
+    </div>
   </fieldset>
 
   <fieldset class="tblFooters">

diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig
@@ -576,12 +576,9 @@
             {% set action_icons = action_icons|merge({'DROP': get_icon('b_drop', 'Drop'|trans)}) %}
         {% endif %}
 
-        {# open Slider Effect div #}
-        {% include 'div_for_slider_effect.twig' with {
-            'id': 'partitions-2',
-            'message': 'Partitions'|trans,
-            'initial_sliders_state': default_sliders_state
-        } only %}
+        <div id="partitions-2"{% if default_sliders_state != 'disabled' -%}
+            {{- default_sliders_state == 'closed' ? ' style="display: none; overflow:auto;"' }} class="pma_auto_slider" title="{% trans 'Partitions' %}"
+        {%- endif %}>
 
         {% set remove_sql = 'ALTER TABLE ' ~ backquote(table) ~ ' REMOVE PARTITIONING' %}
         {% set remove_url = url('/sql') ~ url_query ~ '&sql_query=' ~ remove_sql|url_encode %}
@@ -607,7 +604,6 @@
             'table': table
         } only %}
     {% endif %}
-    {# For closing Slider effect div #}
     </div>
 {% endif %}
 

diff --git a/test/classes/Html/GeneratorTest.php b/test/classes/Html/GeneratorTest.php
@@ -103,74 +103,6 @@ public function testGetDbLinkWithSpecialChars(): void
         );
     }
 
-    /**
-     * Test for getDivForSliderEffect
-     *
-     * @throws Throwable
-     * @throws Twig_Error_Loader
-     * @throws Twig_Error_Runtime
-     * @throws Twig_Error_Syntax
-     */
-    public function testGetDivForSliderEffectTest(): void
-    {
-        global $cfg;
-        $cfg['InitialSlidersState'] = 'undefined';
-
-        $id = 'test_id';
-        $message = 'test_message';
-
-        $this->assertXmlStringEqualsXmlString(
-            '<root>' . Generator::getDivForSliderEffect($id, $message) . '</div></root>',
-            '<root><div id="' . $id . "\" class=\"pma_auto_slider\"\ntitle=\""
-            . htmlspecialchars($message) . "\" >\n</div></root>"
-        );
-    }
-
-    /**
-     * Test for getDivForSliderEffect
-     *
-     * @throws Throwable
-     * @throws Twig_Error_Loader
-     * @throws Twig_Error_Runtime
-     * @throws Twig_Error_Syntax
-     */
-    public function testGetDivForSliderEffectTestClosed(): void
-    {
-        global $cfg;
-        $cfg['InitialSlidersState'] = 'closed';
-
-        $id = 'test_id';
-        $message = 'test_message';
-
-        $this->assertXmlStringEqualsXmlString(
-            '<root>' . Generator::getDivForSliderEffect($id, $message) . '</div></root>',
-            '<root><div id="' . $id . "\" style=\"display: none; overflow:auto;\" class=\"pma_auto_slider\"\ntitle=\""
-            . htmlspecialchars($message) . "\" >\n</div></root>"
-        );
-    }
-
-    /**
-     * Test for getDivForSliderEffect
-     *
-     * @throws Throwable
-     * @throws Twig_Error_Loader
-     * @throws Twig_Error_Runtime
-     * @throws Twig_Error_Syntax
-     */
-    public function testGetDivForSliderEffectTestDisabled(): void
-    {
-        global $cfg;
-        $cfg['InitialSlidersState'] = 'disabled';
-
-        $id = 'test_id';
-        $message = 'test_message';
-
-        $this->assertXmlStringEqualsXmlString(
-            '<root>' . Generator::getDivForSliderEffect($id, $message) . '</div></root>',
-            '<root><div id="' . $id . "\">\n</div></root>"
-        );
-    }
-
     /**
      * Test for Util::getIcon
      */