mooRainbow fix for mootools 1.2; Reset buton for custom color

js/mooRainbow/mooRainbow.js

@@ -7,7 +7,7 @@
  * @infos		http://moorainbow.woolly-sheep.net
  * @copyright	Author
  * 
- *
+ * includes a fix for mootools 1.2 by Piotr Przybylski
  */
 
 var MooRainbow = new Class({
@@ -447,7 +447,7 @@ var MooRainbow = new Class({
 			'src': this.options.imgPath + 'moor_slider.png',
 			'class': prefix + 'slider'
 		}).inject(box);
-		this.layout.slider = $E('#' + idPrefix + 'slider');
+		this.layout.slider = sl;
 		sl.width = sl.getStyle('width').toInt();
 		sl.height = sl.getStyle('height').toInt();
 
@@ -501,24 +501,23 @@ var MooRainbow = new Class({
 		
 		this.rePosition();
 
-		var overlays = $$('#' + idPrefix + 'overlay');
+		var overlays = $$('#' + id + ' .' + prefix + 'overlay');
 		this.layout.overlay = overlays[0];
 		this.layout.overlay2 = overlays[1];
-		this.layout.cursor = $E('#' + idPrefix + 'cursor');
-		this.layout.arrows = $E('#' + idPrefix + 'arrows');
-		this.chooseColor = $E('#' + idPrefix + 'chooseColor');
-		this.layout.backup = $E('#' + idPrefix + 'currentColor');
-		this.RedInput = $E('#' + idPrefix + 'rInput');
-		this.GreenInput = $E('#' + idPrefix + 'gInput');
-		this.BlueInput = $E('#' + idPrefix + 'bInput');
-		this.HueInput = $E('#' + idPrefix + 'HueInput');
-		this.SatuInput = $E('#' + idPrefix + 'SatuInput');
-		this.BrighInput = $E('#' + idPrefix + 'BrighInput');
-		this.hexInput = $E('#' + idPrefix + 'hexInput');
+		this.layout.cursor = cr;
+		this.layout.arrows = ar;
+		this.chooseColor = this.layout.getElement('.' + prefix + 'chooseColor');
+		this.RedInput = inputR;
+		this.GreenInput = inputG;
+		this.BlueInput = inputB;
+		this.HueInput = inputHU;
+		this.SatuInput = this.layout.getElement('.' + prefix + 'SatuInput');
+		this.BrighInput = this.layout.getElement('.' + prefix + 'BrighInput');
+		this.hexInput = this.layout.getElement('.' + prefix + 'hexInput');;
 
 		this.arrRGB = [this.RedInput, this.GreenInput, this.BlueInput];
 		this.arrHSB = [this.HueInput, this.SatuInput, this.BrighInput];
-		this.okButton = $E('#' + idPrefix + 'okButton');
+		this.okButton = ok;
 		
 		if (!Browser.Engine.webkit419) this.hide();
 	},

lang/afrikaans-utf-8.inc.php

@@ -1101,4 +1101,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/albanian-utf-8.inc.php

@@ -1100,4 +1100,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/arabic-utf-8.inc.php

@@ -1102,4 +1102,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/azerbaijani-utf-8.inc.php

@@ -1097,4 +1097,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/bangla-utf-8.inc.php

@@ -1076,4 +1076,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/basque-utf-8.inc.php

@@ -1094,4 +1094,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/belarusian_cyrillic-utf-8.inc.php

@@ -1077,4 +1077,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/belarusian_latin-utf-8.inc.php

@@ -1076,4 +1076,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/bosnian-utf-8.inc.php

@@ -1100,4 +1100,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/brazilian_portuguese-utf-8.inc.php

@@ -1074,4 +1074,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/bulgarian-utf-8.inc.php

@@ -1097,4 +1097,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/catalan-utf-8.inc.php

@@ -1072,4 +1072,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/chinese_simplified-utf-8.inc.php

@@ -1102,4 +1102,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/chinese_traditional-utf-8.inc.php

@@ -1081,4 +1081,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/croatian-utf-8.inc.php

@@ -1075,4 +1075,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/czech-utf-8.inc.php

@@ -1076,4 +1076,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/danish-utf-8.inc.php

@@ -1076,4 +1076,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/dutch-utf-8.inc.php

@@ -1098,4 +1098,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/english-utf-8.inc.php

@@ -185,6 +185,7 @@ $strCreationDates = 'Creation/Update/Check dates';
 $strCriteria = 'Criteria';
 $strCroatian = 'Croatian';
 $strCSV = 'CSV';
+$strCustomColor = 'Custom color';
 $strCyrillic = 'Cyrillic';
 $strCzech = 'Czech';
 $strCzechSlovak = 'Czech-Slovak';

lang/estonian-utf-8.inc.php

@@ -1082,4 +1082,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/finnish-utf-8.inc.php

@@ -1076,4 +1076,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/french-utf-8.inc.php

@@ -1073,4 +1073,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/galician-utf-8.inc.php

@@ -1075,4 +1075,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/georgian-utf-8.inc.php

@@ -1102,4 +1102,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/german-utf-8.inc.php

@@ -1082,4 +1082,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/greek-utf-8.inc.php

@@ -1099,4 +1099,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/hebrew-utf-8.inc.php

@@ -1094,4 +1094,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/hindi-utf-8.inc.php

@@ -1102,4 +1102,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/hungarian-utf-8.inc.php

@@ -1093,4 +1093,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/indonesian-utf-8.inc.php

@@ -1092,4 +1092,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/italian-utf-8.inc.php

@@ -1077,4 +1077,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/japanese-utf-8.inc.php

@@ -1093,4 +1093,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/korean-utf-8.inc.php

@@ -1097,4 +1097,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/latvian-utf-8.inc.php

@@ -1099,4 +1099,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/lithuanian-utf-8.inc.php

@@ -1092,4 +1092,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/macedonian_cyrillic-utf-8.inc.php

@@ -1077,4 +1077,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/malay-utf-8.inc.php

@@ -1114,4 +1114,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/mongolian-utf-8.inc.php

@@ -1097,4 +1097,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/norwegian-utf-8.inc.php

@@ -1074,4 +1074,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/persian-utf-8.inc.php

@@ -1099,4 +1099,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/polish-utf-8.inc.php

@@ -1070,4 +1070,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/portuguese-utf-8.inc.php

@@ -1103,4 +1103,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/romanian-utf-8.inc.php

@@ -1091,4 +1091,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/russian-utf-8.inc.php

@@ -1078,4 +1078,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/serbian_cyrillic-utf-8.inc.php

@@ -1076,4 +1076,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/serbian_latin-utf-8.inc.php

@@ -1076,4 +1076,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/sinhala-utf-8.inc.php

@@ -1079,4 +1079,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/slovak-utf-8.inc.php

@@ -1077,4 +1077,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/slovenian-utf-8.inc.php

@@ -1096,4 +1096,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/spanish-utf-8.inc.php

@@ -1072,4 +1072,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/swedish-utf-8.inc.php

@@ -1075,4 +1075,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/tatarish-utf-8.inc.php

@@ -1088,4 +1088,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/thai-utf-8.inc.php

@@ -1098,4 +1098,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/turkish-utf-8.inc.php

@@ -1082,4 +1082,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

lang/ukrainian-utf-8.inc.php

@@ -1096,4 +1096,5 @@ $strAsDefined = 'As defined:';  //to translate
 $strWiki = 'Wiki';  //to translate
 $strWebServer = 'Web server';  //to translate
 $strPHPExtension = 'PHP extension';  //to translate
+$strCustomColor = 'Custom color';  //to translate
 ?>

libraries/common.inc.php

@@ -637,7 +637,10 @@ unset($default_server);
 /******************************************************************************/
 /* setup themes                                          LABEL_theme_setup    */
 
-if (isset($_REQUEST['custom_color'])) {
+if (isset($_REQUEST['custom_color_reset'])) {
+    unset($_SESSION['userconf']['custom_color']);
+    unset($_SESSION['userconf']['custom_color_rgb']);
+} elseif (isset($_REQUEST['custom_color'])) {
     $_SESSION['userconf']['custom_color'] = $_REQUEST['custom_color'];
     $_SESSION['userconf']['custom_color_rgb'] = $_REQUEST['custom_color_rgb'];
 }

main.php

@@ -147,13 +147,16 @@ if (empty($cfg['Lang'])) {
 if ($GLOBALS['cfg']['ThemeManager']) {
     echo '<li id="li_select_theme">';
     echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox();
-    /*
+    echo '</li>';
+    echo '<li id="li_custom_color">';
+    echo $strCustomColor . ': ';
     echo '<img id="myRainbow" src="js/mooRainbow/images/rainbow.png" alt="[r]" width="16" height="16" />';
     echo '<form name="rainbowform" id="rainbowform" method="post" action="index.php" target="_parent">';
     echo PMA_generate_common_hidden_inputs();
     echo '<input type="hidden" name="custom_color" />';
     echo '<input type="hidden" name="custom_color_rgb" />';
-    echo '</form>';*/
+    echo '<input type="submit" name="custom_color_reset" value="' . $strReset . '" />';
+    echo '</form>';
     echo '</li>';
 }
 echo '<li id="li_select_fontsize">';