GUI: Update amarok theme to work into 3.3

htdocs/theme/amarok/AUTHOR

@@ -1 +1,2 @@
-2012 Nicolas Péré <nicolas@amarok2.net>
+2012 Nicolas Péré		<nicolas@amarok2.net>
+2012 Xavier Peyronnet	<xavier.peyronnet@free.fr>

htdocs/theme/amarok/ckeditor/config.js

@@ -1,82 +1,82 @@
-/*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
-*/
-
-CKEDITOR.editorConfig = function( config )
-{
-	// Define changes to default configuration here.
-	// http://docs.cksource.com/CKEditor_3.x/Developers_Guide
-	// http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html
-	config.enterMode = CKEDITOR.ENTER_BR;
-	config.resize_enabled = false;
-	//config.resize_maxHeight = 3000;
-	//config.resize_maxWidth = 3000;
-	//config.height = '300px';
-	//config.resize_dir = 'vertical';	// horizontal, vertical, both
-	config.removePlugins = 'elementspath,save'; // config.removePlugins = 'elementspath,save,font';
-	config.removeDialogTabs = 'flash:advanced';	// config.removeDialogTabs = 'flash:advanced;image:Link';
-	config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // Prevent PHP Code to be formatted
-	//config.menu_groups = 'clipboard,table,anchor,link,image';	// for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' 
-	//config.language = 'de';
-	//config.defaultLanguage = 'en';
-	//config.contentsLanguage = 'fr';
-	config.fullPage = false;	// Not a full html page string, just part of it
-	config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)';
-	//config.contentsCss = '/css/mysitestyles.css';
-	config.image_previewText=' ';
-
-	config.toolbar_Full =
-	[
-	    ['Source','-','Save','NewPage','Preview','-','Templates'],
-	    ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],
-	    ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
-	    ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],
-	    '/',
-	    ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
-	    ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
-	    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	    ['BidiLtr', 'BidiRtl'],
-	    ['Link','Unlink','Anchor'],
-	    ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
-	    '/',
-	    ['Styles','Format','Font','FontSize'],
-	    ['TextColor','BGColor'],
-	    ['Maximize', 'ShowBlocks','-','About']
-	];
-
-	config.toolbar_dolibarr_mailings = 
-	[
-	 	['Source','Maximize'],
-	 	['Cut','Copy','Paste','-','SpellChecker'],
-	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
-	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
-	 	['NumberedList','BulletedList','Outdent','Indent','CreateDiv'],
-	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	 	['Link','Unlink','Anchor','Image','Table','SpecialChar']
-	 ];
-	
-	config.toolbar_dolibarr_notes =
-	[
-	 	['Source'],
-	 	['Cut','Copy','Paste','-','SpellChecker'],
-	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
-	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
-	 	['NumberedList','BulletedList','Outdent','Indent'],
-	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	    ['Link','Unlink','Image','Table','SpecialChar']
-	];
-	
-	config.toolbar_dolibarr_details =
-	[
-	 	['Source','Maximize'],
-	 	['Cut','Copy','Paste','-','SpellChecker'],
-	    ['Font','FontSize'],
-	    ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
-	 	['NumberedList','BulletedList','Outdent','Indent'],
-	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	    ['SpecialChar']
-	];
-};
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.editorConfig = function( config )
+{
+	// Define changes to default configuration here.
+	// http://docs.cksource.com/CKEditor_3.x/Developers_Guide
+	// http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html
+	config.enterMode = CKEDITOR.ENTER_BR;
+	config.resize_enabled = false;
+	//config.resize_maxHeight = 3000;
+	//config.resize_maxWidth = 3000;
+	//config.height = '300px';
+	//config.resize_dir = 'vertical';	// horizontal, vertical, both
+	config.removePlugins = 'elementspath,save'; // config.removePlugins = 'elementspath,save,font';
+	config.removeDialogTabs = 'flash:advanced';	// config.removeDialogTabs = 'flash:advanced;image:Link';
+	config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // Prevent PHP Code to be formatted
+	//config.menu_groups = 'clipboard,table,anchor,link,image';	// for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' 
+	//config.language = 'de';
+	//config.defaultLanguage = 'en';
+	//config.contentsLanguage = 'fr';
+	config.fullPage = false;	// Not a full html page string, just part of it
+	config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)';
+	//config.contentsCss = '/css/mysitestyles.css';
+	config.image_previewText=' ';
+
+	config.toolbar_Full =
+	[
+	    ['Source','-','Save','NewPage','Preview','-','Templates'],
+	    ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],
+	    ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+	    ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],
+	    '/',
+	    ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
+	    ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
+	    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	    ['BidiLtr', 'BidiRtl'],
+	    ['Link','Unlink','Anchor'],
+	    ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
+	    '/',
+	    ['Styles','Format','Font','FontSize'],
+	    ['TextColor','BGColor'],
+	    ['Maximize', 'ShowBlocks','-','About']
+	];
+
+	config.toolbar_dolibarr_mailings = 
+	[
+	 	['Source','Maximize'],
+	 	['Cut','Copy','Paste','-','SpellChecker'],
+	 	['Undo','Redo','-','Find','Replace'],
+	    ['Font','FontSize'],
+	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
+	 	['NumberedList','BulletedList','Outdent','Indent'],
+	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	 	['Link','Unlink','Anchor','Image','Table','SpecialChar']
+	 ];
+	
+	config.toolbar_dolibarr_notes =
+	[
+	 	['Source'],
+	 	['Cut','Copy','Paste','-','SpellChecker'],
+	 	['Undo','Redo','-','Find','Replace'],
+	    ['Font','FontSize'],
+	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
+	 	['NumberedList','BulletedList','Outdent','Indent'],
+	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	    ['Link','Unlink','Image','Table','SpecialChar']
+	];
+	
+	config.toolbar_dolibarr_details =
+	[
+	 	['Source','Maximize'],
+	 	['Cut','Copy','Paste','-','SpellChecker'],
+	    ['Font','FontSize'],
+	    ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
+	 	['NumberedList','BulletedList','Outdent','Indent'],
+	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	    ['SpecialChar']
+	];
+};

htdocs/theme/amarok/graph-color.php

@@ -1,4 +1,4 @@
-<?php
+<?PHP
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
@@ -24,7 +24,7 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(125,135,150), array(200,160,180), array(190,190,220), array(170,140,190), array(190,190,170));
+$theme_datacolor = array(array(101,191,112), array(164,206,230), array(248,128,128), array(252,245,184), array(190,190,190));
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));