The branch, master has been updated via 351915f066a7d3db6b37b9cdcd2c59779f815917 (commit) from c52a7d8c7b569281055daec7b037b5857d18d916 (commit)

- Log ----------------------------------------------------------------- commit 351915f066a7d3db6b37b9cdcd2c59779f815917 Author: Marc Delisle marc@infomarc.info Date: Thu Mar 17 10:30:05 2011 -0400

Deactivated custom color feature for 3.4.0-rc1

-----------------------------------------------------------------------

Summary of changes: main.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/main.php b/main.php index 5f18ba8..431f65b 100644 --- a/main.php +++ b/main.php @@ -12,7 +12,7 @@ define('PMA_COLORPICKER', true); require_once './libraries/common.inc.php';

$GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js'; -$GLOBALS['js_include'][] = 'main_custom_color.js'; +//$GLOBALS['js_include'][] = 'main_custom_color.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';

@@ -137,6 +137,8 @@ if ($GLOBALS['cfg']['ThemeManager']) { echo '</li>';

// see js/main_custom_color.js + /* + * deactivated for 3.4.0-rc1 echo '<li id="li_custom_color" class="hide">'; echo __('Background color') . ': '; echo '<input type="submit" name="custom_color_choose" value="' . __('Choose...') . '" />'; @@ -146,6 +148,7 @@ if ($GLOBALS['cfg']['ThemeManager']) { echo '<input type="submit" name="custom_color_reset" value="' . __('Reset') . '" />'; echo '</form>'; echo '</li>'; + */ } echo '<li id="li_select_fontsize">'; echo PMA_Config::getFontsizeForm();

hooks/post-receive