gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove id from display options slider

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2014-11-27 17:19:53 +05:30
parent ff393b207e
commit 201b744650
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/DisplayResults.class.php
View File

@ -1624,7 +1624,7 @@ class PMA_DisplayResults
$options_html .= PMA_URL_getHiddenInputs($url_params)
. '<br />'
. PMA_Util::getDivForSliderEffect(
'displayoptions', __('Options')
'', __('Options')
)
. '<fieldset>';

11
libraries/Util.class.php
View File

@ -2722,10 +2722,10 @@ class PMA_Util
* @return string html div element
*
*/
public static function getDivForSliderEffect($id, $message)
public static function getDivForSliderEffect($id = '', $message = '')
{
if ($GLOBALS['cfg']['InitialSlidersState'] == 'disabled') {
return '<div id="' . $id . '">';
return '<div' . ($id ? ' id="' . $id . '"' : '') . '>';
}
/**
* Bad hack on the next line. document.write() conflicts with jQuery,
@ -2736,11 +2736,14 @@ class PMA_Util
* append to
*/
return '<div id="' . $id . '"'
return '<div'
. ($id ? ' id="' . $id . '"' : '')
. (($GLOBALS['cfg']['InitialSlidersState'] == 'closed')
? ' style="display: none; overflow:auto;"'
: '')
. ' class="pma_auto_slider" title="' . htmlspecialchars($message) . '">';
. ' class="pma_auto_slider"'
. ($message ? ' title="' . htmlspecialchars($message) . '"' : '')
. '>';
}
/**