Juan Carlos Raña 14 years ago
parent
commit
b1adc4a97e

+ 44 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/fckplugin.js

@@ -0,0 +1,44 @@
+/*
+ * Licensed under the terms of the GNU Lesser General Public License:
+ * 		http://www.opensource.org/licenses/lgpl-license.php
+ * 
+ * File Name: fckplugin.js
+ * 	Plugin to add some HTML, a single snippet; a choice from multiple snippets; or manually entered HTML
+ * 
+ * File Authors:
+ * 		Paul Moers (http://www.saulmade.nl/FCKeditor/FCKPlugins.php)
+ */
+
+	// insertHtmlObject constructor
+	var insertHtmlToolbarCommand = function()
+	{
+	}
+
+	// register the command
+	FCKCommands.RegisterCommand('insertHtml', new insertHtmlToolbarCommand());
+
+	// create the toolbar  button
+	var insertHtmlButton = new FCKToolbarButton('insertHtml', FCKConfig.insertHtml_buttonTooltip || FCKLang.inserHTML_buttonTooltip);
+	insertHtmlButton.IconPath = FCKPlugins.Items['insertHtml'].Path + 'images/toolbarIcon_default.gif'; // or pick any other in folder 'images'
+	FCKToolbarItems.RegisterItem('insertHtml', insertHtmlButton);
+
+	// manage the plugins' button behavior
+	insertHtmlToolbarCommand.prototype.GetState = function()
+	{
+		return FCK_TRISTATE_OFF;
+	}
+
+	// insertHtml's button click function
+	insertHtmlToolbarCommand.prototype.Execute = function()
+	{
+		if (FCKConfig.insertHtml_showDialog || !FCKConfig.insertHtml_snippets || (FCKConfig.insertHtml_snippets && !FCKConfig.insertHtml_snippets.length))
+		{
+			var dialog = new FCKDialogCommand('insertHtml', FCKLang.insertHtml_dialogTitle, FCKPlugins.Items['insertHtml'].Path + 'insertHtml.html', 200, 100);
+			dialog.Execute();
+		}
+		else
+		{
+			FCK.InsertHtml(FCKConfig.insertHtml_snippet);
+			FCK.EditorWindow.parent.FCKUndo.SaveUndoStep();
+		}
+	}

+ 8 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/images/index.html

@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+</head>
+<body>
+<br />
+</body>
+</html>

BIN
main/inc/lib/fckeditor/editor/plugins/insertHtml/images/toolbarIcon_default.gif


BIN
main/inc/lib/fckeditor/editor/plugins/insertHtml/images/toolbarIcon_famfamfam.gif


+ 8 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/index.html

@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+</head>
+<body>
+<br />
+</body>
+</html>

+ 75 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/insertHtml.html

@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+
+	<title>insertHtml</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+
+	<script src="insertHtml.js" type="text/javascript"></script>
+	<script src="../../dialog/common/fck_dialog_common.js" type="text/javascript"></script>
+
+	<style>
+
+		#snippets
+		{
+			width: 200px;
+			margin-right: 10px;
+		}
+		#insertHtmlHelp,
+		{
+			margin-right: 0px; /* no extra right margin needed in IE */
+		}
+		.snippet
+		{
+			background: white;
+			padding: 3px 5px;
+			margin: 3px 0px;
+			border: 1px solid #dcdcdc;
+		}
+		.snippet.PopupSelectionBox
+		{
+		}
+
+		#insertHtmlHelp
+		{
+			margin: 0px 15px 6px 0px;
+			display: block;
+		}
+		#insertHtmlHelp,
+		{
+			margin-right: 5px; /* no extra right margin needed in IE */
+		}
+
+		#insertHtmlTextArea
+		{
+			overflow: auto;
+			margin: 0px 25px 40px 0px;
+		}
+		#insertHtmlTextArea,
+		{
+			margin-right: 0px; /* no extra right margin needed in IE */
+		}
+
+	</style>
+
+</head>
+<body style="padding-bottom: 0px;">
+
+	<table border="0" cellpadding="0" cellspacing="0">
+		<tr>
+			<td>
+				<span fcklang="inserHtml_help" id="insertHtmlHelp">
+					Enter any HTML below and click 'ok' to insert it at the location of the cursor in the editor.
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td id="content">
+			</td>
+		</tr>
+	</table>
+
+</body>
+</html>

