Merge remote branch 'origin/master'
This commit is contained in:
2
main.php
2
main.php
@@ -132,7 +132,7 @@ if ($GLOBALS['cfg']['ThemeManager']) {
|
|||||||
|
|
||||||
// see js/main_custom_color.js
|
// see js/main_custom_color.js
|
||||||
echo '<li id="li_custom_color" class="hide">';
|
echo '<li id="li_custom_color" class="hide">';
|
||||||
echo PMA_escapeJsString(__('Background color')) . ': ';
|
echo __('Background color') . ': ';
|
||||||
echo '<input type="submit" name="custom_color_choose" value="' . __('Choose...') . '" />';
|
echo '<input type="submit" name="custom_color_choose" value="' . __('Choose...') . '" />';
|
||||||
echo '<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">';
|
echo '<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">';
|
||||||
echo PMA_generate_common_hidden_inputs();
|
echo PMA_generate_common_hidden_inputs();
|
||||||
|
Reference in New Issue
Block a user