Julio Montoya 14 years ago
parent
commit
41a34288bd
45 changed files with 344 additions and 310 deletions
  1. 1 0
      documentation/credits.html
  2. 31 31
      main/inc/lib/fckeditor/editor/plugins/insertHtml/fckplugin.js
  3. 57 57
      main/inc/lib/fckeditor/editor/plugins/insertHtml/insertHtml.html
  4. 108 108
      main/inc/lib/fckeditor/editor/plugins/insertHtml/insertHtml.js
  5. 8 0
      main/inc/lib/fckeditor/editor/plugins/insertHtml/lang/bg.js
  6. 3 3
      main/inc/lib/fckeditor/editor/plugins/insertHtml/lang/es.js
  7. 2 2
      main/inc/lib/fckeditor/toolbars/extended/admin_templates.php
  8. 2 2
      main/inc/lib/fckeditor/toolbars/extended/agenda.php
  9. 2 2
      main/inc/lib/fckeditor/toolbars/extended/agenda_student.php
  10. 2 2
      main/inc/lib/fckeditor/toolbars/extended/announcements.php
  11. 2 2
      main/inc/lib/fckeditor/toolbars/extended/announcements_student.php
  12. 34 25
      main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php
  13. 2 2
      main/inc/lib/fckeditor/toolbars/extended/documents.php
  14. 2 2
      main/inc/lib/fckeditor/toolbars/extended/documents_student.php
  15. 2 2
      main/inc/lib/fckeditor/toolbars/extended/faq.php
  16. 2 2
      main/inc/lib/fckeditor/toolbars/extended/forum.php
  17. 2 2
      main/inc/lib/fckeditor/toolbars/extended/forum_student.php
  18. 2 2
      main/inc/lib/fckeditor/toolbars/extended/global_agenda.php
  19. 2 2
      main/inc/lib/fckeditor/toolbars/extended/glossary.php
  20. 2 2
      main/inc/lib/fckeditor/toolbars/extended/introduction.php
  21. 1 1
      main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php
  22. 2 2
      main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php
  23. 1 1
      main/inc/lib/fckeditor/toolbars/extended/messages.php
  24. 2 2
      main/inc/lib/fckeditor/toolbars/extended/notebook.php
  25. 2 2
      main/inc/lib/fckeditor/toolbars/extended/notebook_student.php
  26. 1 1
      main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php
  27. 2 2
      main/inc/lib/fckeditor/toolbars/extended/portal_news.php
  28. 2 2
      main/inc/lib/fckeditor/toolbars/extended/profile.php
  29. 1 1
      main/inc/lib/fckeditor/toolbars/extended/project.php
  30. 1 1
      main/inc/lib/fckeditor/toolbars/extended/project_comment.php
  31. 1 1
      main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php
  32. 1 1
      main/inc/lib/fckeditor/toolbars/extended/project_student.php
  33. 1 1
      main/inc/lib/fckeditor/toolbars/extended/survey.php
  34. 2 2
      main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php
  35. 32 24
      main/inc/lib/fckeditor/toolbars/extended/test_description.php
  36. 2 2
      main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php
  37. 1 1
      main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php
  38. 2 2
      main/inc/lib/fckeditor/toolbars/extended/test_question_description.php
  39. 2 2
      main/inc/lib/fckeditor/toolbars/extended/training_description.php
  40. 2 2
      main/inc/lib/fckeditor/toolbars/extended/wiki.php
  41. 2 2
      main/inc/lib/fckeditor/toolbars/extended/wiki_student.php
  42. 2 2
      main/inc/lib/fckeditor/toolbars/extended/wiki_task.php
  43. 2 2
      main/inc/lib/system_announcements.lib.php
  44. 6 0
      tests/chamilotest.php
  45. 3 1
      tests/main/inc/lib/system_announcements.lib.test.php

+ 1 - 0
documentation/credits.html

@@ -532,6 +532,7 @@ of information requests and organizing great community events</li>
   <li> Anaël Boulier (intern at http://www.2i2l.fr), for his excelent work of writing user documentation in French for 1.8.7</li>
   <li> Alberto Torreblanca for help fixing bugs during code sprint 2011-01-16</li>
   <li> Joel Porras for help fixing bugs during code sprint 2011-01-16</li>
+  <li> Simon Legner for improvements suggestions (first one being #1538)</li>
 </ul>
 
 <h1>Contributing institutions (only registered since 2010)</h1>

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

@@ -1,44 +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()
-	{
-	}
+    // insertHtmlObject constructor
+    var insertHtmlToolbarCommand = function()
+    {
+    }
 
-	// register the command
-	FCKCommands.RegisterCommand('insertHtml', new insertHtmlToolbarCommand());
+    // 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);
+    // 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;
-	}
+    // 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();
-		}
-	}
+    // 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();
+        }
+    }

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