+ 111 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/insertHtml.js

@@ -0,0 +1,111 @@
+
+
+	var dialog = window.parent;
+	var editorWindow = dialog.InnerDialogLoaded();
+	var editorInstance = editorWindow.FCK;
+	var FCKConfig = editorWindow.FCKConfig;
+	var FCKTools = editorWindow.FCKTools;
+	var FCKBrowserInfo = editorWindow.FCKBrowserInfo;
+
+
+	// onload
+	window.onload = function()
+	{
+		var description, snippet;
+
+		// show snippets to choose from
+		if (typeof(FCKConfig.insertHtml_snippets) == 'object')
+		{
+			var snippetsDiv, snippetDiv, numberOfSnippets = 0;
+
+			snippetsDiv = document.createElement('div');
+			snippetsDiv.id = 'snippets';
+
+			for (description in FCKConfig.insertHtml_snippets)
+			{
+				snippetDiv = document.createElement('div');
+				snippetDiv.innerHTML = description;
+				snippetDiv.className = 'snippet';
+				snippetDiv.snippet = FCKConfig.insertHtml_snippets[description];
+				snippetDiv.onmouseover = function(){this.className += ' PopupSelectionBox'};
+				snippetDiv.onmouseout = function(){this.className = this.className.replace(/\s?PopupSelectionBox\s?/, '')};
+				if (FCKConfig.insertHtml_showTextarea)
+				{
+					snippetDiv.onclick = function(){
+						document.getElementById('insertHtmlTextArea').value = this.snippet;
+					};
+				}
+				else
+				{
+					snippetDiv.onclick = function(){
+						editorInstance.InsertHtml(this.snippet);
+						editorWindow.FCKUndo.SaveUndoStep();
+						dialog.CloseDialog();
+					};
+				}
+				snippetsDiv.appendChild(snippetDiv);
+
+				numberOfSnippets++;
+			}
+			document.getElementById('content').appendChild(snippetsDiv);
+
+			// load dialog 
+		}
+
+		// show textarea
+		if (FCKConfig.insertHtml_showTextarea || !FCKConfig.insertHtml_snippets || !numberOfSnippets)
+		{
+			insertHtmlTextArea = document.createElement('textarea');
+			insertHtmlTextArea.id = 'insertHtmlTextArea';
+			document.getElementById('content').appendChild(insertHtmlTextArea);
+			// set the size of the textarea
+			insertHtmlTextArea.style.width = (FCKConfig.insertHtml_textareaWidth || 300) + 'px';
+			insertHtmlTextArea.style.height = (FCKConfig.insertHtml_textareaHeight || 100) + 'px';
+			// load default content
+			if (typeof(FCKConfig.insertHtml_snippets) == 'object')
+			{
+				for (description in FCKConfig.insertHtml_snippets)
+				{
+					snippet = FCKConfig.insertHtml_snippets[description];
+					break;
+				}
+			}
+			else
+			{
+				//snippet = FCKConfig.insertHtml_snippets;//Chamilo replaced by below (by now)
+				snippet = "";//Insert your tex here
+			}
+			insertHtmlTextArea.value = snippet;
+		}
+
+		// resize around snippets and/or textarea
+		// for IE this must be done before translating the dialog or the dialog will be to wide; also IE needs an approximate resize before autofitting or the dialog width will be to large
+		if (FCKBrowserInfo.IsIE) dialog.Sizer.ResizeDialog(parseInt(FCKConfig.insertHtml_textareaWidth || 300), parseInt(FCKConfig.insertHtml_textareaHeight || 100) + 130);
+		dialog.SetAutoSize(true);
+
+		// recenter dialog
+		setTimeout(function(){ // after a dummy delay, needed for webkit
+			var topWindowSize = FCKTools.GetViewPaneSize(dialog.top.window);
+			dialog.frameElement.style.left = Math.round((topWindowSize.Width - dialog.frameElement.offsetWidth) / 2) + 'px';
+			dialog.frameElement.style.top = Math.round((topWindowSize.Height - dialog.frameElement.offsetHeight) / 2).toString() + 'px';;
+		}, 0);
+
+		// translate the dialog box texts
+		editorWindow.FCKLanguageManager.TranslatePage(document);
+
+		// activate the "OK" button
+		dialog.SetOkButton(true);
+	}
+
+	// dialog's 'ok' button function to insert the Html
+	function Ok()
+	{
+		if (insertHtmlTextArea.value)
+		{
+			editorInstance.InsertHtml(insertHtmlTextArea.value);
+			editorWindow.FCKUndo.SaveUndoStep();
+
+			return true; // makes the dialog to close
+		}
+	}
+

