- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin themes branch, master, updated. darkblue_orange-2.9-7-g288ae8d
by Marc Delisle 24 Apr '11

24 Apr '11

The branch, master has been updated via 288ae8dc8c25c9262af6b241433b69ca10d3608b (commit) from f460c2c776b972ba6df53407225c5a689a3eaee4 (commit) - Log ----------------------------------------------------------------- commit 288ae8dc8c25c9262af6b241433b69ca10d3608b Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 24 09:10:32 2011 -0400 New classes for table/db operations ----------------------------------------------------------------------- Summary of changes: darkblue_orange/css/theme_right.css.php | 17 +++-------------- graphite/css/theme_right.css.php | 21 +++------------------ toba/css/theme_right.css.php | 21 +++------------------ 3 files changed, 9 insertions(+), 50 deletions(-) diff --git a/darkblue_orange/css/theme_right.css.php b/darkblue_orange/css/theme_right.css.php index f0a2d92..637b063 100644 --- a/darkblue_orange/css/theme_right.css.php +++ b/darkblue_orange/css/theme_right.css.php @@ -1296,25 +1296,14 @@ li#li_user_preferences { float: <?php echo $left; ?>; } -#div_table_order { +.operations_half_width { min-width: 48%; float: <?php echo $left; ?>; } -#div_table_rename { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_copy, #div_partition_maintenance, #div_referential_integrity, #div_table_removal, #div_table_maintenance { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_options { +.operations_full_width { + width: 100%; clear: both; - min-width: 48%; - float: <?php echo $left; ?>; } #qbe_div_table_list { diff --git a/graphite/css/theme_right.css.php b/graphite/css/theme_right.css.php index 126aa85..80bb6a7 100644 --- a/graphite/css/theme_right.css.php +++ b/graphite/css/theme_right.css.php @@ -1050,29 +1050,14 @@ li#li_select_fontsize { float: <?php echo $left; ?>; } -#div_table_order, -#div_table_rename { +.operations_half_width { min-width: 48%; float: <?php echo $left; ?>; } -#div_table_order { - clear: left; -} - -#div_table_copy, -#div_partition_maintenance, -#div_referential_integrity, -#div_table_removal, -#div_table_maintenance { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_options { +.operations_full_width { + width: 100%; clear: both; - min-width: 48%; - float: <?php echo $left; ?>; } #qbe_div_table_list { diff --git a/toba/css/theme_right.css.php b/toba/css/theme_right.css.php index 41ead38..b929b82 100644 --- a/toba/css/theme_right.css.php +++ b/toba/css/theme_right.css.php @@ -1255,29 +1255,14 @@ li#li_user_preferences { float: <?php echo $left; ?>; } -#div_table_order { +.operations_half_width { min-width: 48%; float: <?php echo $left; ?>; } -#div_table_rename { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_copy, -#div_partition_maintenance, -#div_referential_integrity, -#div_table_removal, -#div_table_maintenance { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_options { +.operations_full_width { + width: 100%; clear: both; - min-width: 48%; - float: <?php echo $left; ?>; } #qbe_div_table_list { hooks/post-receive -- phpMyAdmin themes

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1146-g22f9ac7
by Marc Delisle 24 Apr '11

24 Apr '11