@@ -2,74 +2,74 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 
-	<title>insertHtml</title>
+    <title>insertHtml</title>
 
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
+    <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>
+    <script src="insertHtml.js" type="text/javascript"></script>
+    <script src="../../dialog/common/fck_dialog_common.js" type="text/javascript"></script>
 
-	<style>
+    <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
-		{
-		}
+        #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 */
-		}
+        #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 */
-		}
+        #insertHtmlTextArea
+        {
+            overflow: auto;
+            margin: 0px 25px 40px 0px;
+        }
+        #insertHtmlTextArea,
+        {
+            margin-right: 0px; /* no extra right margin needed in IE */
+        }
 
-	</style>
+    </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>
+    <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>

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

@@ -1,111 +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
-		}
-	}
+    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
+        }
+    }
 

+ 8 - 0
main/inc/lib/fckeditor/editor/plugins/insertHtml/lang/bg.js

@@ -0,0 +1,8 @@
+/*
+ * Translator: Ivan Tcholakov, ivantcholakov@gmail.com, 2011
+ * Bulgarian language file.
+ * Encoding: UTF-8
+ */
+FCKLang.inserHTML_buttonTooltip = 'Вмъкване на HTML код';
+FCKLang.insertHtml_dialogTitle  = 'Вмъкване на HTML код';
+FCKLang.inserHtml_help          = 'Въведете по-долу вашия HTML код и натиснете бутона "Добре (OK)", за вмъкване в редактирания текст на съответното място.';

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

@@ -1,6 +1,6 @@
 
 
-	FCKLang.inserHTML_buttonTooltip					= 'Insertar Widget';
-	FCKLang.insertHtml_dialogTitle						= 'Insertar Widget';
-	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 cursor en el editor.';
+    FCKLang.inserHTML_buttonTooltip					= 'Insertar Widget';
+    FCKLang.insertHtml_dialogTitle						= 'Insertar Widget';
+    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 cursor en el editor.';
 

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/admin_templates.php

@@ -22,8 +22,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/agenda.php

@@ -22,8 +22,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter'),
 	array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/agenda_student.php

@@ -24,8 +24,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter'),
 	array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/announcements.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/announcements_student.php

@@ -24,8 +24,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 34 - 25
main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php

@@ -7,38 +7,47 @@
 
 // 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: Check size and DocProps, fckeditor_wiris_openFormulaEditor,fckeditor_wiris_openCAS buttons.