+ 6 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/lang/en.js

@@ -0,0 +1,6 @@
+
+
+	FCKLang.inserHTML_buttonTooltip					= 'Insert HTML';
+	FCKLang.insertHtml_dialogTitle						= 'Insert HTML';
+	FCKLang.inserHtml_help								= 'Enter any HTML below and click \'ok\' to insert it at the location of the cursor in the editor.';
+

+ 6 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/lang/es.js

@@ -0,0 +1,6 @@
+
+
+	FCKLang.inserHTML_buttonTooltip					= 'Insertar HTML';
+	FCKLang.insertHtml_dialogTitle						= 'Insertar HTML';
+	FCKLang.inserHtml_help								= 'Introduzca cualquier código HTML debajo y haga clic \'ok\' para insertarlo en la posición en la que se encuentra el cursos en el editor.';
+

+ 8 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/lang/index.html

@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+</head>
+<body>
+<br />
+</body>
+</html>

+ 5 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/lang/nl.js

@@ -0,0 +1,5 @@
+
+
+	FCKLang.inserHTML_buttonTooltip					= 'HTML invoegen';
+	FCKLang.insertHtml_dialogTitle						= 'HTML invoegen';
+	FCKLang.inserHtml_help								= 'Geef HTML code in en klik op \'ok\' om de code in te voegen op de locatie van de cursor in de editor.';

+ 46 - 21
main/inc/lib/fckeditor/myconfig.php