The branch, master has been updated via 22f9ac76daceb370f468d6720462eb0e61903cf5 (commit) via 8f16bfbc531b654fd61a4b8c6ee78f2f491b6c00 (commit) from 5de751bd99285cdbcb2212ed03dff0b67155e9db (commit) - Log ----------------------------------------------------------------- commit 22f9ac76daceb370f468d6720462eb0e61903cf5 Merge: 8f16bfbc531b654fd61a4b8c6ee78f2f491b6c00 5de751bd99285cdbcb2212ed03dff0b67155e9db Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 24 08:58:25 2011 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 8f16bfbc531b654fd61a4b8c6ee78f2f491b6c00 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 24 08:56:54 2011 -0400 Move common code into a function ----------------------------------------------------------------------- Summary of changes: js/db_operations.js | 13 +++---------- js/db_search.js | 5 +---- js/functions.js | 29 ++++++++++++++++------------- js/sql.js | 4 +--- js/tbl_change.js | 4 +--- js/tbl_select.js | 5 +---- 6 files changed, 23 insertions(+), 37 deletions(-) diff --git a/js/db_operations.js b/js/db_operations.js index 5169b55..b053694 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -34,10 +34,7 @@ $(document).ready(function() { var question = 'CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db; - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } - + PMA_prepareForAjaxRequest($form); /** * @var button_options Object containing options for jQueryUI dialog buttons */ @@ -95,9 +92,7 @@ $(document).ready(function() { var $form = $(this); - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($form); $.get($form.attr('action'), $form.serialize(), function(data) { // use messages that stay on screen @@ -135,9 +130,7 @@ $(document).ready(function() { var $form = $(this); - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($form); PMA_ajaxShowMessage(PMA_messages['strChangingCharset']); diff --git a/js/db_search.js b/js/db_search.js index 73bea25..79c444e 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -142,10 +142,7 @@ $(document).ready(function() { // jQuery object to reuse $form = $(this); - // add this hidden field just once - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($form); $.post($form.attr('action'), $form.serialize() + "&submit_search=" + $("#buttonGo").val(), function(response) { if (typeof response == 'string') { diff --git a/js/functions.js b/js/functions.js index 1016b2f..6894e15 100644 --- a/js/functions.js +++ b/js/functions.js @@ -21,6 +21,18 @@ var only_once_elements = new Array(); var ajax_message_init = false; /** + * Add a hidden field to the form to indicate that this will be an + * Ajax request (only if this hidden field does not exist) + * + * @param object the form + */ +function PMA_prepareForAjaxRequest($form) { + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } +} + +/** * Generate a new password and copy it to the password input areas * * @param object the form that holds the password fields @@ -1403,9 +1415,7 @@ $(document).ready(function() { button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} var $msgbox = PMA_ajaxShowMessage(); - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($form); $.get($form.attr('action'), $form.serialize(), function(data) { //in the case of an error, show the error message returned. @@ -1467,9 +1477,7 @@ $(document).ready(function() { // OK, form passed validation step if ($form.hasClass('ajax')) { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($form); //User wants to submit the form $.post($form.attr('action'), $form.serialize() + "&do_save_data=" + $(this).val(), function(data) { if(data.success == true) { @@ -1561,9 +1569,7 @@ $(document).ready(function() { var $form = $("#create_table_form"); var $msgbox = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($form); //User wants to add more fields to the table $.post($form.attr('action'), $form.serialize() + "&submit_num_fields=" + $(this).val(), function(data) { @@ -1670,10 +1676,7 @@ $(document).ready(function() { $form = $(this); PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($form); $.post($form.attr('action'), $form.serialize(), function(data) { if(data.success == true) { diff --git a/js/sql.js b/js/sql.js index 8a97eec..77717a7 100644 --- a/js/sql.js +++ b/js/sql.js @@ -254,9 +254,7 @@ $(document).ready(function() { $form = $(this); var $msgbox = PMA_ajaxShowMessage(); - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($form); $.post($(this).attr('action'), $(this).serialize() , function(data) { if(data.success == true) { diff --git a/js/tbl_change.js b/js/tbl_change.js index e5b800f..2d33884 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -283,9 +283,7 @@ $(document).ready(function() { event.preventDefault(); PMA_ajaxShowMessage(); - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($form); $.post($form.attr('action'), $form.serialize(), function(data) { if (typeof data.success != 'undefined') { diff --git a/js/tbl_select.js b/js/tbl_select.js index 88aceff..8115245 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -60,10 +60,7 @@ $(document).ready(function() { $("#sqlqueryresults").empty(); var msgbox = PMA_ajaxShowMessage(PMA_messages['strSearching']); - // add this hidden field just once - if (! $search_form.find('input:hidden').is('#ajax_request_hidden')) { - $search_form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + PMA_prepareForAjaxRequest($search_form); $.post($search_form.attr('action'), $search_form.serialize(), function(response) { if (typeof response == 'string') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1144-g5de751b
by Madhura Jayaratne 24 Apr '11

24 Apr '11

The branch, master has been updated via 5de751bd99285cdbcb2212ed03dff0b67155e9db (commit) via be14efaa75e99b821f862110a92e56c6b71d0c99 (commit) from 24e05e1cb2ae896dc9f667e3de71b09a9c7b7378 (commit) - Log ----------------------------------------------------------------- commit 5de751bd99285cdbcb2212ed03dff0b67155e9db Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Apr 24 18:15:03 2011 +0530 This should also be styled with class="operations_half_width" commit be14efaa75e99b821f862110a92e56c6b71d0c99 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Apr 24 16:33:24 2011 +0530 Database operations tab made more compact. Table operations altered to use classes for styling. ----------------------------------------------------------------------- Summary of changes: db_operations.php | 25 +++++++++++++++++-------- tbl_operations.php | 18 +++++++++--------- themes/original/css/theme_right.css.php | 21 +++------------------ themes/pmahomme/css/theme_right.css.php | 25 +++++-------------------- view_operations.php | 2 +- 5 files changed, 35 insertions(+), 56 deletions(-) diff --git a/db_operations.php b/db_operations.php index 46591bc..e49ddcb 100644 --- a/db_operations.php +++ b/db_operations.php @@ -349,14 +349,17 @@ if ($db == 'information_schema') { } if (!$is_information_schema) { - - require './libraries/display_create_table.lib.php'; - + ?> + <div class="operations_half_width"> + <?php require './libraries/display_create_table.lib.php'; ?> + </div> + <?php if ($cfgRelation['commwork']) { /** * database comment */ ?> + <div class="operations_half_width"> <form method="post" action="db_operations.php"> <?php echo PMA_generate_common_hidden_inputs($db); ?> <fieldset> @@ -371,6 +374,7 @@ if (!$is_information_schema) { <input type="submit" value="<?php echo __('Go'); ?>" /> </fieldset> </form> + </div> <?php } /** @@ -378,6 +382,7 @@ if (!$is_information_schema) { */ if ($db != 'mysql') { ?> + <div class="operations_half_width"> <form id="rename_db_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : ''); ?>method="post" action="db_operations.php" onsubmit="return emptyFormElements(this, 'newname')"> <?php @@ -416,6 +421,7 @@ if ($db != 'mysql') { <input id="rename_db_input" type="submit" value="<?php echo __('Go'); ?>" /> </fieldset> </form> + </div> <?php } // end if @@ -424,6 +430,7 @@ if ($db != 'mysql') { // Don't allow to easily drop mysql database, RFE #1327514. if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_information_schema && ($db != 'mysql')) { ?> +<div class="operations_half_width"> <fieldset class="caution"> <legend><?php if ($cfg['PropertiesIconic']) { @@ -452,12 +459,14 @@ echo __('Remove database'); </li> </ul> </fieldset> +</div> <?php } ?> <?php /** * Copy database */ ?> + <div class="operations_half_width clearfloat"> <form id="copy_db_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : ''); ?>method="post" action="db_operations.php" onsubmit="return emptyFormElements(this, 'newname')"> <?php @@ -522,13 +531,13 @@ echo __('Remove database'); <input type="submit" name="submit_copy" value="<?php echo __('Go'); ?>" /> </fieldset> </form> - + </div> <?php /** * Change database charset */ - echo '<form id="change_db_charset_form" '; + echo '<div class="operations_half_width"><form id="change_db_charset_form" '; if ($GLOBALS['cfg']['AjaxEnable']) { echo ' class="ajax" '; } @@ -549,7 +558,7 @@ echo __('Remove database'); . ' <input type="submit" name="submitcollation"' . ' value="' . __('Go') . '" />' . "\n" . '</fieldset>' . "\n" - . '</form>' . "\n"; + . '</form></div>' . "\n"; if ($num_tables > 0 && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { @@ -581,12 +590,12 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> /* * Export Relational Schema View */ - echo '<fieldset><a href="schema_edit.php?' . $url_query . '">'; + echo '<div class="operations_full_width"><fieldset><a href="schema_edit.php?' . $url_query . '">'; if ($cfg['PropertiesIconic']) { echo '<img class="icon" src="' . $pmaThemeImage . 'b_edit.png"' .' alt="" width="16" height="16" />'; } - echo __('Edit or export relational schema') . '</a></fieldset>'; + echo __('Edit or export relational schema') . '</a></fieldset></div>'; } // end if /** diff --git a/tbl_operations.php b/tbl_operations.php index 3c8b5dd..04f1165 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -253,7 +253,7 @@ unset($local_query); */ ?>  -<div id="div_table_order"> +<div class="operations_half_width"> <form method="post" action="tbl_operations.php"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <fieldset id="fieldset_table_order"> @@ -279,7 +279,7 @@ unset($columns); </div>  -<div id="div_table_rename"> +<div class="operations_half_width"> <form method="post" action="tbl_operations.php" onsubmit="return emptyFormElements(this, 'new_name')"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> @@ -339,7 +339,7 @@ if (strstr($show_comment, '; InnoDB free') === false) { ?>  -<div id="div_table_options"> +<div class="operations_half_width clearfloat"> <form method="post" action="tbl_operations.php"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <input type="hidden" name="reload" value="1" /> @@ -518,7 +518,7 @@ if (isset($possible_row_formats[$tbl_type])) { </div>  -<div id="div_table_copy"> +<div class="operations_half_width"> <form method="post" action="tbl_operations.php" onsubmit="return emptyFormElements(this, 'new_name')"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> @@ -581,7 +581,7 @@ if (isset($possible_row_formats[$tbl_type])) { <br class="clearfloat"/> -<div id="div_table_maintenance"> +<div class="operations_half_width"> <fieldset> <legend><?php echo __('Table maintenance'); ?></legend> @@ -668,7 +668,7 @@ $this_url_params = array_merge($url_params, </fieldset> </div> <?php if (! (isset($db_is_information_schema) && $db_is_information_schema)) { ?> -<div id="div_table_removal"> +<div class="operations_half_width"> <fieldset class="caution"> <legend><?php echo __('Delete data or table'); ?></legend> @@ -699,7 +699,7 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) { 'reload' => '1', 'purge' => '1', 'message_to_show' => sprintf(($tbl_is_view ? __('View %s has been dropped') : __('Table %s has been dropped')), htmlspecialchars($table)), - // table name is needed to avoid running + // table name is needed to avoid running // PMA_relationsCleanupDatabase() on the whole db later 'table' => $GLOBALS['table'], )); @@ -722,7 +722,7 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) { // show the Partition maintenance section only if we detect a partition if (! is_null($partition_names[0])) { ?> -<div id="div_partition_maintenance"> +<div class="operations_half_width"> <form method="post" action="tbl_operations.php"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <fieldset> @@ -777,7 +777,7 @@ if ($cfgRelation['relwork'] && ! $is_innodb) { if ($foreign) { ?>  -<div id="div_referential_integrity"> +<div class="operations_half_width"> <fieldset> <legend><?php echo __('Check referential integrity:'); ?></legend> <ul> diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 9f944e8..27d931b 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1251,29 +1251,14 @@ li#li_user_preferences { float: <?php echo $left; ?>; } -#div_table_order { +.operations_half_width { min-width: 48%; float: <?php echo $left; ?>; } -#div_table_rename { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_copy, -#div_partition_maintenance, -#div_referential_integrity, -#div_table_removal, -#div_table_maintenance { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_options { +.operations_full_width { + width: 100%; clear: both; - min-width: 48%; - float: <?php echo $left; ?>; } #qbe_div_table_list { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 2107354..4d18832 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -599,11 +599,11 @@ div.footnotes { <?php } else { ?> padding: 0.3em; <?php } ?> - + -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; - + -moz-box-shadow: 0 1px 1px #fff inset; -webkit-box-shadow: 0 1px 1px #fff inset; box-shadow: 0 1px 1px #fff inset; @@ -1546,29 +1546,14 @@ li#li_user_preferences { float: <?php echo $left; ?>; } -#div_table_order { +.operations_half_width { min-width: 48%; float: <?php echo $left; ?>; } -#div_table_rename { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_copy, -#div_partition_maintenance, -#div_referential_integrity, -#div_table_removal, -#div_table_maintenance { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_options { +.operations_full_width { + width: 100%; clear: both; - min-width: 48%; - float: <?php echo $left; ?>; } #qbe_div_table_list { diff --git a/view_operations.php b/view_operations.php index 2149e15..55d1c74 100644 --- a/view_operations.php +++ b/view_operations.php @@ -79,7 +79,7 @@ $url_params['back'] = 'view_operations.php'; */ ?>  -<div id="div_table_options"> +<div class="operations_half_width"> <form method="post" action="view_operations.php"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <input type="hidden" name="reload" value="1" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1142-g24e05e1
by Marc Delisle 24 Apr '11

24 Apr '11

The branch, master has been updated via 24e05e1cb2ae896dc9f667e3de71b09a9c7b7378 (commit) from 947924b4b53248ab1bc807f61008dc1596e44269 (commit) - Log ----------------------------------------------------------------- commit 24e05e1cb2ae896dc9f667e3de71b09a9c7b7378 Author: aris_feryanto <aris_feryanto(a)yahoo.com> Date: Sun Apr 24 06:51:47 2011 -0400 Patch #3292396 Insert Ajax form generates wrong query ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 1a94714..e5b800f 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -358,7 +358,7 @@ $(document).ready(function() { $last_row .clone() .insertBefore("#actions_panel") - .find('input[name*=multi_edit],select[name*=multi_edit]') + .find('input[name*=multi_edit],select[name*=multi_edit],textarea[name*=multi_edit]') .each(function() { var $this_element = $(this); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1141-g947924b
by Marc Delisle 24 Apr '11

24 Apr '11

The branch, master has been updated via 947924b4b53248ab1bc807f61008dc1596e44269 (commit) from b0897692413e047b469f868c62ce0daf477d6615 (commit) - Log ----------------------------------------------------------------- commit 947924b4b53248ab1bc807f61008dc1596e44269 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 24 06:22:25 2011 -0400 Unused and empty ----------------------------------------------------------------------- Summary of changes: js/tbl_operations.js | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) delete mode 100644 js/tbl_operations.js diff --git a/js/tbl_operations.js b/js/tbl_operations.js deleted file mode 100644 index 6f5aa97..0000000 --- a/js/tbl_operations.js +++ /dev/null @@ -1,20 +0,0 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * function used in server privilege pages - * - */ - -/** - * Add all AJAX scripts for tbl_operations.php page here. - * - * Alter table order - #div_table_order form - * Move Table - #div_table_rename form - * Table Options - #div_table_options form - * Copy Table - #div_table_copy form - * Table Maintenance - #div_table_maintenance (need to id each anchor) - * Check - * Repair - * Analyze - * Flush - * Optimize - */ \ No newline at end of file hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1140-gb089769
by Piotr Przybylski 22 Apr '11

22 Apr '11

The branch, master has been updated via b0897692413e047b469f868c62ce0daf477d6615 (commit) via 21ac63902db10f40de45dfc642564ba113e24a9f (commit) via 5610cd4651531b667619e420f5329f8090bd2393 (commit) from 467fabf5b0af395dd8f38be8b0610033ca434d9d (commit) - Log ----------------------------------------------------------------- commit b0897692413e047b469f868c62ce0daf477d6615 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Apr 22 21:24:34 2011 +0200 Added SVG gradient generator instead of using one file for each gradient commit 21ac63902db10f40de45dfc642564ba113e24a9f Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Apr 22 20:22:45 2011 +0200 Make PMA_ieFilter simpler and more generic commit 5610cd4651531b667619e420f5329f8090bd2393 Author: unknown <Aris@.(none)> Date: Thu Apr 21 23:57:49 2011 +0700 IE9 theme compatibility - gradient button ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_right.css.php | 11 +++++- themes/pmahomme/css/theme_left.css.php | 15 ++++++- themes/pmahomme/css/theme_right.css.php | 67 ++++++++++++++++++++----------- themes/svg_gradient.php | 25 +++++++++++ 4 files changed, 92 insertions(+), 26 deletions(-) create mode 100644 themes/svg_gradient.php diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 778b332..9f944e8 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -11,6 +11,13 @@ if (!defined('PMA_MINIMUM_COMMON')) { exit(); } + +function PMA_ieFilter($start_color, $end_color) +{ + return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 + ? 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' . $start_color . '", endColorstr="' . $end_color . '");' + : ''; +} ?> /******************************************************************************/ /* general tags */ @@ -1439,10 +1446,12 @@ table#serverconnection_trg_local { -moz-border-radius: 11px; -webkit-border-radius: 11px; border-radius: 11px; + background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); + background-size: 100% 100%; background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); background: -moz-linear-gradient(top, #ffffff, #cccccc); background: -o-linear-gradient(top, #ffffff, #cccccc); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc'); + <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> border: 1px solid #444444; cursor: pointer; } diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index cd37a5a..467e70a 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -11,6 +11,13 @@ if (!defined('PMA_MINIMUM_COMMON')) { exit(); } + +function PMA_ieFilter($start_color, $end_color) +{ + return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 + ? 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' . $start_color . '", endColorstr="' . $end_color . '");' + : ''; +} ?> /******************************************************************************/ /* general tags */ @@ -199,10 +206,12 @@ div#left_tableList li { #newtable a { display: block; padding: 1px; + background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); + background-size: 100% 100%; background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); background: -moz-linear-gradient(top, #ffffff, #cccccc); background: -o-linear-gradient(top, #ffffff, #cccccc); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc'); + <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> border: 1px solid #aaa; -moz-border-radius: 20px; -webkit-border-radius: 20px; @@ -214,10 +223,12 @@ div#left_tableList li { } #newtable a:hover { + background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd); + background-size: 100% 100%; background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)) !important; background: -moz-linear-gradient(top, #cccccc, #dddddd) !important; background: -o-linear-gradient(top, #cccccc, #dddddd) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#dddddd') !important; + <?php echo PMA_ieFilter('#cccccc', '#dddddd'); ?> } #newtable li a:hover { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 9795b30..2107354 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -11,6 +11,13 @@ if (!defined('PMA_MINIMUM_COMMON')) { exit(); } + +function PMA_ieFilter($start_color, $end_color) +{ + return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 + ? 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' . $start_color . '", endColorstr="' . $end_color . '");' + : ''; +} ?> /******************************************************************************/ /* general tags */ @@ -98,10 +105,12 @@ a:hover { -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; + background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); + background-size: 100% 100%; background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); background: -moz-linear-gradient(top, #ffffff, #cccccc); background: -o-linear-gradient(top, #ffffff, #cccccc); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc'); + <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> } dfn { @@ -117,10 +126,12 @@ th { font-weight: bold; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>; background: #f3f3f3; + background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); + background-size: 100% 100%; background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); background: -moz-linear-gradient(top, #ffffff, #cccccc); background: -o-linear-gradient(top, #ffffff, #cccccc); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc'); + <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> } a img { @@ -189,17 +200,21 @@ input[type=submit]{ text-shadow: 0px 1px 0px #fff; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); + background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); + background-size: 100% 100%; + background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); + background: -moz-linear-gradient(top, #ffffff, #cccccc); background: -o-linear-gradient(top, #ffffff, #cccccc); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc'); + <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> } input[type=submit]:hover{ position: relative; - background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); - background: -moz-linear-gradient(top, #cccccc, #dddddd); + background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd); + background-size: 100% 100%; + background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); + background: -moz-linear-gradient(top, #cccccc, #dddddd); background: -o-linear-gradient(top, #cccccc, #dddddd); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#dddddd'); + <?php echo PMA_ieFilter('#cccccc', '#dddddd'); ?> cursor:pointer; } @@ -297,7 +312,7 @@ select[multiple] { background: -webkit-linear-gradient(#fff, #f1f1f1 80%, #fbfbfb); background: -moz-linear-gradient(#fff, #f1f1f1 80%, #fbfbfb); /* none for Opera 11.10 as <option>s always have solid white background */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f2f2f2'); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffffff", endColorstr="#f2f2f2"); } /******************************************************************************/ @@ -351,14 +366,12 @@ button.mult_submit { table tr.odd th, .odd { background: #fff; - filter: none; } /* even items 2,4,6,8,... */ table tr.even th, .even { background: #f3f3f3; - filter: none; } /* odd table rows 1,3,5,7,... */ @@ -1321,16 +1334,20 @@ div#querywindowcontainer fieldset { -moz-box-shadow: 1px 1px 2px rgba(0,0,0,.5); text-shadow: #fff 0px 1px 0px; */ - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); + background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); + background-size: 100% 100%; + background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); + background: -moz-linear-gradient(top, #ffffff, #cccccc); background: -o-linear-gradient(top, #ffffff, #cccccc); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc'); + <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> } #sectionlinks a:hover, #statuslinks a:hover{ - background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); - background: -moz-linear-gradient(top, #cccccc, #dddddd); + background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd); + background-size: 100% 100%; + background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); + background: -moz-linear-gradient(top, #cccccc, #dddddd); background: -o-linear-gradient(top, #cccccc, #dddddd); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#dddddd'); + <?php echo PMA_ieFilter('#cccccc', '#dddddd'); ?> } div#sqlquerycontainer { @@ -1760,17 +1777,21 @@ table#serverconnection_trg_local { text-shadow: 0px 1px 0px #fff; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); + background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); + background-size: 100% 100%; + background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); + background: -moz-linear-gradient(top, #ffffff, #cccccc); background: -o-linear-gradient(top, #ffffff, #cccccc); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc'); + <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> cursor: pointer; } #buttonGo:hover{ - background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); - background: -moz-linear-gradient(top, #cccccc, #dddddd); + background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd); + background-size: 100% 100%; + background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); + background: -moz-linear-gradient(top, #cccccc, #dddddd); background: -o-linear-gradient(top, #cccccc, #dddddd); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#dddddd'); + <?php echo PMA_ieFilter('#cccccc', '#dddddd'); ?> } .format_specific_options h3 { diff --git a/themes/svg_gradient.php b/themes/svg_gradient.php new file mode 100644 index 0000000..a5d89c6 --- /dev/null +++ b/themes/svg_gradient.php @@ -0,0 +1,25 @@ +<?php +header('Content-Type: image/svg+xml'); +header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT'); + +function get_color($get_name, $default) +{ + // get color from GET args, only alphanumeric chcracters + $opts = array('options' => array('regexp' => '/^[a-z0-9]+$/i')); + $color = filter_input(INPUT_GET, $get_name, FILTER_VALIDATE_REGEXP, $opts); + if (preg_match('/^[a-f0-9]{6}$/', $color)) { + return '#' . $color; + } + return $color ? $color : $default; +} +?> +<?php echo '<?xml version="1.0" ?>' ?> +<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" version="1.0" width="100%" height="100%"> + <defs> + <linearGradient id="linear-gradient" x1="0%" y1="0%" x2="0%" y2="100%"> + <stop offset="0%" stop-color="<?php echo get_color('from', 'white') ?>" stop-opacity="1" /> + <stop offset="100%" stop-color="<?php echo get_color('to', 'black') ?>" stop-opacity="1" /> + </linearGradient> + </defs> + <rect width="100%" height="100%" style="fill:url(#linear-gradient);" /> +</svg> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1137-g467fabf
by Madhura Jayaratne 22 Apr '11

22 Apr '11

The branch, master has been updated via 467fabf5b0af395dd8f38be8b0610033ca434d9d (commit) from df68f8de7636d20b7ddfc3d7bb32c4cfd56135ae (commit) - Log ----------------------------------------------------------------- commit 467fabf5b0af395dd8f38be8b0610033ca434d9d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Apr 22 17:26:58 2011 +0530 Bug #3291409 - Inline edit introduces spaces for empty fields ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 70b9710..78b4bb6 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -992,7 +992,7 @@ function PMA_buildNullDisplay($class, $condition_field) { */ function PMA_buildEmptyDisplay($class, $condition_field, $meta, $align = '') { $nowrap = ' nowrap'; - return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, $nowrap) . '"> </td>'; + return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, $nowrap) . '"></td>'; } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1136-gdf68f8d
by Madhura Jayaratne 22 Apr '11

22 Apr '11

The branch, master has been updated via df68f8de7636d20b7ddfc3d7bb32c4cfd56135ae (commit) from b2d9121f189f30a5dc53eb3278cad9ba7dbf72ba (commit) - Log ----------------------------------------------------------------- commit df68f8de7636d20b7ddfc3d7bb32c4cfd56135ae Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Apr 22 17:11:19 2011 +0530 Bug #3291397 Empty field does not honor field type ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 70 +++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 26 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d8e29e1..70b9710 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -990,11 +990,49 @@ function PMA_buildNullDisplay($class, $condition_field) { * * @return string the td */ -function PMA_buildEmptyDisplay($class, $condition_field, $align = '') { - return '<td ' . $align . ' class="' . $class . ' nowrap' . ($condition_field ? ' condition' : '') . '"> </td>'; +function PMA_buildEmptyDisplay($class, $condition_field, $meta, $align = '') { + $nowrap = ' nowrap'; + return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, $nowrap) . '"> </td>'; } /** + * Adds the relavant classes. + * + * @param string $class + * @param string $condition_field + * @param object $meta the meta-information about this field + * @param string $nowrap + * @param bool $is_field_truncated + * @param string $transform_function + * @param string $default_function + * + * @return string the list of classes + */ +function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_truncated = false, $transform_function = '', $default_function = '') { + // Define classes to be added to this data field based on the type of data + $enum_class = ''; + if(strpos($meta->flags, 'enum') !== false) { + $enum_class = ' enum'; + } + + $set_class = ''; + if(strpos($meta->flags, 'set') !== false) { + $set_class = ' set'; + } + + $mime_type_class = ''; + if(isset($meta->mimetype)) { + $mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype); + } + + $result = $class . ($condition_field ? ' condition' : '') . $nowrap + . ' ' . ($is_field_truncated ? ' truncated' : '') + . ($transform_function != $default_function ? ' transformed' : '') + . $enum_class . $set_class . $mime_type_class; + + return $result; +} +/** * Displays the body of the results table * * @uses $_SESSION['tmp_user_values']['disp_direction'] @@ -1299,7 +1337,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['data'][$row_no][$i] = '<td align="right"' . PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated); } else { - $vertical_display['data'][$row_no][$i] = PMA_buildEmptyDisplay($class, $condition_field, 'align="right"'); + $vertical_display['data'][$row_no][$i] = PMA_buildEmptyDisplay($class, $condition_field, $meta, 'align="right"'); } // b l o b @@ -1343,7 +1381,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['data'][$row_no][$i] = PMA_buildValueDisplay($class, $condition_field, $row[$i]); } else { - $vertical_display['data'][$row_no][$i] = PMA_buildEmptyDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildEmptyDisplay($class, $condition_field, $meta); } } // g e o m e t r y @@ -1403,7 +1441,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated); } else { - $vertical_display['data'][$row_no][$i] = PMA_buildEmptyDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildEmptyDisplay($class, $condition_field, $meta); } } @@ -2396,27 +2434,7 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct */ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $data, $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated ) { - // Define classes to be added to this data field based on the type of data - $enum_class = ''; - if(strpos($meta->flags, 'enum') !== false) { - $enum_class = ' enum'; - } - - $set_class = ''; - if(strpos($meta->flags, 'set') !== false) { - $set_class = ' set'; - } - - $mime_type_class = ''; - if(isset($meta->mimetype)) { - $mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype); - } - - // continue the <td> tag started before calling this function: - $result = ' class="' . $class . ($condition_field ? ' condition' : '') . $nowrap - . ' ' . ($is_field_truncated ? ' truncated' : '') - . ($transform_function != $default_function ? ' transformed' : '') - . $enum_class . $set_class . $mime_type_class . '">'; + $result = ' class="' . PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_truncated, $transform_function, $default_function) . '">'; if (isset($analyzed_sql[0]['select_expr']) && is_array($analyzed_sql[0]['select_expr'])) { foreach ($analyzed_sql[0]['select_expr'] AS $select_expr_position => $select_expr) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin themes branch, master, updated. darkblue_orange-2.9-6-gf460c2c
by Marc Delisle 22 Apr '11

22 Apr '11

The branch, master has been updated via f460c2c776b972ba6df53407225c5a689a3eaee4 (commit) via b354509027c2365b9729c2c2ca5574087d3efb68 (commit) from 8a623e612d27cb6c61ce50fb5aafc090008b4020 (commit) - Log ----------------------------------------------------------------- commit f460c2c776b972ba6df53407225c5a689a3eaee4 Merge: b354509027c2365b9729c2c2ca5574087d3efb68 8a623e612d27cb6c61ce50fb5aafc090008b4020 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Apr 22 07:13:28 2011 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/themes commit b354509027c2365b9729c2c2ca5574087d3efb68 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Apr 22 07:13:02 2011 -0400 Remove custom color references in themes compatible with 3.4 ----------------------------------------------------------------------- Summary of changes: darkblue_orange/css/theme_right.css.php | 4 ++-- graphite/css/theme_left.css.php | 6 +++--- graphite/css/theme_right.css.php | 8 ++------ graphite/img/b_color.png | Bin 747 -> 0 bytes toba/css/theme_left.css.php | 6 +++--- toba/css/theme_right.css.php | 4 ++-- 6 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 graphite/img/b_color.png diff --git a/darkblue_orange/css/theme_right.css.php b/darkblue_orange/css/theme_right.css.php index 837354b..f0a2d92 100644 --- a/darkblue_orange/css/theme_right.css.php +++ b/darkblue_orange/css/theme_right.css.php @@ -30,7 +30,7 @@ body { padding: 0; margin: 0.5em; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>; - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>; } <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?> @@ -1404,7 +1404,7 @@ div.upload_progress_bar_outer div.upload_progress_bar_inner { - background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; width: 0px; height: 12px; margin: 1px; diff --git a/graphite/css/theme_left.css.php b/graphite/css/theme_left.css.php index 3b6a932..033d143 100644 --- a/graphite/css/theme_left.css.php +++ b/graphite/css/theme_left.css.php @@ -24,7 +24,7 @@ body { <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?> font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>; <?php } ?> - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; margin: 0; padding: 0.2em 0.2em 0.2em 0.2em; @@ -71,7 +71,7 @@ select#lightm_db { div#pmalogo { <?php //better echo $GLOBALS['cfg']['logoBGC']; ?> - background-color: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; padding:.3em; } div#pmalogo, @@ -149,7 +149,7 @@ div#left_tableList ul { margin: 0; padding: 0; font-size: 80%; - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; } div#left_tableList ul ul { diff --git a/graphite/css/theme_right.css.php b/graphite/css/theme_right.css.php index 1010837..126aa85 100644 --- a/graphite/css/theme_right.css.php +++ b/graphite/css/theme_right.css.php @@ -29,7 +29,7 @@ body { padding: 0; margin: 0.5em; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>; - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>; } <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?> @@ -997,10 +997,6 @@ li#li_user_preferences { list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_tblops.png); } -li#li_custom_color { - list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_color.png); -} - li#li_select_fontsize { list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_font.png); } @@ -1168,7 +1164,7 @@ div.upload_progress_bar_outer div.upload_progress_bar_inner { - background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; width: 0px; height: 12px; margin: 1px; diff --git a/graphite/img/b_color.png b/graphite/img/b_color.png deleted file mode 100644 index 177ec32..0000000 Binary files a/graphite/img/b_color.png and /dev/null differ diff --git a/toba/css/theme_left.css.php b/toba/css/theme_left.css.php index 1c24d51..4a9adf7 100644 --- a/toba/css/theme_left.css.php +++ b/toba/css/theme_left.css.php @@ -27,7 +27,7 @@ body { <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?> font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>; <?php } ?> - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; margin: 0; padding: 0; @@ -204,7 +204,7 @@ div#left_tableList ul { margin: 0; padding: 0; /*font-size: 80%;*/ - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; } div#left_tableList ul ul { @@ -298,4 +298,4 @@ div#left_tableList ul ul { ul#newtable li { margin-top: 15px; -} \ No newline at end of file +} diff --git a/toba/css/theme_right.css.php b/toba/css/theme_right.css.php index 6b9366d..41ead38 100644 --- a/toba/css/theme_right.css.php +++ b/toba/css/theme_right.css.php @@ -32,7 +32,7 @@ body { margin: 0; color: #333; /*color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;*/ - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>; } <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?> @@ -1370,7 +1370,7 @@ div.upload_progress_bar_outer div.upload_progress_bar_inner { - background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; width: 0px; height: 12px; margin: 1px; hooks/post-receive -- phpMyAdmin themes

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1135-gb2d9121
by Marc Delisle 22 Apr '11

22 Apr '11

The branch, master has been updated via b2d9121f189f30a5dc53eb3278cad9ba7dbf72ba (commit) from 931e8576d24e1ef94234efb1077b608984666ce4 (commit) - Log ----------------------------------------------------------------- commit b2d9121f189f30a5dc53eb3278cad9ba7dbf72ba Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Apr 22 07:00:45 2011 -0400 Remove the custom color picker feature ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/colorpicker/css/colorpicker.css | 161 ------- js/colorpicker/css/layout.css | 218 ---------- js/colorpicker/images/blank.gif | Bin 49 -> 0 bytes js/colorpicker/images/colorpicker_background.png | Bin 1897 -> 0 bytes js/colorpicker/images/colorpicker_hex.png | Bin 532 -> 0 bytes js/colorpicker/images/colorpicker_hsb_b.png | Bin 970 -> 0 bytes js/colorpicker/images/colorpicker_hsb_h.png | Bin 1012 -> 0 bytes js/colorpicker/images/colorpicker_hsb_s.png | Bin 1171 -> 0 bytes js/colorpicker/images/colorpicker_indic.gif | Bin 86 -> 0 bytes js/colorpicker/images/colorpicker_overlay.png | Bin 10355 -> 0 bytes js/colorpicker/images/colorpicker_rgb_b.png | Bin 970 -> 0 bytes js/colorpicker/images/colorpicker_rgb_g.png | Bin 1069 -> 0 bytes js/colorpicker/images/colorpicker_rgb_r.png | Bin 1066 -> 0 bytes js/colorpicker/images/colorpicker_select.gif | Bin 78 -> 0 bytes js/colorpicker/images/colorpicker_submit.png | Bin 984 -> 0 bytes js/colorpicker/images/custom_background.png | Bin 1916 -> 0 bytes js/colorpicker/images/custom_hex.png | Bin 562 -> 0 bytes js/colorpicker/images/custom_hsb_b.png | Bin 1097 -> 0 bytes js/colorpicker/images/custom_hsb_h.png | Bin 970 -> 0 bytes js/colorpicker/images/custom_hsb_s.png | Bin 1168 -> 0 bytes js/colorpicker/images/custom_indic.gif | Bin 86 -> 0 bytes js/colorpicker/images/custom_rgb_b.png | Bin 1008 -> 0 bytes js/colorpicker/images/custom_rgb_g.png | Bin 1069 -> 0 bytes js/colorpicker/images/custom_rgb_r.png | Bin 1018 -> 0 bytes js/colorpicker/images/custom_submit.png | Bin 997 -> 0 bytes js/colorpicker/images/select.png | Bin 506 -> 0 bytes js/colorpicker/images/select2.png | Bin 518 -> 0 bytes js/colorpicker/images/slider.png | Bin 315 -> 0 bytes js/colorpicker/js/colorpicker.js | 484 ---------------------- js/main_custom_color.js | 28 -- libraries/common.inc.php | 5 - libraries/header_meta_style.inc.php | 8 - main.php | 17 - themes/original/css/theme_left.css.php | 6 +- themes/original/css/theme_right.css.php | 4 +- themes/pmahomme/css/theme_right.css.php | 2 +- 37 files changed, 7 insertions(+), 927 deletions(-) delete mode 100644 js/colorpicker/css/colorpicker.css delete mode 100644 js/colorpicker/css/layout.css delete mode 100644 js/colorpicker/images/blank.gif delete mode 100644 js/colorpicker/images/colorpicker_background.png delete mode 100644 js/colorpicker/images/colorpicker_hex.png delete mode 100644 js/colorpicker/images/colorpicker_hsb_b.png delete mode 100644 js/colorpicker/images/colorpicker_hsb_h.png delete mode 100644 js/colorpicker/images/colorpicker_hsb_s.png delete mode 100644 js/colorpicker/images/colorpicker_indic.gif delete mode 100644 js/colorpicker/images/colorpicker_overlay.png delete mode 100644 js/colorpicker/images/colorpicker_rgb_b.png delete mode 100644 js/colorpicker/images/colorpicker_rgb_g.png delete mode 100644 js/colorpicker/images/colorpicker_rgb_r.png delete mode 100644 js/colorpicker/images/colorpicker_select.gif delete mode 100644 js/colorpicker/images/colorpicker_submit.png delete mode 100644 js/colorpicker/images/custom_background.png delete mode 100644 js/colorpicker/images/custom_hex.png delete mode 100644 js/colorpicker/images/custom_hsb_b.png delete mode 100644 js/colorpicker/images/custom_hsb_h.png delete mode 100644 js/colorpicker/images/custom_hsb_s.png delete mode 100644 js/colorpicker/images/custom_indic.gif delete mode 100644 js/colorpicker/images/custom_rgb_b.png delete mode 100644 js/colorpicker/images/custom_rgb_g.png delete mode 100644 js/colorpicker/images/custom_rgb_r.png delete mode 100644 js/colorpicker/images/custom_submit.png delete mode 100644 js/colorpicker/images/select.png delete mode 100644 js/colorpicker/images/select2.png delete mode 100644 js/colorpicker/images/slider.png delete mode 100644 js/colorpicker/js/colorpicker.js delete mode 100644 js/main_custom_color.js diff --git a/ChangeLog b/ChangeLog index a850c2e..3261e05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,6 +153,7 @@ - bug #3168733 [core] Synchronization does not honor AllowArbitraryServer - bug #3134495 [synchronization] Data containing single quotes prevents sync, thanks to jviewer +- Remove the custom color picker feature 3.3.11.0 (not yet released) diff --git a/js/colorpicker/css/colorpicker.css b/js/colorpicker/css/colorpicker.css deleted file mode 100644 index 05b02b4..0000000 --- a/js/colorpicker/css/colorpicker.css +++ /dev/null @@ -1,161 +0,0 @@ -.colorpicker { - width: 356px; - height: 176px; - overflow: hidden; - position: absolute; - background: url(../images/colorpicker_background.png); - font-family: Arial, Helvetica, sans-serif; - display: none; -} -.colorpicker_color { - width: 150px; - height: 150px; - left: 14px; - top: 13px; - position: absolute; - background: #f00; - overflow: hidden; - cursor: crosshair; -} -.colorpicker_color div { - position: absolute; - top: 0; - left: 0; - width: 150px; - height: 150px; - background: url(../images/colorpicker_overlay.png); -} -.colorpicker_color div div { - position: absolute; - top: 0; - left: 0; - width: 11px; - height: 11px; - overflow: hidden; - background: url(../images/colorpicker_select.gif); - margin: -5px 0 0 -5px; -} -.colorpicker_hue { - position: absolute; - top: 13px; - left: 171px; - width: 35px; - height: 150px; - cursor: n-resize; -} -.colorpicker_hue div { - position: absolute; - width: 35px; - height: 9px; - overflow: hidden; - background: url(../images/colorpicker_indic.gif) left top; - margin: -4px 0 0 0; - left: 0px; -} -.colorpicker_new_color { - position: absolute; - width: 60px; - height: 30px; - left: 213px; - top: 13px; - background: #f00; -} -.colorpicker_current_color { - position: absolute; - width: 60px; - height: 30px; - left: 283px; - top: 13px; - background: #f00; -} -.colorpicker input { - background-color: transparent; - border: 1px solid transparent; - position: absolute; - font-size: 10px; - font-family: Arial, Helvetica, sans-serif; - color: #898989; - top: 4px; - right: 11px; - text-align: right; - margin: 0; - padding: 0; - height: 11px; -} -.colorpicker_hex { - position: absolute; - width: 72px; - height: 22px; - background: url(../images/colorpicker_hex.png) top; - left: 212px; - top: 142px; -} -.colorpicker_hex input { - right: 6px; -} -.colorpicker_field { - height: 22px; - width: 62px; - background-position: top; - position: absolute; -} -.colorpicker_field span { - position: absolute; - width: 12px; - height: 22px; - overflow: hidden; - top: 0; - right: 0; - cursor: n-resize; -} -.colorpicker_rgb_r { - background-image: url(../images/colorpicker_rgb_r.png); - top: 52px; - left: 212px; -} -.colorpicker_rgb_g { - background-image: url(../images/colorpicker_rgb_g.png); - top: 82px; - left: 212px; -} -.colorpicker_rgb_b { - background-image: url(../images/colorpicker_rgb_b.png); - top: 112px; - left: 212px; -} -.colorpicker_hsb_h { - background-image: url(../images/colorpicker_hsb_h.png); - top: 52px; - left: 282px; -} -.colorpicker_hsb_s { - background-image: url(../images/colorpicker_hsb_s.png); - top: 82px; - left: 282px; -} -.colorpicker_hsb_b { - background-image: url(../images/colorpicker_hsb_b.png); - top: 112px; - left: 282px; -} -.colorpicker_submit { - position: absolute; - width: 22px; - height: 22px; - background: url(../images/colorpicker_submit.png) top; - left: 322px; - top: 142px; - overflow: hidden; -} -.colorpicker_focus { - background-position: center; -} -.colorpicker_hex.colorpicker_focus { - background-position: bottom; -} -.colorpicker_submit.colorpicker_focus { - background-position: bottom; -} -.colorpicker_slider { - background-position: bottom; -} diff --git a/js/colorpicker/css/layout.css b/js/colorpicker/css/layout.css deleted file mode 100644 index 396e671..0000000 --- a/js/colorpicker/css/layout.css +++ /dev/null @@ -1,218 +0,0 @@ -/*body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { - margin:0; - padding:0; -} -table { - border-collapse:collapse; - border-spacing:0; -} -fieldset,img { - border:0; -} -address,caption,cite,code,dfn,em,strong,th,var { - font-style:normal; - font-weight:normal; -} -ol,ul { - list-style:none; -} -caption,th { - text-align:left; -} -h1,h2,h3,h4,h5,h6 { - font-size:100%; - font-weight:normal; -} -q:before,q:after { - content:''; -} -abbr,acronym { border:0; -} -html, body { - background-color: #fff; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 18px; - color: #52697E; -} -body { - text-align: center; - overflow: auto; -} -.wrapper { - width: 700px; - margin: 0 auto; - text-align: left; -} -h1 { - font-size: 21px; - height: 47px; - line-height: 47px; - text-transform: uppercase; -} -.navigationTabs { - height: 23px; - line-height: 23px; - border-bottom: 1px solid #ccc; -} -.navigationTabs li { - float: left; - height: 23px; - line-height: 23px; - padding-right: 3px; -} -.navigationTabs li a{ - float: left; - dispaly: block; - height: 23px; - line-height: 23px; - padding: 0 10px; - overflow: hidden; - color: #52697E; - background-color: #eee; - position: relative; - text-decoration: none; -} -.navigationTabs li a:hover { - background-color: #f0f0f0; -} -.navigationTabs li a.active { - background-color: #fff; - border: 1px solid #ccc; - border-bottom: 0px solid; -} -.tabsContent { - border: 1px solid #ccc; - border-top: 0px solid; - width: 698px; - overflow: hidden; -} -.tab { - padding: 16px; - display: none; -} -.tab h2 { - font-weight: bold; - font-size: 16px; -} -.tab h3 { - font-weight: bold; - font-size: 14px; - margin-top: 20px; -} -.tab p { - margin-top: 16px; - clear: both; -} -.tab ul { - margin-top: 16px; - list-style: disc; -} -.tab li { - margin: 10px 0 0 35px; -} -.tab a { - color: #8FB0CF; -} -.tab strong { - font-weight: bold; -} -.tab pre { - font-size: 11px; - margin-top: 20px; - width: 668px; - overflow: auto; - clear: both; -} -.tab table { - width: 100%; -} -.tab table td { - padding: 6px 10px 6px 0; - vertical-align: top; -} -.tab dt { - margin-top: 16px; -} -*/ -#colorSelector { - position: relative; - width: 36px; - height: 36px; - background: url(../images/select.png); -} -#colorSelector div { - position: absolute; - top: 3px; - left: 3px; - width: 30px; - height: 30px; - background: url(../images/select.png) center; -} -#colorSelector2 { - position: absolute; - top: 0; - left: 0; - width: 36px; - height: 36px; - background: url(../images/select2.png); -} -#colorSelector2 div { - position: absolute; - top: 4px; - left: 4px; - width: 28px; - height: 28px; - background: url(../images/select2.png) center; -} -#colorpickerHolder2 { - top: 32px; - left: 0; - width: 356px; - height: 0; - overflow: hidden; - position: absolute; -} -#colorpickerHolder2 .colorpicker { - background-image: url(../images/custom_background.png); - position: absolute; - bottom: 0; - left: 0; -} -#colorpickerHolder2 .colorpicker_hue div { - background-image: url(../images/custom_indic.gif); -} -#colorpickerHolder2 .colorpicker_hex { - background-image: url(../images/custom_hex.png); -} -#colorpickerHolder2 .colorpicker_rgb_r { - background-image: url(../images/custom_rgb_r.png); -} -#colorpickerHolder2 .colorpicker_rgb_g { - background-image: url(../images/custom_rgb_g.png); -} -#colorpickerHolder2 .colorpicker_rgb_b { - background-image: url(../images/custom_rgb_b.png); -} -#colorpickerHolder2 .colorpicker_hsb_s { - background-image: url(../images/custom_hsb_s.png); - display: none; -} -#colorpickerHolder2 .colorpicker_hsb_h { - background-image: url(../images/custom_hsb_h.png); - display: none; -} -#colorpickerHolder2 .colorpicker_hsb_b { - background-image: url(../images/custom_hsb_b.png); - display: none; -} -#colorpickerHolder2 .colorpicker_submit { - background-image: url(../images/custom_submit.png); -} -#colorpickerHolder2 .colorpicker input { - color: #778398; -} -#customWidget { - position: relative; - height: 36px; -} diff --git a/js/colorpicker/images/blank.gif b/js/colorpicker/images/blank.gif deleted file mode 100644 index 75b945d..0000000 Binary files a/js/colorpicker/images/blank.gif and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_background.png b/js/colorpicker/images/colorpicker_background.png deleted file mode 100644 index 8401572..0000000 Binary files a/js/colorpicker/images/colorpicker_background.png and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_hex.png b/js/colorpicker/images/colorpicker_hex.png deleted file mode 100644 index 4e532d7..0000000 Binary files a/js/colorpicker/images/colorpicker_hex.png and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_hsb_b.png b/js/colorpicker/images/colorpicker_hsb_b.png deleted file mode 100644 index dfac595..0000000 Binary files a/js/colorpicker/images/colorpicker_hsb_b.png and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_hsb_h.png b/js/colorpicker/images/colorpicker_hsb_h.png deleted file mode 100644 index 3977ed9..0000000 Binary files a/js/colorpicker/images/colorpicker_hsb_h.png and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_hsb_s.png b/js/colorpicker/images/colorpicker_hsb_s.png deleted file mode 100644 index a2a6997..0000000 Binary files a/js/colorpicker/images/colorpicker_hsb_s.png and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_indic.gif b/js/colorpicker/images/colorpicker_indic.gif deleted file mode 100644 index f9fa95e..0000000 Binary files a/js/colorpicker/images/colorpicker_indic.gif and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_overlay.png b/js/colorpicker/images/colorpicker_overlay.png deleted file mode 100644 index 561cdd9..0000000 Binary files a/js/colorpicker/images/colorpicker_overlay.png and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_rgb_b.png b/js/colorpicker/images/colorpicker_rgb_b.png deleted file mode 100644 index dfac595..0000000 Binary files a/js/colorpicker/images/colorpicker_rgb_b.png and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_rgb_g.png b/js/colorpicker/images/colorpicker_rgb_g.png deleted file mode 100644 index 72b3276..0000000 Binary files a/js/colorpicker/images/colorpicker_rgb_g.png and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_rgb_r.png b/js/colorpicker/images/colorpicker_rgb_r.png deleted file mode 100644 index 4855fe0..0000000 Binary files a/js/colorpicker/images/colorpicker_rgb_r.png and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_select.gif b/js/colorpicker/images/colorpicker_select.gif deleted file mode 100644 index 599f7f1..0000000 Binary files a/js/colorpicker/images/colorpicker_select.gif and /dev/null differ diff --git a/js/colorpicker/images/colorpicker_submit.png b/js/colorpicker/images/colorpicker_submit.png deleted file mode 100644 index 7f4c082..0000000 Binary files a/js/colorpicker/images/colorpicker_submit.png and /dev/null differ diff --git a/js/colorpicker/images/custom_background.png b/js/colorpicker/images/custom_background.png deleted file mode 100644 index cf55ffd..0000000 Binary files a/js/colorpicker/images/custom_background.png and /dev/null differ diff --git a/js/colorpicker/images/custom_hex.png b/js/colorpicker/images/custom_hex.png deleted file mode 100644 index 888f444..0000000 Binary files a/js/colorpicker/images/custom_hex.png and /dev/null differ diff --git a/js/colorpicker/images/custom_hsb_b.png b/js/colorpicker/images/custom_hsb_b.png deleted file mode 100644 index 2f99dae..0000000 Binary files a/js/colorpicker/images/custom_hsb_b.png and /dev/null differ diff --git a/js/colorpicker/images/custom_hsb_h.png b/js/colorpicker/images/custom_hsb_h.png deleted file mode 100644 index a217e92..0000000 Binary files a/js/colorpicker/images/custom_hsb_h.png and /dev/null differ diff --git a/js/colorpicker/images/custom_hsb_s.png b/js/colorpicker/images/custom_hsb_s.png deleted file mode 100644 index 7826b41..0000000 Binary files a/js/colorpicker/images/custom_hsb_s.png and /dev/null differ diff --git a/js/colorpicker/images/custom_indic.gif b/js/colorpicker/images/custom_indic.gif deleted file mode 100644 index 222fb94..0000000 Binary files a/js/colorpicker/images/custom_indic.gif and /dev/null differ diff --git a/js/colorpicker/images/custom_rgb_b.png b/js/colorpicker/images/custom_rgb_b.png deleted file mode 100644 index 80764e5..0000000 Binary files a/js/colorpicker/images/custom_rgb_b.png and /dev/null differ diff --git a/js/colorpicker/images/custom_rgb_g.png b/js/colorpicker/images/custom_rgb_g.png deleted file mode 100644 index fc9778b..0000000 Binary files a/js/colorpicker/images/custom_rgb_g.png and /dev/null differ diff --git a/js/colorpicker/images/custom_rgb_r.png b/js/colorpicker/images/custom_rgb_r.png deleted file mode 100644 index 91b0cd4..0000000 Binary files a/js/colorpicker/images/custom_rgb_r.png and /dev/null differ diff --git a/js/colorpicker/images/custom_submit.png b/js/colorpicker/images/custom_submit.png deleted file mode 100644 index cd202cd..0000000 Binary files a/js/colorpicker/images/custom_submit.png and /dev/null differ diff --git a/js/colorpicker/images/select.png b/js/colorpicker/images/select.png deleted file mode 100644 index 21213bf..0000000 Binary files a/js/colorpicker/images/select.png and /dev/null differ diff --git a/js/colorpicker/images/select2.png b/js/colorpicker/images/select2.png deleted file mode 100644 index 2cd2cab..0000000 Binary files a/js/colorpicker/images/select2.png and /dev/null differ diff --git a/js/colorpicker/images/slider.png b/js/colorpicker/images/slider.png deleted file mode 100644 index 8b03da9..0000000 Binary files a/js/colorpicker/images/slider.png and /dev/null differ diff --git a/js/colorpicker/js/colorpicker.js b/js/colorpicker/js/colorpicker.js deleted file mode 100644 index 10a2b22..0000000 --- a/js/colorpicker/js/colorpicker.js +++ /dev/null @@ -1,484 +0,0 @@ -/** - * - * Color picker - * Author: Stefan Petre www.eyecon.ro - * - * Dual licensed under the MIT and GPL licenses - * - */ -(function ($) { - var ColorPicker = function () { - var - ids = {}, - inAction, - charMin = 65, - visible, - tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>', - defaults = { - eventName: 'click', - onShow: function () {}, - onBeforeShow: function(){}, - onHide: function () {}, - onChange: function () {}, - onSubmit: function () {}, - color: 'ff0000', - livePreview: true, - flat: false - }, - fillRGBFields = function (hsb, cal) { - var rgb = HSBToRGB(hsb); - $(cal).data('colorpicker').fields - .eq(1).val(rgb.r).end() - .eq(2).val(rgb.g).end() - .eq(3).val(rgb.b).end(); - }, - fillHSBFields = function (hsb, cal) { - $(cal).data('colorpicker').fields - .eq(4).val(hsb.h).end() - .eq(5).val(hsb.s).end() - .eq(6).val(hsb.b).end(); - }, - fillHexFields = function (hsb, cal) { - $(cal).data('colorpicker').fields - .eq(0).val(HSBToHex(hsb)).end(); - }, - setSelector = function (hsb, cal) { - $(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100})); - $(cal).data('colorpicker').selectorIndic.css({ - left: parseInt(150 * hsb.s/100, 10), - top: parseInt(150 * (100-hsb.b)/100, 10) - }); - }, - setHue = function (hsb, cal) { - $(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10)); - }, - setCurrentColor = function (hsb, cal) { - $(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb)); - }, - setNewColor = function (hsb, cal) { - $(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb)); - }, - keyDown = function (ev) { - var pressedKey = ev.charCode || ev.keyCode || -1; - if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) { - return false; - } - var cal = $(this).parent().parent(); - if (cal.data('colorpicker').livePreview === true) { - change.apply(this); - } - }, - change = function (ev) { - var cal = $(this).parent().parent(), col; - if (this.parentNode.className.indexOf('_hex') > 0) { - cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value)); - } else if (this.parentNode.className.indexOf('_hsb') > 0) { - cal.data('colorpicker').color = col = fixHSB({ - h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10), - s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10), - b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10) - }); - } else { - cal.data('colorpicker').color = col = RGBToHSB(fixRGB({ - r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10), - g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10), - b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10) - })); - } - if (ev) { - fillRGBFields(col, cal.get(0)); - fillHexFields(col, cal.get(0)); - fillHSBFields(col, cal.get(0)); - } - setSelector(col, cal.get(0)); - setHue(col, cal.get(0)); - setNewColor(col, cal.get(0)); - cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]); - }, - blur = function (ev) { - var cal = $(this).parent().parent(); - cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus'); - }, - focus = function () { - charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65; - $(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus'); - $(this).parent().addClass('colorpicker_focus'); - }, - downIncrement = function (ev) { - var field = $(this).parent().find('input').focus(); - var current = { - el: $(this).parent().addClass('colorpicker_slider'), - max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255), - y: ev.pageY, - field: field, - val: parseInt(field.val(), 10), - preview: $(this).parent().parent().data('colorpicker').livePreview - }; - $(document).bind('mouseup', current, upIncrement); - $(document).bind('mousemove', current, moveIncrement); - }, - moveIncrement = function (ev) { - ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10)))); - if (ev.data.preview) { - change.apply(ev.data.field.get(0), [true]); - } - return false; - }, - upIncrement = function (ev) { - change.apply(ev.data.field.get(0), [true]); - ev.data.el.removeClass('colorpicker_slider').find('input').focus(); - $(document).unbind('mouseup', upIncrement); - $(document).unbind('mousemove', moveIncrement); - return false; - }, - downHue = function (ev) { - var current = { - cal: $(this).parent(), - y: $(this).offset().top - }; - current.preview = current.cal.data('colorpicker').livePreview; - $(document).bind('mouseup', current, upHue); - $(document).bind('mousemove', current, moveHue); - }, - moveHue = function (ev) { - change.apply( - ev.data.cal.data('colorpicker') - .fields - .eq(4) - .val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10)) - .get(0), - [ev.data.preview] - ); - return false; - }, - upHue = function (ev) { - fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); - fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); - $(document).unbind('mouseup', upHue); - $(document).unbind('mousemove', moveHue); - return false; - }, - downSelector = function (ev) { - var current = { - cal: $(this).parent(), - pos: $(this).offset() - }; - current.preview = current.cal.data('colorpicker').livePreview; - $(document).bind('mouseup', current, upSelector); - $(document).bind('mousemove', current, moveSelector); - }, - moveSelector = function (ev) { - change.apply( - ev.data.cal.data('colorpicker') - .fields - .eq(6) - .val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10)) - .end() - .eq(5) - .val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10)) - .get(0), - [ev.data.preview] - ); - return false; - }, - upSelector = function (ev) { - fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); - fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); - $(document).unbind('mouseup', upSelector); - $(document).unbind('mousemove', moveSelector); - return false; - }, - enterSubmit = function (ev) { - $(this).addClass('colorpicker_focus'); - }, - leaveSubmit = function (ev) { - $(this).removeClass('colorpicker_focus'); - }, - clickSubmit = function (ev) { - var cal = $(this).parent(); - var col = cal.data('colorpicker').color; - cal.data('colorpicker').origColor = col; - setCurrentColor(col, cal.get(0)); - cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el); - }, - show = function (ev) { - var cal = $('#' + $(this).data('colorpickerId')); - cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]); - var pos = $(this).offset(); - var viewPort = getViewport(); - var top = pos.top + this.offsetHeight; - var left = pos.left; - if (top + 176 > viewPort.t + viewPort.h) { - top -= this.offsetHeight + 176; - } - if (left + 356 > viewPort.l + viewPort.w) { - left -= 356; - } - cal.css({left: left + 'px', top: top + 'px'}); - if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) { - cal.show(); - } - $(document).bind('mousedown', {cal: cal}, hide); - return false; - }, - hide = function (ev) { - if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) { - if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) { - ev.data.cal.hide(); - } - $(document).unbind('mousedown', hide); - } - }, - isChildOf = function(parentEl, el, container) { - if (parentEl == el) { - return true; - } - if (parentEl.contains) { - return parentEl.contains(el); - } - if ( parentEl.compareDocumentPosition ) { - return !!(parentEl.compareDocumentPosition(el) & 16); - } - var prEl = el.parentNode; - while(prEl && prEl != container) { - if (prEl == parentEl) - return true; - prEl = prEl.parentNode; - } - return false; - }, - getViewport = function () { - var m = document.compatMode == 'CSS1Compat'; - return { - l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft), - t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop), - w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth), - h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight) - }; - }, - fixHSB = function (hsb) { - return { - h: Math.min(360, Math.max(0, hsb.h)), - s: Math.min(100, Math.max(0, hsb.s)), - b: Math.min(100, Math.max(0, hsb.b)) - }; - }, - fixRGB = function (rgb) { - return { - r: Math.min(255, Math.max(0, rgb.r)), - g: Math.min(255, Math.max(0, rgb.g)), - b: Math.min(255, Math.max(0, rgb.b)) - }; - }, - fixHex = function (hex) { - var len = 6 - hex.length; - if (len > 0) { - var o = []; - for (var i=0; i<len; i++) { - o.push('0'); - } - o.push(hex); - hex = o.join(''); - } - return hex; - }, - HexToRGB = function (hex) { - var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16); - return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)}; - }, - HexToHSB = function (hex) { - return RGBToHSB(HexToRGB(hex)); - }, - RGBToHSB = function (rgb) { - var hsb = { - h: 0, - s: 0, - b: 0 - }; - var min = Math.min(rgb.r, rgb.g, rgb.b); - var max = Math.max(rgb.r, rgb.g, rgb.b); - var delta = max - min; - hsb.b = max; - if (max != 0) { - - } - hsb.s = max != 0 ? 255 * delta / max : 0; - if (hsb.s != 0) { - if (rgb.r == max) { - hsb.h = (rgb.g - rgb.b) / delta; - } else if (rgb.g == max) { - hsb.h = 2 + (rgb.b - rgb.r) / delta; - } else { - hsb.h = 4 + (rgb.r - rgb.g) / delta; - } - } else { - hsb.h = -1; - } - hsb.h *= 60; - if (hsb.h < 0) { - hsb.h += 360; - } - hsb.s *= 100/255; - hsb.b *= 100/255; - return hsb; - }, - HSBToRGB = function (hsb) { - var rgb = {}; - var h = Math.round(hsb.h); - var s = Math.round(hsb.s*255/100); - var v = Math.round(hsb.b*255/100); - if(s == 0) { - rgb.r = rgb.g = rgb.b = v; - } else { - var t1 = v; - var t2 = (255-s)*v/255; - var t3 = (t1-t2)*(h%60)/60; - if(h==360) h = 0; - if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3} - else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3} - else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3} - else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3} - else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3} - else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3} - else {rgb.r=0; rgb.g=0; rgb.b=0} - } - return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)}; - }, - RGBToHex = function (rgb) { - var hex = [ - rgb.r.toString(16), - rgb.g.toString(16), - rgb.b.toString(16) - ]; - $.each(hex, function (nr, val) { - if (val.length == 1) { - hex[nr] = '0' + val; - } - }); - return hex.join(''); - }, - HSBToHex = function (hsb) { - return RGBToHex(HSBToRGB(hsb)); - }, - restoreOriginal = function () { - var cal = $(this).parent(); - var col = cal.data('colorpicker').origColor; - cal.data('colorpicker').color = col; - fillRGBFields(col, cal.get(0)); - fillHexFields(col, cal.get(0)); - fillHSBFields(col, cal.get(0)); - setSelector(col, cal.get(0)); - setHue(col, cal.get(0)); - setNewColor(col, cal.get(0)); - }; - return { - init: function (opt) { - opt = $.extend({}, defaults, opt||{}); - if (typeof opt.color == 'string') { - opt.color = HexToHSB(opt.color); - } else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) { - opt.color = RGBToHSB(opt.color); - } else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) { - opt.color = fixHSB(opt.color); - } else { - return this; - } - return this.each(function () { - if (!$(this).data('colorpickerId')) { - var options = $.extend({}, opt); - options.origColor = opt.color; - var id = 'collorpicker_' + parseInt(Math.random() * 1000); - $(this).data('colorpickerId', id); - var cal = $(tpl).attr('id', id); - if (options.flat) { - cal.appendTo(this).show(); - } else { - cal.appendTo(document.body); - } - options.fields = cal - .find('input') - .bind('keyup', keyDown) - .bind('change', change) - .bind('blur', blur) - .bind('focus', focus); - cal - .find('span').bind('mousedown', downIncrement).end() - .find('>div.colorpicker_current_color').bind('click', restoreOriginal); - options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector); - options.selectorIndic = options.selector.find('div div'); - options.el = this; - options.hue = cal.find('div.colorpicker_hue div'); - cal.find('div.colorpicker_hue').bind('mousedown', downHue); - options.newColor = cal.find('div.colorpicker_new_color'); - options.currentColor = cal.find('div.colorpicker_current_color'); - cal.data('colorpicker', options); - cal.find('div.colorpicker_submit') - .bind('mouseenter', enterSubmit) - .bind('mouseleave', leaveSubmit) - .bind('click', clickSubmit); - fillRGBFields(options.color, cal.get(0)); - fillHSBFields(options.color, cal.get(0)); - fillHexFields(options.color, cal.get(0)); - setHue(options.color, cal.get(0)); - setSelector(options.color, cal.get(0)); - setCurrentColor(options.color, cal.get(0)); - setNewColor(options.color, cal.get(0)); - if (options.flat) { - cal.css({ - position: 'relative', - display: 'block' - }); - } else { - $(this).bind(options.eventName, show); - } - } - }); - }, - showPicker: function() { - return this.each( function () { - if ($(this).data('colorpickerId')) { - show.apply(this); - } - }); - }, - hidePicker: function() { - return this.each( function () { - if ($(this).data('colorpickerId')) { - $('#' + $(this).data('colorpickerId')).hide(); - } - }); - }, - setColor: function(col) { - if (typeof col == 'string') { - col = HexToHSB(col); - } else if (col.r != undefined && col.g != undefined && col.b != undefined) { - col = RGBToHSB(col); - } else if (col.h != undefined && col.s != undefined && col.b != undefined) { - col = fixHSB(col); - } else { - return this; - } - return this.each(function(){ - if ($(this).data('colorpickerId')) { - var cal = $('#' + $(this).data('colorpickerId')); - cal.data('colorpicker').color = col; - cal.data('colorpicker').origColor = col; - fillRGBFields(col, cal.get(0)); - fillHSBFields(col, cal.get(0)); - fillHexFields(col, cal.get(0)); - setHue(col, cal.get(0)); - setSelector(col, cal.get(0)); - setCurrentColor(col, cal.get(0)); - setNewColor(col, cal.get(0)); - } - }); - } - }; - }(); - $.fn.extend({ - ColorPicker: ColorPicker.init, - ColorPickerHide: ColorPicker.hidePicker, - ColorPickerShow: ColorPicker.showPicker, - ColorPickerSetColor: ColorPicker.setColor - }); -})(jQuery) \ No newline at end of file diff --git a/js/main_custom_color.js b/js/main_custom_color.js deleted file mode 100644 index 557fb3f..0000000 --- a/js/main_custom_color.js +++ /dev/null @@ -1,28 +0,0 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * for main custom color - * - */ -$(document).ready(function() { - $('#li_custom_color').show(); - // Choosing another id does not work! - $("input[type='submit'][name='custom_color_choose']").ColorPicker({ - color: '#0000ff', - onShow: function (colpkr) { - $(colpkr).fadeIn(500); - return false; - }, - onHide: function (colpkr) { - $(colpkr).fadeOut(500); - return false; - }, - onChange: function(hsb, hex, rgb) { - top.frame_content.document.body.style.backgroundColor = '#' + hex; - top.frame_navigation.document.body.style.backgroundColor = '#' + hex; - }, - onSubmit: function(hsb, hex, rgb) { - $('#custom_color').val('#' + hex); - $('#colorform').submit(); - } - }); -}); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index da66fda..906b6f6 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -651,11 +651,6 @@ unset($default_server); /******************************************************************************/ /* setup themes LABEL_theme_setup */ -if (isset($_REQUEST['custom_color_reset'])) { - unset($_SESSION['tmp_user_values']['custom_color']); -} elseif (isset($_REQUEST['custom_color'])) { - $_SESSION['tmp_user_values']['custom_color'] = $_REQUEST['custom_color']; -} /** * @global PMA_Theme_Manager $_SESSION['PMA_Theme_Manager'] */ diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 46cca27..0c6633d 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -45,14 +45,6 @@ if ($GLOBALS['text_dir'] == 'ltr') { echo 'phpMyAdmin'; } ?></title> -<?php -// goes before our themed CSS - if (defined('PMA_COLORPICKER')) { ?> - <link rel="stylesheet" type="text/css" href="js/colorpicker/css/colorpicker.css" /> - <link rel="stylesheet" media="screen" type="text/css" href="js/colorpicker/css/layout.css" /> -<?php - } -?> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" /> <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" /> diff --git a/main.php b/main.php index e678d88..a669480 100644 --- a/main.php +++ b/main.php @@ -8,11 +8,8 @@ /** * Gets some core libraries and displays a top message if required */ -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'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js'; @@ -136,20 +133,6 @@ if ($GLOBALS['cfg']['ThemeManager']) { echo '<li id="li_select_theme">'; echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox(); 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...') . '" />'; - echo '<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">'; - echo PMA_generate_common_hidden_inputs(); - echo '<input type="hidden" id="custom_color" name="custom_color" value="" />'; - echo '<input type="submit" name="custom_color_reset" value="' . __('Reset') . '" />'; - echo '</form>'; - echo '</li>'; - */ } echo '<li id="li_select_fontsize">'; echo PMA_Config::getFontsizeForm(); diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 6bfd715..50ffc39 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -26,7 +26,7 @@ body { <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?> font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>; <?php } ?> - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; margin: 0; padding: 0.2em 0.2em 0.2em 0.2em; @@ -80,7 +80,7 @@ button { div#pmalogo { <?php //better echo $GLOBALS['cfg']['logoBGC']; ?> - background-color: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; padding:.3em; } div#pmalogo, @@ -161,7 +161,7 @@ div#left_tableList ul { margin: 0; padding: 0; font-size: 80%; - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; } div#left_tableList ul ul { diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 4aa0be6..778b332 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -30,7 +30,7 @@ body { padding: 0; margin: 0.5em; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>; - background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>; + background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>; } <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?> @@ -1357,7 +1357,7 @@ div.upload_progress_bar_outer div.upload_progress_bar_inner { - background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; width: 0px; height: 12px; margin: 1px; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index a013337..9795b30 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1656,7 +1656,7 @@ div.upload_progress_bar_outer div.upload_progress_bar_inner { - background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; + background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>; width: 0px; height: 12px; margin: 1px; hooks/post-receive -- phpMyAdmin

1 0