[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1135-gb2d9121

Marc Delisle lem9 at users.sourceforge.net
Fri Apr 22 13:00:59 CEST 2011


The branch, master has been updated
       via  b2d9121f189f30a5dc53eb3278cad9ba7dbf72ba (commit)
      from  931e8576d24e1ef94234efb1077b608984666ce4 (commit)


- Log -----------------------------------------------------------------
commit b2d9121f189f30a5dc53eb3278cad9ba7dbf72ba
Author: Marc Delisle <marc at 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




More information about the Git mailing list