@@ -152,27 +152,31 @@ if ((api_get_setting('enabled_googlemaps') == 'true')) {
 if ((api_get_setting('math_mimetex') == 'true')) {
     $config['LoadPlugin'][] = 'mimetex';
 	// in your server configuration have to be done. The MimeTex executable file has to be installed, see the installation guide.
-	// Some additional settings become active only when the 'mimetex' plugin has been enabled:
-	//
-	// The following setting determines whether MimeTeX executable file has been installed on the server or not. This file should be accessible
-	// for browsers at address http://mysite.com/cgi-bin/mimetex.cgi (Linux) or at address http://mysite.com/cgi-bin/mimetex.exe (Windows).
-	// How to test manually: Open your browser and enter in the address bar something like http://mysite.com/cgi-bin/mimetex.cgi?hello
-	// By default, the system tries to detect the MimeTeX executable file automatically.
-	// If you are sure that the MimeTeX executable has been correctly installed, you may set this option to boolean true value.
-	$config['MimetexExecutableInstalled'] = 'detect'; // 'detect' (default), true, false
-	// Sometimes detection fails (due to slow DNS service, security restrictions, ...). For better probability of success,
-	// the following methods for detection have been defined:
-	// 'bootstrap_ip'   - detection is tried at address like http://127.0.0.1/cgi-bin/mimetex.cgi
-	// 'localhost'      - detection is tried at address like http://localhost/cgi-bin/mimetex.cgi
-	// 'ip'             - detection is tried at ip address, for example http://192.168.0.1/cgi-bin/mimetex.cgi
-	// 'server_name'    - detection is tried at address based on server's name, for example http://mysite.com/cgi-bin/mimetex.cgi
-	if (IS_WINDOWS_OS) {
-		$config['MimetexExecutableDetectionMethod'] = 'bootstrap_ip'; // 'bootstrap_ip' for better chance on Windows (no firewall blocking).
-	} else {
-		$config['MimetexExecutableDetectionMethod'] = 'server_name';
-	}
-	// Timeout for MimeTeX executable file detection - keep this value as low as possible, especially on Windows servers.
-	$config['MimetexExecutableDetectionTimeout'] = 0.05;
+		
+		// Some additional settings become active only when the 'mimetex' plugin has been enabled:
+		//
+		// The following setting determines whether MimeTeX executable file has been installed on the server or not. This file should be accessible
+		// for browsers at address http://mysite.com/cgi-bin/mimetex.cgi (Linux) or at address http://mysite.com/cgi-bin/mimetex.exe (Windows).
+		// How to test manually: Open your browser and enter in the address bar something like http://mysite.com/cgi-bin/mimetex.cgi?hello
+		// By default, the system tries to detect the MimeTeX executable file automatically.
+		// If you are sure that the MimeTeX executable has been correctly installed, you may set this option to boolean true value.
+		
+		$config['MimetexExecutableInstalled'] = 'true'; // 'detect' (default), true, false.
+		
+		// Sometimes detection fails (due to slow DNS service, security restrictions, ...). For better probability of success,
+		// the following methods for detection have been defined:
+		// 'bootstrap_ip'   - detection is tried at address like http://127.0.0.1/cgi-bin/mimetex.cgi
+		// 'localhost'      - detection is tried at address like http://localhost/cgi-bin/mimetex.cgi
+		// 'ip'             - detection is tried at ip address, for example http://192.168.0.1/cgi-bin/mimetex.cgi
+		// 'server_name'    - detection is tried at address based on server's name, for example http://mysite.com/cgi-bin/mimetex.cgi
+		
+		if (IS_WINDOWS_OS) {
+			$config['MimetexExecutableDetectionMethod'] = 'bootstrap_ip'; // 'bootstrap_ip' for better chance on Windows (no firewall blocking).
+		} else {
+			$config['MimetexExecutableDetectionMethod'] = 'server_name';
+		}
+		// Timeout for MimeTeX executable file detection - keep this value as low as possible, especially on Windows servers.
+		$config['MimetexExecutableDetectionTimeout'] = 0.05;
 }
 
 
@@ -201,6 +205,27 @@ if ((api_get_setting('enabled_imgmap') == 'true')) {
 $config['LoadPlugin'][] = 'wikilink';
 
 
+// insertHtml: Plugin for inserting HTML. A single preconfigured snippet; a choice from multiple preconfigured snippets; or manually entered HTML.
+if ((api_get_setting('enabled_insertHtml') == 'true')) {
+	$config['LoadPlugin'][] = 'insertHtml';
+}
+	// enter a single snippet (HMTL string) or multiple snippets to choose form (object of description string and HTML string pairs). Or leave empty if you want to show a dialog for the user to enter HTML manually (and not show any default HTML in the dialog textarea)
+	
+	//$config['insertHtml_snippets'] = { 'ArtGallery': '<embed width="475" height="400" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" src="FlashGallery/Art/ArtFlashGallery.swf" mediaType="flashGallery" bgcolor="#ffffff" allowfullscreen="true" flashvars="XMLFile=userfiles/image/ArtGallery/gallery.xml"></embed>', 'PhotoFlowGallery' : '<embed width="700" height="300" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" src="FlashGallery/PhotoFlow/PhotoFlowGallery.swf" mediaType="flashGallery" bgcolor="#ffffff" flashvars="XMLFile=userfiles/image/PhotoFlowGallery/gallery.xml"></embed>', 'StackPhotoGallery' : '<embed width="600" height="400" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" src="FlashGallery/StackPhoto/StackPhotoGallery.swf" mediaType="flashGallery" bgcolor="#ffffff" flashvars="XMLFile=userfiles/image/StackPhotoGallery/gallery.xml"></embed>', 'ZenGallery' : '<embed width="550" height="400" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" src="FlashGallery/Zen/ZenGallery.swf" mediaType="flashGallery" bgcolor="#ffffff" flashvars="XMLFile=userfiles/image/ZenGallery/gallery.xml"></embed>'};// TODO: this $config['insertHtml_snippets'] does not work. See also temporal hack around line 76 insertHtml.js
+			
+	// (if no snippets specified the dialog will show anyhow)
+	$config['insertHtml_showDialog'] = true;
+	
+	// specify a custom tooltip if you want this to appear when hovering the plugin's toolbar button (e.g. a description of the element being inserted). If no custom tooltip is set 'Insert HTML' will appear, and if available, translated into your language
+	$config['insertHtml_buttonTooltip'] = '';
+	
+	// show a textarea in the dialog? The first HTML set with $config['insertHtml_snippets'] will be shown in the textarea by default. If no snippets specified the textarea will show anyhow
+	$config['insertHtml_showTextarea']= false;
+	
+	// the size of the textarea in the dialog, in px
+	$config['insertHtml_textareaWidth'] = 400;
+	$config['insertHtml_textareaHeight'] = 300;
+
 /*
  * File manager.
  */

+ 36 - 25
main/inc/lib/fckeditor/toolbars/extended/wiki.php

@@ -3,40 +3,51 @@
 // See license terms in chamilo/documentation/license.txt
 
 // Training tools
-// Wiki
+// Documents
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find
+//TODO: DocProps, asciimath don't run ok here. 
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
+
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('FitWindow','Save','NewPage','Templates','PageBreak','Preview','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
-	array('Wikilink','Link','Unlink','Anchor'),
-	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'),
-	array('Table','Rule','Smiley','SpecialChar','googlemaps'),
-	array('FontFormat','FontName','FontSize'),
-	array('Bold','Italic','Underline'),
-	array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),
-	array('Source')
+	array('Save','NewPage','Templates','-','PasteText'),
+	array('Undo','Redo'),
+	array('Wikilink','Link','Image','flvPlayer','Table','mimetex'),
+	array('UnorderedList','OrderedList','Rule'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
+	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
+	array('FitWindow')
 );
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
+
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','DocProps','-','Save','NewPage','Preview','-','Templates'),
-	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor','Wikilink','Glossary'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar','PageBreak'),
-	array('mimetex','asciimath','Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','YouTube','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks','Source')
+	array('Save','NewPage','Templates','-','Preview','Print'),
+	array('Cut','Copy','Paste','PasteText','PasteWord'),
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Wikilink','Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks','Source'),
+	array('FitWindow')
+	
 );
 
 // Sets whether the toolbar can be collapsed/expanded or not.
