diff --git a/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php b/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php index ffb83fcb0d..4e8a137aa6 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php +++ b/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php @@ -22,7 +22,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex','asciimath'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), @@ -36,7 +36,7 @@ $config['ToolbarSets']['Maximized'] = array( 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','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg','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'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/agenda.php b/main/inc/lib/fckeditor/toolbars/extended/agenda.php index a964efd8e0..9a02840b62 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/agenda.php +++ b/main/inc/lib/fckeditor/toolbars/extended/agenda.php @@ -8,8 +8,7 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options //NOTE: Doesn't include Replace because it is redundant, being in the same tab to Find -//TODO: DocProps, 'asciimath' don't run here. -//NOTE: Don't include 'JustifyRight','JustifyFull' 'FontSize',into single bar due to reasons of space to display +//TODO: DocProps doesn`t run here. // Hide/show SpellCheck buttom if ((api_get_setting('allow_spellcheck') == 'true')) { @@ -23,7 +22,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter'), array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'), @@ -37,7 +36,7 @@ $config['ToolbarSets']['Maximized'] = array( 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','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg','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'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php b/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php index b45b03c451..ff40bbaf6d 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php @@ -8,7 +8,7 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options //NOTE: Doesn't include Replace because it is redundant, being in the same tab to Find -//TODO: DocProps, 'asciimath' don't run here. +//TODO: DocProps does not run here. //NOTE: Don't include 'JustifyRight','JustifyFull' 'FontSize',into single bar due to reasons of space to display //NOTE: ONLY FOR TEACHERS: source, insert html @@ -24,7 +24,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter'), array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'), @@ -38,7 +38,7 @@ $config['ToolbarSets']['Maximized'] = array( 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','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','asciimath','asciisvg','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'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/announcements.php b/main/inc/lib/fckeditor/toolbars/extended/announcements.php index f7ffde0dd8..46f704d116 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/announcements.php +++ b/main/inc/lib/fckeditor/toolbars/extended/announcements.php @@ -8,7 +8,7 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options //NOTE: Doesn't include Replace because it is redundant, being in the same tab to Find -//TODO: DocProps, ASCIIMath don't run ok here. +//TODO: DocProps does not run ok here. Care if the page is mailed=>review some buttons //NOTE: Doesn't include Save button due to usability reasons in the form. // Hide/show SpellCheck buttom @@ -23,7 +23,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), @@ -37,7 +37,7 @@ $config['ToolbarSets']['Maximized'] = array( 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','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg','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'), @@ -47,7 +47,6 @@ $config['ToolbarSets']['Maximized'] = array( array('Style','FontFormat','FontName','FontSize'), array('PageBreak','ShowBlocks','Source'), array('FitWindow') - ); // Sets whether the toolbar can be collapsed/expanded or not. diff --git a/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php b/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php index 529e3932e0..ab9be967b2 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php @@ -8,7 +8,7 @@ // 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. +//TODO: DocProps, does not run ok here. //NOTE: ONLY FOR TEACHERS: source, insert html //NOTE: Doesn't include Save button due to usability reasons in the form. @@ -24,7 +24,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), @@ -38,7 +38,7 @@ $config['ToolbarSets']['Maximized'] = array( 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','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','asciimath','asciisvg','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'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/documents.php b/main/inc/lib/fckeditor/toolbars/extended/documents.php index d7fbccd489..7aceaf7645 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/documents.php +++ b/main/inc/lib/fckeditor/toolbars/extended/documents.php @@ -7,7 +7,7 @@ // 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 +//NOTE: Does not include Replace because it is redundant, being in the same tab to Find. //TODO: DocProps, fckeditor_wiris_openFormulaEditor,fckeditor_wiris_openCAS don't run ok here. // Hide/show SpellCheck buttom diff --git a/main/inc/lib/fckeditor/toolbars/extended/documents_student.php b/main/inc/lib/fckeditor/toolbars/extended/documents_student.php index 4a3c97b143..c7d1d12130 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/documents_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/documents_student.php @@ -23,7 +23,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex','asciimath'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), @@ -37,7 +37,7 @@ $config['ToolbarSets']['Maximized'] = array( 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'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg'), '/', array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/faq.php b/main/inc/lib/fckeditor/toolbars/extended/faq.php index af3e14e840..682a6fb02a 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/faq.php +++ b/main/inc/lib/fckeditor/toolbars/extended/faq.php @@ -9,7 +9,7 @@ // This is the visible toolbar set when the editor has "normal" size. //NOTE: Doesn't include Replace because it is redundant, being in the same tab to Find -//TODO: DocProps, asciimath don't run ok here. +//TODO: DocProps, 'asciimath','asciisvg' don't run ok here. // Hide/show SpellCheck buttom if ((api_get_setting('allow_spellcheck') == 'true')) { diff --git a/main/inc/lib/fckeditor/toolbars/extended/forum.php b/main/inc/lib/fckeditor/toolbars/extended/forum.php index 99cf0c7760..759801a5af 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/forum.php +++ b/main/inc/lib/fckeditor/toolbars/extended/forum.php @@ -7,37 +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: DocProps does not run ok here. Button templates: lost templates styles + +// 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('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','flvPlayer','Table','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('JustifyLeft','JustifyCenter','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','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('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/forum_student.php b/main/inc/lib/fckeditor/toolbars/extended/forum_student.php index d1c83aa3e7..d2ddc72439 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/forum_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/forum_student.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: DocProps does not run ok here. Button templates: lost templates styles + +// 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('Table','SpecialChar'), - array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('ShowBlocks') + array('Save','NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('JustifyLeft','JustifyCenter','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('Save','NewPage','Templates','-','Preview','Print'), array('Cut','Copy','Paste','PasteText','PasteWord'), - 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','googlemaps','Smiley'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'), - array('ShowBlocks') + array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'), + array('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','asciimath','asciisvg','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'), + array('FitWindow') ); // Sets whether the toolbar can be collapsed/expanded or not. diff --git a/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php b/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php index f5798c7ec9..0758b7cd27 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php +++ b/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php @@ -6,8 +6,7 @@ // Global Agenda //NOTE: Doesn't include Replace because it is redundant, being in the same tab to Find -//TODO: DocProps, 'asciimath' don't run here. -//NOTE: Don't include ' 'JustifyRight','JustifyFull' 'FontSize',into single bar due to reasons of space to display +//TODO: DocProps doesn`t run here. // Hide/show SpellCheck buttom if ((api_get_setting('allow_spellcheck') == 'true')) { @@ -21,7 +20,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter'), array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'), @@ -35,7 +34,7 @@ $config['ToolbarSets']['Maximized'] = array( 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','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg','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'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/glossary.php b/main/inc/lib/fckeditor/toolbars/extended/glossary.php index f597722498..dc1bc9578e 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/glossary.php +++ b/main/inc/lib/fckeditor/toolbars/extended/glossary.php @@ -7,37 +7,45 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options +//TODO: DocProps does not 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('Save','FitWindow','PasteWord','-','Undo','Redo'), - array('Link','Unlink','Anchor'), - array('Image','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','flvPlayer','Table','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('JustifyLeft','JustifyCenter','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','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('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/introduction.php b/main/inc/lib/fckeditor/toolbars/extended/introduction.php index 0dcbf74ee1..856a70dcc9 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/introduction.php +++ b/main/inc/lib/fckeditor/toolbars/extended/introduction.php @@ -8,7 +8,7 @@ // 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. Templates loses styles +//TODO: DocProps does not run ok here. Templates loses styles // Hide/show SpellCheck buttom if ((api_get_setting('allow_spellcheck') == 'true')) { diff --git a/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php b/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php index 26e6793f73..c4b6d955b2 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php +++ b/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php @@ -7,29 +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. To be a sensitive site, do not enable extended bar +//TODO: DocProps does not run. Many buttons don't run here. needs an overhaul + +// 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('Link','Unlink','Bold','Italic','TextColor','BGColor','Source') + //array('PasteWord'), + //array('Link','Image','flvPlayer','mimetex'), + //array('Table'), + //array('OrderedList','Rule'), + //array('JustifyFull'), + //array('Bold','Italic','Underline','TextColor','BGColor'), + array('Link','Unlink','Bold','Italic','TextColor','BGColor','Source'), + 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','NewPage','Preview'), - array('Cut','Copy','Paste','PasteText','PasteWord'), - 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('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'), - array('ShowBlocks') + //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('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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php b/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php index 32cc313191..3e13307a03 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php +++ b/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php @@ -7,35 +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: DocProps, Save, fckeditor_wiris_openFormulaEditor,fckeditor_wiris_openCAS 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. // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('PasteWord','-','Undo','Redo'), - array('Link','Unlink','Anchor','Glossary'), - array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath','asciisvg','Table','SpecialChar'), - array('Outdent','Indent','TextColor','BGColor','-','OrderedList','UnorderedList','JustifyLeft','JustifyCenter','JustifyRight'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('Bold','Italic','Underline','-','Source'), -);//save, FitWindow don't run well here + array('NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + 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','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','asciisvg','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('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg'), +'/', + 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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/messages.php b/main/inc/lib/fckeditor/toolbars/extended/messages.php index d9f8d62904..42e444565c 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/messages.php +++ b/main/inc/lib/fckeditor/toolbars/extended/messages.php @@ -7,37 +7,46 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options +//NOTE: Doesn't include Replace because it is redundant, being in the same tab to Find +//TODO: DocProps does not run ok here. Care if the page is mailed=>review some buttons +//NOTE: Doesn't include Save button due to usability reasons in the form. + +// 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('Link','Unlink'), - array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), - array('Table','Smiley'), - array('TextColor','BGColor'), - array('Source'), - '/', - array('FontName','FontSize'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList') +$config['ToolbarSets']['Normal'] = array( + array('NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), + array('JustifyLeft','JustifyCenter'), + array('FontFormat','FontName','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','NewPage','Preview'), + array('NewPage','Templates','-','Preview','Print'), array('Cut','Copy','Paste','PasteText','PasteWord'), - 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','googlemaps','Smiley'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'), - array('ShowBlocks') + 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','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/notebook.php b/main/inc/lib/fckeditor/toolbars/extended/notebook.php index 249105c805..060f2783ae 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/notebook.php +++ b/main/inc/lib/fckeditor/toolbars/extended/notebook.php @@ -8,7 +8,7 @@ // 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. +//TODO: DocProps does not run ok here. // Hide/show SpellCheck buttom if ((api_get_setting('allow_spellcheck') == 'true')) { @@ -22,7 +22,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), @@ -36,7 +36,7 @@ $config['ToolbarSets']['Maximized'] = array( 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','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg','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'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php b/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php index a3da1d5046..8055b59fd4 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php @@ -8,7 +8,7 @@ // 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. +//TODO: DocProps does not run ok here. //NOTE: ONLY FOR TEACHERS: source, insert html // Hide/show SpellCheck buttom @@ -23,7 +23,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), @@ -37,7 +37,7 @@ $config['ToolbarSets']['Maximized'] = array( 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','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','asciimath','asciisvg','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'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php b/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php index 8f0e730c2f..255b6512e6 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php +++ b/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php @@ -7,37 +7,46 @@ // 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 does not 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('NewPage','Templates','Save','Print','PageBreak','FitWindow','-','PasteWord','-','Undo','Redo','-','SelectAll','-','Find'), - array('Link','Unlink','Anchor'), - array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), - array('Table','Smiley','SpecialChar','googlemaps'), - '/', - array('FontFormat','FontName','FontSize'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'), - array('Source') + array('Save','NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('JustifyLeft','JustifyCenter','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','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('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/portal_news.php b/main/inc/lib/fckeditor/toolbars/extended/portal_news.php index e5ea46476a..1a12e7854d 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/portal_news.php +++ b/main/inc/lib/fckeditor/toolbars/extended/portal_news.php @@ -7,37 +7,46 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options +//NOTE: Doesn't include Replace because it is redundant, being in the same tab to Find +//TODO: DocProps does not run ok here. Care if the page is mailed=>review some buttons +//NOTE: Doesn't include Save button due to usability reasons in the form. + +// 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('Table','SpecialChar'), - array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor','-','Source'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','JustifyRight') + array('NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + 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','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('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','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/profile.php b/main/inc/lib/fckeditor/toolbars/extended/profile.php index 0015d20184..c952c7af45 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/profile.php +++ b/main/inc/lib/fckeditor/toolbars/extended/profile.php @@ -7,37 +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. Usability: doenst show save buttom + +//TODO: DocProps does not run ok here. Also 'asciisvg' buttom (their presence means that not all forms can unfold and refold) + +// 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','Smiley'), - '/', - array('FontName','FontSize'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), - array('Source') + array('NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('JustifyLeft','JustifyCenter','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','NewPage','Preview'), + array('NewPage','Templates','-','Preview','Print'), array('Cut','Copy','Paste','PasteText','PasteWord'), - 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('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'), - array('ShowBlocks') + 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','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/project.php b/main/inc/lib/fckeditor/toolbars/extended/project.php index d50fa7f245..b990e6e9b5 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/project.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project.php @@ -7,36 +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: DocProps does not run ok here. asciisvg' disabled because sometimes lock the toolbar. + +// 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','googlemaps'), - array('FontName','FontSize'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), - array('Source') + array('Save','NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath'), + array('UnorderedList','OrderedList','Rule'), + array('JustifyLeft','JustifyCenter','JustifyFull'), + array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'), + 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','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('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/project_comment.php b/main/inc/lib/fckeditor/toolbars/extended/project_comment.php index 2b31e9b196..9b26e2d0e3 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/project_comment.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project_comment.php @@ -7,35 +7,45 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options +//TODO: DocProps does not run ok here. asciisvg' disabled because sometimes lock the toolbar + +// 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'), - array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), - array('Table','googlemaps'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), - array('Source') + array('Save','NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath'), + array('UnorderedList','OrderedList','Rule'), + array('JustifyLeft','JustifyCenter','JustifyFull'), + array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'), + 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','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('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php b/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php index ff744be745..c69b1e268d 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php @@ -7,35 +7,47 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options +// This is the visible toolbar set when the editor has "normal" size. +//TODO: DocProps does not run ok here. asciisvg' disabled because sometimes lock the toolbar +//NOTE: ONLY FOR TEACHERS: source, insert html + +// 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'), - array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), - array('Table','googlemaps'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), - array('ShowBlocks') + array('Save','NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath'), + array('UnorderedList','OrderedList','Rule'), + array('JustifyLeft','JustifyCenter','JustifyFull'), + array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'), + 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('Save','NewPage','Templates','-','Preview','Print'), array('Cut','Copy','Paste','PasteText','PasteWord'), - 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('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'), - array('ShowBlocks') + array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'), + array('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','asciimath','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'), + array('FitWindow') ); // Sets whether the toolbar can be collapsed/expanded or not. diff --git a/main/inc/lib/fckeditor/toolbars/extended/project_student.php b/main/inc/lib/fckeditor/toolbars/extended/project_student.php index 288ae6dbbb..d7ad71f6a6 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/project_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project_student.php @@ -7,36 +7,46 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options +//TODO: DocProps does not run ok here. asciisvg' disabled because sometimes lock the toolbar. +//NOTE: ONLY FOR TEACHERS: source, insert html + +// 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','googlemaps'), - array('FontName','FontSize'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), - array('ShowBlocks') + array('Save','NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath'), + array('UnorderedList','OrderedList','Rule'), + array('JustifyLeft','JustifyCenter','JustifyFull'), + array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'), + 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('Save','NewPage','Templates','-','Preview','Print'), array('Cut','Copy','Paste','PasteText','PasteWord'), - 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('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'), - array('ShowBlocks') + array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'), + array('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','asciimath','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'), + array('FitWindow') ); // Sets whether the toolbar can be collapsed/expanded or not. diff --git a/main/inc/lib/fckeditor/toolbars/extended/survey.php b/main/inc/lib/fckeditor/toolbars/extended/survey.php index beb9ccd982..bde1b72079 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/survey.php +++ b/main/inc/lib/fckeditor/toolbars/extended/survey.php @@ -7,36 +7,48 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options +// This is the visible toolbar set when the editor has "normal" size. +//NOTE: Does not include Replace because it is redundant, being in the same tab to Find. Usability: Hide save button. + +//TODO: DocProps does not 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'), - array('Link','Unlink'), - array('Image'), - array('Table'), - array('FontSize'), - array('Bold','Italic'), - array('OrderedList','UnorderedList','-','TextColor'), - array('Source') + array('NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), + array('JustifyLeft','JustifyCenter','JustifyFull'), + array('FontFormat','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','NewPage','Preview'), + array('NewPage','Templates','-','Preview','Print'), array('Cut','Copy','Paste','PasteText','PasteWord'), - 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('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'), - array('ShowBlocks','Source') + 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','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php b/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php index ca99cbcdbf..fdc1e32291 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php @@ -7,23 +7,48 @@ // 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. Usability: Save button disabled +//NOTE: ONLY FOR TEACHERS: source, insert html + +//TODO: DocProps does not run ok here. Sometime 'asciisvg' lock the tool bar + +// 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','Bold','Image','Link','PasteWord','MP3','mimetex','Table','Subscript','Superscript','ShowBlocks') + array('NewPage','Templates','-','PasteText'), + array('Undo','Redo'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('JustifyLeft','JustifyCenter','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'), - array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('SpecialChar','mimetex') + array('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','mimetex','asciimath','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'), + array('FitWindow') ); // Sets whether the toolbar can be collapsed/expanded or not. diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php b/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php index 78eeba1b3b..2829b04375 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php @@ -7,23 +7,45 @@ // 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. Usability: disabled save button +//TODO: DocProps, does 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','Bold','Image','Link','PasteWord','MP3','mimetex','Table','Subscript','Superscript','Source') + array('Templates'), + array('PasteWord'), + array('Link'), + array('Image','flvPlayer','mimetex','asciimath','asciisvg'), + array('Table'), + array('Bold'), + 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'), - array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('SpecialChar','mimetex') + array('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','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php b/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php index e8a13b4611..725ec0710d 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php @@ -6,38 +6,47 @@ // Test, question 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. Usability: disabled save button (new test) + +//TODO: DocProps, asciimath don't run ok here. Unlink button after link button is mandatory + +// 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'), - 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('NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Unlink','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + 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('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','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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/training_description.php b/main/inc/lib/fckeditor/toolbars/extended/training_description.php index 2420105356..bb03a49acd 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/training_description.php +++ b/main/inc/lib/fckeditor/toolbars/extended/training_description.php @@ -8,7 +8,7 @@ // 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. Templates loses styles +//TODO: DocProps, does run ok here. Templates loses styles // Hide/show SpellCheck buttom if ((api_get_setting('allow_spellcheck') == 'true')) { @@ -22,7 +22,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','Table','mimetex'), + array('Link','Image','flvPlayer','Table','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), @@ -36,7 +36,7 @@ $config['ToolbarSets']['Maximized'] = array( 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','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg','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'), @@ -45,8 +45,7 @@ $config['ToolbarSets']['Maximized'] = array( array($VSpellCheck), array('Style','FontFormat','FontName','FontSize'), array('PageBreak','ShowBlocks','Source'), - array('FitWindow') - + array('FitWindow') ); // Sets whether the toolbar can be collapsed/expanded or not. diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki.php b/main/inc/lib/fckeditor/toolbars/extended/wiki.php index 93eddc8c9f..06114b3253 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki.php @@ -9,7 +9,7 @@ //NOTE: Does not include Replace because it is redundant, being in the same tab to Find -//TODO: DocProps, asciimath don't run ok here. +//TODO: DocProps does not run ok here. // Hide/show SpellCheck buttom if ((api_get_setting('allow_spellcheck') == 'true')) { @@ -47,8 +47,7 @@ $config['ToolbarSets']['Maximized'] = array( array($VSpellCheck), array('Style','FontFormat','FontName','FontSize'), array('PageBreak','ShowBlocks','Source'), - array('FitWindow') - + array('FitWindow') ); // Sets whether the toolbar can be collapsed/expanded or not. diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki_feedback.php b/main/inc/lib/fckeditor/toolbars/extended/wiki_feedback.php index 9dc82df7a2..88d830ff38 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki_feedback.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki_feedback.php @@ -9,7 +9,8 @@ //NOTE: Does not include Replace because it is redundant, being in the same tab to Find. -//TODO: DocProps, asciimath don't run ok here. +//TODO: DocProps, asciimath don't run ok here + // Hide/show SpellCheck buttom if ((api_get_setting('allow_spellcheck') == 'true')) { diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php b/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php index 5ca4634140..1992c02726 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php @@ -34,11 +34,11 @@ $config['ToolbarSets']['Normal'] = array( // 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('Save','NewPage','-','Preview','Print'), + 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','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','asciimath','asciisvg','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'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php b/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php index 9e513783e9..b18f6dd1c9 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php @@ -9,7 +9,7 @@ //NOTE: Does not include Replace because it is redundant, being in the same tab to Find. -//TODO: DocProps, asciimath don't run ok here. +//TODO: DocProps, asciimath, asciisvg don't run ok here. // Hide/show SpellCheck buttom if ((api_get_setting('allow_spellcheck') == 'true')) { @@ -21,11 +21,11 @@ else{ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('NewPage','Templates','-','PasteText'), + array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), array('Link','Image','flvPlayer','Table','mimetex'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), + array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') );