+
+// 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('Save','FitWindow','-','PasteWord','-','Undo','Redo'),
-    array('Link','Unlink','Anchor'),
-    array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-    array('TableOC','SpecialChar'),
-    array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),
-    '/',
-    array('Style','FontFormat','FontName','FontSize'),
-    array('Bold','Italic','Underline'),
-    array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-    array('Source')
+    array('Save','NewPage','Templates','-','PasteWord'),
+    array('Undo','Redo'),
+    array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+    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','Save','NewPage','Preview'),
-	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar'),
-	array('Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('TableOC','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('Link','Unlink','Anchor','Glossary'),
+    array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg'),
+'/',
+    array('TableOC','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.

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/documents.php

@@ -22,8 +22,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
     array('Save','NewPage','Templates','-','PasteWord'),
     array('Undo','Redo'),
-    array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-    array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+    array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+    array('UnorderedList','OrderedList','Rule'),
     array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
     array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
     array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/documents_student.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/faq.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/forum.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/forum_student.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/global_agenda.php

@@ -20,8 +20,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter'),
 	array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/glossary.php

@@ -21,8 +21,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/introduction.php

@@ -22,8 +22,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
     array('Save','NewPage','Templates','-','PasteWord'),
     array('Undo','Redo'),
-    array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-    array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+    array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+    array('UnorderedList','OrderedList','Rule'),
     array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
     array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
     array('FitWindow')

+ 1 - 1
main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php

@@ -21,7 +21,7 @@ else{
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
     //array('PasteWord'),
-    //array('Link','Image','flvPlayer','mimetex'),
+    //array('Link','Image','EmbedMovies','Flash','MP3','mimetex'),
 	//array('TableOC'),
     //array('OrderedList','Rule'),
     //array('JustifyFull'),

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
     array('NewPage','Templates','-','PasteWord'),
     array('Undo','Redo'),
-    array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-    array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+    array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+    array('UnorderedList','OrderedList','Rule'),
     array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
     array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
     array('FitWindow')

+ 1 - 1
main/inc/lib/fckeditor/toolbars/extended/messages.php

@@ -23,7 +23,7 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
 	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter'),
 	array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'),

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/notebook.php

@@ -22,8 +22,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/notebook_student.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 1 - 1
main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php

@@ -23,7 +23,7 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
 	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/portal_news.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/profile.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 1 - 1
main/inc/lib/fckeditor/toolbars/extended/project.php

@@ -23,7 +23,7 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'),
 	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'),

+ 1 - 1
main/inc/lib/fckeditor/toolbars/extended/project_comment.php

@@ -21,7 +21,7 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'),
 	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'),

+ 1 - 1
main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php

@@ -23,7 +23,7 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'),
 	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'),

+ 1 - 1
main/inc/lib/fckeditor/toolbars/extended/project_student.php

@@ -22,7 +22,7 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'),
 	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'),

+ 1 - 1
main/inc/lib/fckeditor/toolbars/extended/survey.php

@@ -24,7 +24,7 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
 	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontSize','Bold','Italic','Underline','TextColor','BGColor'),

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
     array('NewPage','Templates','-','PasteWord'),
     array('Undo','Redo'),
-    array('Link','Image','flvPlayer','TableOC','mimetex'),
-    array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+    array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex'),
+    array('UnorderedList','OrderedList','Rule'),
     array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
     array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
     array('FitWindow')

+ 32 - 24
main/inc/lib/fckeditor/toolbars/extended/test_description.php

@@ -6,38 +6,46 @@
 // Test description
 
 // 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: Check size and DocProps, fckeditor_wiris_openFormulaEditor,fckeditor_wiris_openCAS
+
+// 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','-','PasteWord','-','Undo','Redo'),
-    array('Link','Unlink','Anchor'),
-    array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-    array('Table','SpecialChar'),
-    array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor','-','Source'),
-    '/',
-    array('Style','FontFormat','FontName','FontSize'),
-    array('Bold','Italic','Underline'),
-    array('JustifyLeft','JustifyCenter','JustifyRight')
+    array('Save','NewPage','Templates','-','PasteWord'),
+    array('Undo','Redo'),
+    array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+    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','Save','NewPage','Preview'),
-	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar'),
-	array('mimetex','Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','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('Link','Unlink','Anchor','Glossary'),
+    array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg'),
+'/',
+    array('TableOC','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.

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php

@@ -24,8 +24,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteText'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 1 - 1
main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php

@@ -23,7 +23,7 @@ $config['ToolbarSets']['Normal'] = array(
     array('Templates'),
 	array('PasteWord'),
 	array('Link'),
-	array('Image','flvPlayer','mimetex','asciimath','asciisvg'),
+	array('Image','EmbedMovies','Flash','MP3','mimetex','asciimath','asciisvg'),
 	array('TableOC'),
 	array('Bold'),
 	array('FitWindow')	

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/test_question_description.php

@@ -22,8 +22,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Unlink','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),	
-   	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Unlink','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),	
+   	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/training_description.php

@@ -22,8 +22,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

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

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteText'),
 	array('Undo','Redo'),
-	array('Wikilink','Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Wikilink','Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/wiki_student.php

@@ -24,8 +24,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteText'),
 	array('Undo','Redo'),
-	array('Wikilink','Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Wikilink','Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/fckeditor/toolbars/extended/wiki_task.php

@@ -23,8 +23,8 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','TableOC','mimetex'),
-	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex'),
+	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyFull'),
 	array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

+ 2 - 2
main/inc/lib/system_announcements.lib.php

@@ -433,6 +433,7 @@ class SystemAnnouncementManager
 	 * @param	int		Whether to send to all teachers (1) or not (0)
 	 * @param	int		Whether to send to all students (1) or not (0)
 	 * @param	string	Language (optional, considered for all languages if left empty)
+     * @return  bool    True if the message was sent or there was no destination matching. False on database or e-mail sending error.
 	 */
 	public static function send_system_announcement_by_email($title, $content, $teacher, $student, $language=null) {
 		global $_user;
@@ -460,8 +461,7 @@ class SystemAnnouncementManager
 		}		
 		$sql .= " AND access_url_id = '".$current_access_url_id."' ";
 		
-		
-		if ($teacher == '0' AND $student == '0') {
+		if ((empty($teacher) or $teacher == '0') AND  (empty($student) or $student == '0')) {
 			return true;
 		}
 		$result = Database::query($sql);

+ 6 - 0
tests/chamilotest.php

@@ -0,0 +1,6 @@
+<?php require_once('../main/inc/global.inc.php');
+
+var_dump(api_is_windows_os());
+
+//echo (api_is_windows_os()?'true':'false');
+?>

+ 3 - 1
tests/main/inc/lib/system_announcements.lib.test.php

@@ -72,6 +72,8 @@ class TestSystemAnnouncementManager extends UnitTestCase {
 		$this->assertTrue($res);
 	}
 
+    //Test removed until we can make sure the e-mail is sent to a valid e-mail address, otherwise the function returns false because the e-mail sending fails
+    /*
 	function test_send_system_announcement_by_email_is_true_on_teacher_not_null() {
 		global $_user, $_setting, $charset;
 		$title   = 'abc';
@@ -80,7 +82,7 @@ class TestSystemAnnouncementManager extends UnitTestCase {
 		$teacher = 1;
 		$res=SystemAnnouncementManager::send_system_announcement_by_email($title,$content,$teacher, $student);
 		$this->assertTrue($res);
-	}
+	}*/
 
 	function test_set_visibility() {
 		$announcement_id = $user = $visible='';