@@ -67,4 +78,4 @@ else{
 // Here new width and height of the editor may be set.
 // Possible values, examples: 300 , '250' , '100%' , ...
 //$config['Width'] = '100%';
-//$config['Height'] = '400';
+//$config['Height'] = '300';

+ 7 - 4
main/inc/lib/javascript/jquery-ui-css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png


+ 11 - 2
main/install/migrate-db-1.8.7-1.8.8-pre.sql

@@ -58,10 +58,10 @@ INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_spel
 INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_spellcheck', 'false', 'No');
 ALTER TABLE course ADD INDEX idx_course_category_code (category_code);
 ALTER TABLE course ADD INDEX idx_course_directory (directory(10));
-INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('force_wiki_paste_as_plain_text',NULL,'radio','Editor','true','ForceWikiPasteAsPlainText','ForceWikiPasteAsPlainTextComment',NULL,NULL, 0);
+INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('force_wiki_paste_as_plain_text',NULL,'radio','Editor','false','ForceWikiPasteAsPlainText','ForceWikiPasteAsPlainTextComment',NULL,NULL, 0);
 INSERT INTO settings_options (variable, value, display_text) VALUES ('force_wiki_paste_as_plain_text', 'true', 'Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('force_wiki_paste_as_plain_text', 'false', 'No');
-INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('enabled_googlemaps',NULL,'radio','Editor','true','EnabledGooglemapsTitle','EnabledGooglemapsComment',NULL,NULL, 0);
+INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('enabled_googlemaps',NULL,'radio','Editor','false','EnabledGooglemapsTitle','EnabledGooglemapsComment',NULL,NULL, 0);
 INSERT INTO settings_options (variable, value, display_text) VALUES ('enabled_googlemaps', 'true', 'Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('enabled_googlemaps', 'false', 'No');
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('enabled_imgmap',NULL,'radio','Editor','true','EnabledImageMapsTitle','EnabledImageMapsComment',NULL,NULL, 0);
@@ -84,6 +84,15 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value,
 
 ALTER TABLE personal_agenda ADD PRIMARY KEY (id);
 
+UPDATE settings_current SET selected_value='1' WHERE variable='more_buttons_maximized_mode';
+
+INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('enabled_insertHtml',NULL,'radio','Editor','false','EnabledInsertHtmlTitle','EnabledInsertHtmlComment',NULL,NULL, 0);
+INSERT INTO settings_options (variable, value, display_text) VALUES ('enabled_insertHtml', 'true', 'Yes');
+INSERT INTO settings_options (variable, value, display_text) VALUES ('enabled_insertHtml', 'false', 'No');
+
+
+
+
 -- xxSTATSxx
 ALTER TABLE track_e_exercices ADD COLUMN orig_lp_item_view_id INT NOT NULL DEFAULT 0;
 -- xxUSERxx