Permalink
Browse files

Remove get_div_for_slider_effect twig extension

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
  • Loading branch information...
laps15 committed Aug 8, 2018
1 parent 1d39152 commit fc9ccff2183032d200b103999d023f01ccdb0c16
@@ -122,6 +122,7 @@ public function displayFormAction()
'form_params' => $form_params,
'add_fields' => $add_fields,
'create_edit_table' => isset($_REQUEST['create_edit_table']),
'default_sliders_state' => $GLOBALS['cfg']['InitialSlidersState'],
])
);
}
@@ -206,6 +206,7 @@ public function indexAction()
'url_params' => $GLOBALS['url_params'],
'databases' => $GLOBALS['dblist']->databases,
'dbi' => $this->dbi,
'default_sliders_state' => $GLOBALS['cfg']['InitialSlidersState'],
'foreignKeySupported' => $foreignKeySupported,
'displayIndexesHtml' => $foreignKeySupported ? Index::getHtmlForDisplayIndexes() : null,
])
@@ -565,6 +565,7 @@ public function displaySelectionFormAction($dataLabel = null)
'data_label' => $dataLabel,
'keys' => $keys,
'criteria_column_names' => $criteria_column_names,
'default_sliders_state' => $GLOBALS['cfg']['InitialSlidersState'],
'criteria_column_types' => isset($_POST['criteriaColumnTypes']) ? $_POST['criteriaColumnTypes'] : null,
'sql_types' => $this->dbi->types,
'max_rows' => intval($GLOBALS['cfg']['MaxRows']),
@@ -1394,6 +1394,7 @@ function ($key, $val) {
'have_partitioning' => Partition::havePartitioning(),
'partitions' => Partition::getPartitions($this->db, $this->table),
'partition_names' => Partition::getPartitionNames($this->db, $this->table),
'default_sliders_state' => $GLOBALS['cfg']['InitialSlidersState'],
'attributes' => $attributes,
'displayed_fields' => $displayed_fields,
'row_comments' => $row_comments,
@@ -1758,6 +1758,7 @@ private function _getOptionsBlock()
'table' => $this->__get('table'),
'sql_query' => $this->__get('sql_query'),
'goto' => $this->__get('goto'),
'default_sliders_state' => $GLOBALS['cfg']['InitialSlidersState'],
]);
}
@@ -64,11 +64,6 @@ public function getFunctions()
'PhpMyAdmin\Util::getClassForType',
['is_safe' => ['html']]
),
new TwigFunction(
'get_div_for_slider_effect',
'PhpMyAdmin\Util::getDivForSliderEffect',
['is_safe' => ['html']]
),
new TwigFunction(
'get_docu_link',
'PhpMyAdmin\Util::getDocuLink',
@@ -1,4 +1,8 @@
{{ get_div_for_slider_effect('query_div', 'Query window'|trans, 'open') }}
{% include 'div_for_slider_effect.twig' with {
'id': 'query_div',
'message': 'Query window'|trans,
'initial_sliders_state': 'open',
} only %}
<form action="" id="query_form">
<input type="hidden" id="db_name" value="{{ db }}">
<fieldset>
@@ -7,7 +7,11 @@
'display_options_form': 1
}) }}
{{ get_div_for_slider_effect('', 'Options'|trans) }}
{% include 'div_for_slider_effect.twig' with {
'id': '',
'message': 'Options'|trans,
'initial_sliders_state': default_sliders_state
} only %}
<fieldset>
<div class="formelement">
{# pftext means "partial or full texts" (done to reduce line lengths #}
@@ -39,7 +39,11 @@
{{ index.generateIndexChoiceSelector(create_edit_table)|raw }}
</div>
{{ get_div_for_slider_effect('indexoptions', 'Advanced Options'|trans) }}
{% include 'div_for_slider_effect.twig' with {
'id': 'indexoptions',
'message': 'Advanced Options'|trans,
'initial_sliders_state': default_sliders_state
} only %}
<div>
<div class="label">
@@ -99,7 +99,11 @@
{% if cfg_relation['relwork'] %}
{% if is_foreign_key_supported(tbl_storage_engine) %}
{{ get_div_for_slider_effect('ir_div', 'Internal relationships'|trans) }}
{% include 'div_for_slider_effect.twig' with {
'id': 'ir_div',
'message': 'Internal relationships'|trans,
'initial_sliders_state': default_sliders_state
} only %}
{% endif %}
<fieldset>
@@ -94,7 +94,11 @@
<div id="gis_editor"></div>
<div id="popup_background"></div>
</fieldset>
{{ get_div_for_slider_effect('searchoptions', 'Options'|trans) }}
{% include 'div_for_slider_effect.twig' with {
'id': 'searchoptions',
'message': 'Options'|trans,
'initial_sliders_state': default_sliders_state
} only %}
{# Displays columns select list for selecting distinct columns in the search #}
<fieldset id="fieldset_select_fields">
@@ -467,7 +467,12 @@
{% set action_icons = action_icons|merge({'DROP': get_icon('b_drop', 'Drop'|trans)}) %}
{% endif %}
{{ get_div_for_slider_effect('partitions', 'Partitions'|trans) }}
{# open Slider Effect div #}
{% include 'div_for_slider_effect.twig' with {
'id': 'partitions-2',
'message': 'Partitions'|trans,
'initial_sliders_state': default_sliders_state
} only %}
{% set remove_sql = 'ALTER TABLE ' ~ backquote(table) ~ ' REMOVE PARTITIONING' %}
{% set remove_url = 'sql.php' ~ url_query ~ '&sql_query=' ~ remove_sql|url_encode %}

0 comments on commit fc9ccff

Please sign in to comment.