diff --git a/lib/editor/atto/plugins/bold/lib.php b/lib/editor/atto/plugins/bold/lib.php index 35d97c80b09..823a6a0bbce 100644 --- a/lib/editor/atto/plugins/bold/lib.php +++ b/lib/editor/atto/plugins/bold/lib.php @@ -31,18 +31,18 @@ defined('MOODLE_INTERNAL') || die(); function atto_bold_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('bold', get_string('bold', 'atto_bold'), 'atto_bold', array('class'=>'icon')); + $icon = $OUTPUT->pix_icon('e/bold', get_string('bold', 'atto_bold'), 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_bold-button', 'M.atto_bold.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_bold_sort_order() { return 0; diff --git a/lib/editor/atto/plugins/bold/pix/bold.png b/lib/editor/atto/plugins/bold/pix/bold.png deleted file mode 100644 index 57ee78ee4ba..00000000000 Binary files a/lib/editor/atto/plugins/bold/pix/bold.png and /dev/null differ diff --git a/lib/editor/atto/plugins/bold/pix/bold.svg b/lib/editor/atto/plugins/bold/pix/bold.svg deleted file mode 100644 index b4a76d1f7b2..00000000000 --- a/lib/editor/atto/plugins/bold/pix/bold.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - b - - diff --git a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js index 210bb078c8e..254c68dffd8 100644 --- a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js +++ b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js @@ -32,7 +32,7 @@ M.atto_bold = M.atto_bold || { document.execCommand('bold', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js index e843f39d8f3..14ec201a10e 100644 --- a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js +++ b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_bold-button",function(e,t){M.atto_bold=M.atto_bold||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("bold",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"bold",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_bold-button",function(e,t){M.atto_bold=M.atto_bold||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("bold",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"bold",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js index 210bb078c8e..254c68dffd8 100644 --- a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js +++ b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js @@ -32,7 +32,7 @@ M.atto_bold = M.atto_bold || { document.execCommand('bold', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/bold/yui/src/button/js/button.js b/lib/editor/atto/plugins/bold/yui/src/button/js/button.js index 5648d91eb6e..0522419dc0d 100644 --- a/lib/editor/atto/plugins/bold/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/bold/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_bold = M.atto_bold || { document.execCommand('bold', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/clear/lib.php b/lib/editor/atto/plugins/clear/lib.php index 0e2081c427b..f62f633ebe9 100644 --- a/lib/editor/atto/plugins/clear/lib.php +++ b/lib/editor/atto/plugins/clear/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_clear_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('clear', + $icon = $OUTPUT->pix_icon('e/clear_formatting', get_string('clear', 'atto_clear'), - 'atto_clear', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_clear-button', 'M.atto_clear.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'clear')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_clear_sort_order() { return 10; diff --git a/lib/editor/atto/plugins/clear/pix/clear.png b/lib/editor/atto/plugins/clear/pix/clear.png deleted file mode 100644 index 7f5815b42bb..00000000000 Binary files a/lib/editor/atto/plugins/clear/pix/clear.png and /dev/null differ diff --git a/lib/editor/atto/plugins/clear/pix/clear.svg b/lib/editor/atto/plugins/clear/pix/clear.svg deleted file mode 100644 index cce05ef496e..00000000000 --- a/lib/editor/atto/plugins/clear/pix/clear.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js index bcfb7042794..0efa72c4d43 100644 --- a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js +++ b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js @@ -32,7 +32,7 @@ M.atto_clear = M.atto_clear || { document.execCommand('removeFormat', false); }; - M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js index 7716f7bf93b..4a1ad9753bc 100644 --- a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js +++ b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_clear-button",function(e,t){M.atto_clear=M.atto_clear||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("removeFormat",!1)};M.editor_atto.add_toolbar_button(e.elementid,"clear",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_clear-button",function(e,t){M.atto_clear=M.atto_clear||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("removeFormat",!1)};M.editor_atto.add_toolbar_button(e.elementid,"clear",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js index bcfb7042794..0efa72c4d43 100644 --- a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js +++ b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js @@ -32,7 +32,7 @@ M.atto_clear = M.atto_clear || { document.execCommand('removeFormat', false); }; - M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/clear/yui/src/button/js/button.js b/lib/editor/atto/plugins/clear/yui/src/button/js/button.js index 0430f8b07f0..77d6d1ecc4c 100644 --- a/lib/editor/atto/plugins/clear/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/clear/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_clear = M.atto_clear || { document.execCommand('removeFormat', false); }; - M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/html/lib.php b/lib/editor/atto/plugins/html/lib.php index f97ed33a837..997585e472c 100644 --- a/lib/editor/atto/plugins/html/lib.php +++ b/lib/editor/atto/plugins/html/lib.php @@ -31,18 +31,18 @@ defined('MOODLE_INTERNAL') || die(); function atto_html_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('html', get_string('html', 'atto_html'), 'atto_html', array('class'=>'icon')); + $icon = $OUTPUT->pix_icon('e/source_code', get_string('html', 'atto_html'), 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_html-button', 'M.atto_html.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'html')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return array groupname followed by the absolute position within the toolbar */ function atto_html_sort_order() { return 15; diff --git a/lib/editor/atto/plugins/html/pix/html.png b/lib/editor/atto/plugins/html/pix/html.png deleted file mode 100644 index 0623bd748d7..00000000000 Binary files a/lib/editor/atto/plugins/html/pix/html.png and /dev/null differ diff --git a/lib/editor/atto/plugins/html/pix/html.svg b/lib/editor/atto/plugins/html/pix/html.svg deleted file mode 100644 index fa06412c0ac..00000000000 --- a/lib/editor/atto/plugins/html/pix/html.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - media/svg+xml - - - - - - - </> - - diff --git a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js index 8b32aadd636..d69df9698ce 100644 --- a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js +++ b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js @@ -51,7 +51,7 @@ M.atto_html = M.atto_html || { M.atto_html.ishtml = !M.atto_html.ishtml; }; - M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js index bf8e2cc7de3..d22d6508334 100644 --- a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js +++ b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_html-button",function(e,t){M.atto_html=M.atto_html||{ishtml:!1,init:function(t){var n=function(t,n){t.preventDefault();var r=e.one("#"+n),i=e.one("#"+n+"editable");M.atto_html.ishtml?(M.editor_atto.enable_all_widgets(n),i.setHTML(""),i.append(r.get("value")),r.hide(),i.show()):(M.editor_atto.disable_all_widgets(n),M.editor_atto.enable_widget(n,"html"),r.set("value",i.getHTML()),i.hide(),r.show()),M.atto_html.ishtml=!M.atto_html.ishtml};M.editor_atto.add_toolbar_button(t.elementid,"html",t.icon,n)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_html-button",function(e,t){M.atto_html=M.atto_html||{ishtml:!1,init:function(t){var n=function(t,n){t.preventDefault();var r=e.one("#"+n),i=e.one("#"+n+"editable");M.atto_html.ishtml?(M.editor_atto.enable_all_widgets(n),i.setHTML(""),i.append(r.get("value")),r.hide(),i.show()):(M.editor_atto.disable_all_widgets(n),M.editor_atto.enable_widget(n,"html"),r.set("value",i.getHTML()),i.hide(),r.show()),M.atto_html.ishtml=!M.atto_html.ishtml};M.editor_atto.add_toolbar_button(t.elementid,"html",t.icon,t.group,n)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js index 8b32aadd636..d69df9698ce 100644 --- a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js +++ b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js @@ -51,7 +51,7 @@ M.atto_html = M.atto_html || { M.atto_html.ishtml = !M.atto_html.ishtml; }; - M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/html/yui/src/button/js/button.js b/lib/editor/atto/plugins/html/yui/src/button/js/button.js index 18520ed679d..5b030ad77c2 100644 --- a/lib/editor/atto/plugins/html/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/html/yui/src/button/js/button.js @@ -49,6 +49,6 @@ M.atto_html = M.atto_html || { M.atto_html.ishtml = !M.atto_html.ishtml; }; - M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'html', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/image/lib.php b/lib/editor/atto/plugins/image/lib.php index ed4a2b96eb0..c25c4ec3e48 100644 --- a/lib/editor/atto/plugins/image/lib.php +++ b/lib/editor/atto/plugins/image/lib.php @@ -31,9 +31,9 @@ defined('MOODLE_INTERNAL') || die(); function atto_image_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('image', + $icon = $OUTPUT->pix_icon('e/insert_edit_image', get_string('image', 'atto_image'), - 'atto_image', + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('createimage', @@ -46,14 +46,14 @@ function atto_image_init_editor($elementid) { 'height'), 'atto_image'); $PAGE->requires->yui_module('moodle-atto_image-button', 'M.atto_image.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'file')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_image_sort_order() { return 13; diff --git a/lib/editor/atto/plugins/image/pix/image.png b/lib/editor/atto/plugins/image/pix/image.png deleted file mode 100644 index b5644b23397..00000000000 Binary files a/lib/editor/atto/plugins/image/pix/image.png and /dev/null differ diff --git a/lib/editor/atto/plugins/image/pix/image.svg b/lib/editor/atto/plugins/image/pix/image.svg deleted file mode 100644 index 30e6fcf9638..00000000000 --- a/lib/editor/atto/plugins/image/pix/image.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js index 2658d79173d..d8c624d88f3 100644 --- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js +++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js @@ -87,7 +87,7 @@ M.atto_image = M.atto_image || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, params.group, display_chooser, this); }, open_filepicker : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js index 6fed538488b..d48973263fd 100644 --- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js +++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_image-button",function(e,t){M.atto_image=M.atto_image||{dialogue:null,selection:null,init:function(t){var n=function(t,n){t.preventDefault(),M.editor_atto.is_active(n)||M.editor_atto.focus(n),M.atto_image.selection=M.editor_atto.get_selection();if(M.atto_image.selection!==!1){var r;M.atto_image.dialogue?r=M.atto_image.dialogue:r=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),r.set("bodyContent",M.atto_image.get_form_content(n)),r.set("headerContent",M.util.get_string("createimage","atto_image")),r.render(),r.centerDialogue(),M.atto_image.dialogue=r;var i=M.editor_atto.get_selection_text(),s=0,o=[];for(s=0;s0){var a=e.one(o[0]),f=a.getAttribute("width"),l=a.getAttribute("height");f>0&&e.one("#atto_image_widthentry").set("value",f),l>0&&e.one("#atto_image_heightentry").set("value",l),e.one("#atto_image_preview").set("src",a.get("src")),e.one("#atto_image_preview").setStyle("display","inline"),e.one("#atto_image_altentry").set("value",a.get("alt")),e.one("#atto_image_urlentry").set("value",a.get("src"))}r.show()}};M.editor_atto.add_toolbar_button(t.elementid,"image",t.icon,n,this)},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"image",M.atto_image.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_image_urlentry");n.set("value",t.url),n=e.one("#atto_image_altentry"),n.set("value",t.file);var r=new Image;r.onload=function(){e.one("#atto_image_widthentry").set("value",this.width),e.one("#atto_image_heightentry").set("value",this.height),e.one("#atto_image_preview").set("src",this.src),e.one("#atto_image_preview").setStyle("display","inline")},r.src=t.url}},set_image:function(t){t.preventDefault(),M.atto_image.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_image_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_altentry");var i=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_widthentry");var s=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_heightentry");var o=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_image.selection);var u=''+e.Escape.html(i)+'"+''+'"+''+'"+''+"
"+'"+''+'"+''+"
"+'"+"
"+'"+""+"
"+M.util.get_string("accessibilityhint","atto_image"));return n.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image),n.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); +YUI.add("moodle-atto_image-button",function(e,t){M.atto_image=M.atto_image||{dialogue:null,selection:null,init:function(t){var n=function(t,n){t.preventDefault(),M.editor_atto.is_active(n)||M.editor_atto.focus(n),M.atto_image.selection=M.editor_atto.get_selection();if(M.atto_image.selection!==!1){var r;M.atto_image.dialogue?r=M.atto_image.dialogue:r=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),r.set("bodyContent",M.atto_image.get_form_content(n)),r.set("headerContent",M.util.get_string("createimage","atto_image")),r.render(),r.centerDialogue(),M.atto_image.dialogue=r;var i=M.editor_atto.get_selection_text(),s=0,o=[];for(s=0;s0){var a=e.one(o[0]),f=a.getAttribute("width"),l=a.getAttribute("height");f>0&&e.one("#atto_image_widthentry").set("value",f),l>0&&e.one("#atto_image_heightentry").set("value",l),e.one("#atto_image_preview").set("src",a.get("src")),e.one("#atto_image_preview").setStyle("display","inline"),e.one("#atto_image_altentry").set("value",a.get("alt")),e.one("#atto_image_urlentry").set("value",a.get("src"))}r.show()}};M.editor_atto.add_toolbar_button(t.elementid,"image",t.icon,t.group,n,this)},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"image",M.atto_image.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_image_urlentry");n.set("value",t.url),n=e.one("#atto_image_altentry"),n.set("value",t.file);var r=new Image;r.onload=function(){e.one("#atto_image_widthentry").set("value",this.width),e.one("#atto_image_heightentry").set("value",this.height),e.one("#atto_image_preview").set("src",this.src),e.one("#atto_image_preview").setStyle("display","inline")},r.src=t.url}},set_image:function(t){t.preventDefault(),M.atto_image.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_image_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_altentry");var i=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_widthentry");var s=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_heightentry");var o=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_image.selection);var u=''+e.Escape.html(i)+'"+''+'"+''+'"+''+"
"+'"+''+'"+''+"
"+'"+"
"+'"+""+"
"+M.util.get_string("accessibilityhint","atto_image"));return n.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image),n.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js index 2658d79173d..d8c624d88f3 100644 --- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js +++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js @@ -87,7 +87,7 @@ M.atto_image = M.atto_image || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, params.group, display_chooser, this); }, open_filepicker : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/image/yui/src/button/js/button.js b/lib/editor/atto/plugins/image/yui/src/button/js/button.js index ee7989b7ecd..791d2242aea 100644 --- a/lib/editor/atto/plugins/image/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/image/yui/src/button/js/button.js @@ -85,7 +85,7 @@ M.atto_image = M.atto_image || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'image', params.icon, params.group, display_chooser, this); }, open_filepicker : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/indent/lib.php b/lib/editor/atto/plugins/indent/lib.php index eb31579626d..52c58d2b555 100644 --- a/lib/editor/atto/plugins/indent/lib.php +++ b/lib/editor/atto/plugins/indent/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_indent_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('indent', + $icon = $OUTPUT->pix_icon('e/increase_indent', get_string('indent', 'atto_indent'), - 'atto_indent', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_indent-button', 'M.atto_indent.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_indent_sort_order() { return 5; diff --git a/lib/editor/atto/plugins/indent/pix/indent.png b/lib/editor/atto/plugins/indent/pix/indent.png deleted file mode 100644 index 227ddd68032..00000000000 Binary files a/lib/editor/atto/plugins/indent/pix/indent.png and /dev/null differ diff --git a/lib/editor/atto/plugins/indent/pix/indent.svg b/lib/editor/atto/plugins/indent/pix/indent.svg deleted file mode 100644 index 54ed187921a..00000000000 --- a/lib/editor/atto/plugins/indent/pix/indent.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - > - - diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js index 0a98a2b86d7..aa393bfe012 100644 --- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js +++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js @@ -32,7 +32,7 @@ M.atto_indent = M.atto_indent || { document.execCommand('indent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js index 3079b97f5da..6e10e44ee1b 100644 --- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js +++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_indent-button",function(e,t){M.atto_indent=M.atto_indent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("indent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"indent",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_indent-button",function(e,t){M.atto_indent=M.atto_indent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("indent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"indent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js index 0a98a2b86d7..aa393bfe012 100644 --- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js +++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js @@ -32,7 +32,7 @@ M.atto_indent = M.atto_indent || { document.execCommand('indent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/indent/yui/src/button/js/button.js b/lib/editor/atto/plugins/indent/yui/src/button/js/button.js index 05593e3d12e..4e6ce3aa276 100644 --- a/lib/editor/atto/plugins/indent/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/indent/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_indent = M.atto_indent || { document.execCommand('indent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/italic/lib.php b/lib/editor/atto/plugins/italic/lib.php index fb12b861192..61993f16918 100644 --- a/lib/editor/atto/plugins/italic/lib.php +++ b/lib/editor/atto/plugins/italic/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_italic_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('italic', + $icon = $OUTPUT->pix_icon('e/italic', get_string('italic', 'atto_italic'), - 'atto_italic', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_italic-button', 'M.atto_italic.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_italic_sort_order() { return 1; diff --git a/lib/editor/atto/plugins/italic/pix/italic.png b/lib/editor/atto/plugins/italic/pix/italic.png deleted file mode 100644 index 0efebc23b3b..00000000000 Binary files a/lib/editor/atto/plugins/italic/pix/italic.png and /dev/null differ diff --git a/lib/editor/atto/plugins/italic/pix/italic.svg b/lib/editor/atto/plugins/italic/pix/italic.svg deleted file mode 100644 index 558e730f6ef..00000000000 --- a/lib/editor/atto/plugins/italic/pix/italic.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - i - - diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js index 78285fc89a1..78b18b25b6c 100644 --- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js +++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js @@ -32,7 +32,7 @@ M.atto_italic = M.atto_italic || { document.execCommand('italic', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js index 568d6df8814..8e51967a5e5 100644 --- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js +++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_italic-button",function(e,t){M.atto_italic=M.atto_italic||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("italic",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"italic",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_italic-button",function(e,t){M.atto_italic=M.atto_italic||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("italic",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"italic",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js index 78285fc89a1..78b18b25b6c 100644 --- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js +++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js @@ -32,7 +32,7 @@ M.atto_italic = M.atto_italic || { document.execCommand('italic', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/italic/yui/src/button/js/button.js b/lib/editor/atto/plugins/italic/yui/src/button/js/button.js index c22dcce318e..d7da568e8f7 100644 --- a/lib/editor/atto/plugins/italic/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/italic/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_italic = M.atto_italic || { document.execCommand('italic', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/link/lib.php b/lib/editor/atto/plugins/link/lib.php index 56067e7d230..90b953c66d7 100644 --- a/lib/editor/atto/plugins/link/lib.php +++ b/lib/editor/atto/plugins/link/lib.php @@ -31,9 +31,9 @@ defined('MOODLE_INTERNAL') || die(); function atto_link_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('link', + $icon = $OUTPUT->pix_icon('e/insert_edit_link', get_string('link', 'atto_link'), - 'atto_link', + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('createlink', @@ -44,14 +44,14 @@ function atto_link_init_editor($elementid) { $PAGE->requires->yui_module('moodle-atto_link-button', 'M.atto_link.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'link')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_link_sort_order() { return 11; diff --git a/lib/editor/atto/plugins/link/pix/link.png b/lib/editor/atto/plugins/link/pix/link.png deleted file mode 100644 index 5a0ac7f4a68..00000000000 Binary files a/lib/editor/atto/plugins/link/pix/link.png and /dev/null differ diff --git a/lib/editor/atto/plugins/link/pix/link.svg b/lib/editor/atto/plugins/link/pix/link.svg deleted file mode 100644 index 13bfc7c209b..00000000000 --- a/lib/editor/atto/plugins/link/pix/link.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js index c352f07b7fe..69cc68918ee 100644 --- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js +++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js @@ -56,7 +56,7 @@ M.atto_link = M.atto_link || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, display_chooser, this); }, resolve_anchors : function() { // Find the first anchor tag in the selection. diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js index 64546785d78..68806afcb60 100644 --- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js +++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"link",e.icon,t,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r;if(!t)return;n=e.one(t).ancestor("a"),n&&(r=n.getAttribute("href"),r!==""&&(M.atto_link.selection=M.editor_atto.get_selection_from_node(n),e.one("#atto_link_urlentry").set("value",r)))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(e){e.preventDefault(),M.atto_link.dialogue.hide();var t=e.currentTarget.get("parentNode").one("input"),n=t.get("value");n!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,n))},get_form_content:function(t){var n=e.Node.create('

"+''+"
"+'"+"
"+'"+"
"+"
"+M.util.get_string("accessibilityhint","atto_link"));return n.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link),n.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); +YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"link",e.icon,e.group,t,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r;if(!t)return;n=e.one(t).ancestor("a"),n&&(r=n.getAttribute("href"),r!==""&&(M.atto_link.selection=M.editor_atto.get_selection_from_node(n),e.one("#atto_link_urlentry").set("value",r)))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(e){e.preventDefault(),M.atto_link.dialogue.hide();var t=e.currentTarget.get("parentNode").one("input"),n=t.get("value");n!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,n))},get_form_content:function(t){var n=e.Node.create('

"+''+"
"+'"+"
"+'"+"
"+"
"+M.util.get_string("accessibilityhint","atto_link"));return n.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link),n.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),n}}},"@VERSION@",{requires:["node","escape"]}); diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js index c352f07b7fe..69cc68918ee 100644 --- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js +++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js @@ -56,7 +56,7 @@ M.atto_link = M.atto_link || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, display_chooser, this); }, resolve_anchors : function() { // Find the first anchor tag in the selection. diff --git a/lib/editor/atto/plugins/link/yui/src/button/js/button.js b/lib/editor/atto/plugins/link/yui/src/button/js/button.js index b719e9a92b5..329e1f7b99e 100644 --- a/lib/editor/atto/plugins/link/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/link/yui/src/button/js/button.js @@ -54,7 +54,7 @@ M.atto_link = M.atto_link || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'link', params.icon, params.group, display_chooser, this); }, resolve_anchors : function() { // Find the first anchor tag in the selection. diff --git a/lib/editor/atto/plugins/media/lib.php b/lib/editor/atto/plugins/media/lib.php index d0a4428191c..c38198b3390 100644 --- a/lib/editor/atto/plugins/media/lib.php +++ b/lib/editor/atto/plugins/media/lib.php @@ -29,9 +29,9 @@ function atto_media_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('media', + $icon = $OUTPUT->pix_icon('e/insert_edit_video', get_string('media', 'atto_media'), - 'atto_media', + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('createmedia', @@ -42,14 +42,14 @@ function atto_media_init_editor($elementid) { 'atto_media'); $PAGE->requires->yui_module('moodle-atto_media-button', 'M.atto_media.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'file')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_media_sort_order() { return 14; diff --git a/lib/editor/atto/plugins/media/pix/media.png b/lib/editor/atto/plugins/media/pix/media.png deleted file mode 100644 index 36b2828d1e8..00000000000 Binary files a/lib/editor/atto/plugins/media/pix/media.png and /dev/null differ diff --git a/lib/editor/atto/plugins/media/pix/media.svg b/lib/editor/atto/plugins/media/pix/media.svg deleted file mode 100644 index 4842828b9aa..00000000000 --- a/lib/editor/atto/plugins/media/pix/media.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - media/svg+xml - - - - - - - - - - - - - - - diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js index 587b48280b1..e4fcc22e3f4 100644 --- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js +++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js @@ -54,7 +54,7 @@ M.atto_media = M.atto_media || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, params.group, display_chooser, this); }, open_browser : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js index 207fa8fa358..5faab6eb045 100644 --- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js +++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_media-button",function(e,t){M.atto_media=M.atto_media||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_media.selection=M.editor_atto.get_selection();if(M.atto_media.selection!==!1){var n;M.atto_media.dialogue?n=M.atto_media.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_media.get_form_content(t)),n.set("headerContent",M.util.get_string("createmedia","atto_media")),n.centerDialogue(),n.show(),M.atto_media.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"media",e.icon,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t){t.preventDefault(),M.atto_media.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_media_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_media_nameentry");var i=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_media.selection);var s=''+i+"";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(s):document.execCommand("insertHTML",!1,s)}},get_form_content:function(t){var n=e.Node.create('
"+''+'"+''+"
"+'"+"
"+'"+"
"+"
"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]}); +YUI.add("moodle-atto_media-button",function(e,t){M.atto_media=M.atto_media||{dialogue:null,selection:null,init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_media.selection=M.editor_atto.get_selection();if(M.atto_media.selection!==!1){var n;M.atto_media.dialogue?n=M.atto_media.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_media.get_form_content(t)),n.set("headerContent",M.util.get_string("createmedia","atto_media")),n.centerDialogue(),n.show(),M.atto_media.dialogue=n}};M.editor_atto.add_toolbar_button(e.elementid,"media",e.icon,e.group,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t){t.preventDefault(),M.atto_media.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_media_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_media_nameentry");var i=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_media.selection);var s=''+i+"";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(s):document.execCommand("insertHTML",!1,s)}},get_form_content:function(t){var n=e.Node.create('
"+''+'"+''+"
"+'"+"
"+'"+"
"+"
"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]}); diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js index 587b48280b1..e4fcc22e3f4 100644 --- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js +++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js @@ -54,7 +54,7 @@ M.atto_media = M.atto_media || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, params.group, display_chooser, this); }, open_browser : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/media/yui/src/button/js/button.js b/lib/editor/atto/plugins/media/yui/src/button/js/button.js index ccbbbb5c292..70fe607198f 100644 --- a/lib/editor/atto/plugins/media/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/media/yui/src/button/js/button.js @@ -52,7 +52,7 @@ M.atto_media = M.atto_media || { } }; - M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, display_chooser, this); + M.editor_atto.add_toolbar_button(params.elementid, 'media', params.icon, params.group, display_chooser, this); }, open_browser : function(e) { var elementid = this.getAttribute('data-editor'); diff --git a/lib/editor/atto/plugins/orderedlist/lib.php b/lib/editor/atto/plugins/orderedlist/lib.php index 524202c1f2c..0fe7d650b53 100644 --- a/lib/editor/atto/plugins/orderedlist/lib.php +++ b/lib/editor/atto/plugins/orderedlist/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_orderedlist_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('orderedlist', + $icon = $OUTPUT->pix_icon('e/numbered_list', get_string('orderedlist', 'atto_orderedlist'), - 'atto_orderedlist', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_orderedlist-button', 'M.atto_orderedlist.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return array groupname followed by the absolute position within the toolbar */ function atto_orderedlist_sort_order() { return 6; diff --git a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.png b/lib/editor/atto/plugins/orderedlist/pix/orderedlist.png deleted file mode 100644 index 33fbb630805..00000000000 Binary files a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.png and /dev/null differ diff --git a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg b/lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg deleted file mode 100644 index 1bf589a92c4..00000000000 --- a/lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - 1- - 2- - - diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js index c1a07064680..a2cc475acb3 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js +++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js @@ -32,7 +32,7 @@ M.atto_orderedlist = M.atto_orderedlist || { document.execCommand('insertOrderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js index d606ba09c67..d5cc7646679 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js +++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_orderedlist-button",function(e,t){M.atto_orderedlist=M.atto_orderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertOrderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"orderedlist",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_orderedlist-button",function(e,t){M.atto_orderedlist=M.atto_orderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertOrderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"orderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js index c1a07064680..a2cc475acb3 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js +++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js @@ -32,7 +32,7 @@ M.atto_orderedlist = M.atto_orderedlist || { document.execCommand('insertOrderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js b/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js index 8f549432b58..93a00c08597 100644 --- a/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_orderedlist = M.atto_orderedlist || { document.execCommand('insertOrderedList', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/outdent/lib.php b/lib/editor/atto/plugins/outdent/lib.php index 29cca4ce587..1383604d4e0 100644 --- a/lib/editor/atto/plugins/outdent/lib.php +++ b/lib/editor/atto/plugins/outdent/lib.php @@ -29,21 +29,21 @@ function atto_outdent_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('outdent', + $icon = $OUTPUT->pix_icon('e/decrease_indent', get_string('outdent', 'atto_outdent'), - 'atto_outdent', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_outdent-button', 'M.atto_outdent.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_outdent_sort_order() { return 4; diff --git a/lib/editor/atto/plugins/outdent/pix/outdent.png b/lib/editor/atto/plugins/outdent/pix/outdent.png deleted file mode 100644 index 2c708fa7b96..00000000000 Binary files a/lib/editor/atto/plugins/outdent/pix/outdent.png and /dev/null differ diff --git a/lib/editor/atto/plugins/outdent/pix/outdent.svg b/lib/editor/atto/plugins/outdent/pix/outdent.svg deleted file mode 100644 index 875d8708e38..00000000000 --- a/lib/editor/atto/plugins/outdent/pix/outdent.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - < - - diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js index cd8bd527ec6..c0a4827d4d1 100644 --- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js +++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js @@ -32,7 +32,7 @@ M.atto_outdent = M.atto_outdent || { document.execCommand('outdent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js index 4d14a825599..16df6c46ae8 100644 --- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js +++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_outdent-button",function(e,t){M.atto_outdent=M.atto_outdent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("outdent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"outdent",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_outdent-button",function(e,t){M.atto_outdent=M.atto_outdent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("outdent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"outdent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js index cd8bd527ec6..c0a4827d4d1 100644 --- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js +++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js @@ -32,7 +32,7 @@ M.atto_outdent = M.atto_outdent || { document.execCommand('outdent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js b/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js index 2f7eebc3f9e..96e8a9c0b67 100644 --- a/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_outdent = M.atto_outdent || { document.execCommand('outdent', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/strike/lib.php b/lib/editor/atto/plugins/strike/lib.php index 000bb44d737..22e77966409 100644 --- a/lib/editor/atto/plugins/strike/lib.php +++ b/lib/editor/atto/plugins/strike/lib.php @@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die(); function atto_strike_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('strike', + $icon = $OUTPUT->pix_icon('e/strikethrough', get_string('strike', 'atto_strike'), - 'atto_strike', + 'moodle', array('class'=>'icon')); $PAGE->requires->yui_module('moodle-atto_strike-button', 'M.atto_strike.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int absolute position within the toolbar */ function atto_strike_sort_order() { return 3; diff --git a/lib/editor/atto/plugins/strike/pix/strike.png b/lib/editor/atto/plugins/strike/pix/strike.png deleted file mode 100644 index c5c3a618209..00000000000 Binary files a/lib/editor/atto/plugins/strike/pix/strike.png and /dev/null differ diff --git a/lib/editor/atto/plugins/strike/pix/strike.svg b/lib/editor/atto/plugins/strike/pix/strike.svg deleted file mode 100644 index 214f25716d8..00000000000 --- a/lib/editor/atto/plugins/strike/pix/strike.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - s - - - - diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js index 34f2908e848..3807083bb86 100644 --- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js +++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js @@ -32,7 +32,7 @@ M.atto_strike = M.atto_strike || { document.execCommand('strikeThrough', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js index d37fd84168a..873cb8c3c0d 100644 --- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js +++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_strike-button",function(e,t){M.atto_strike=M.atto_strike||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("strikeThrough",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"strike",e.icon,t)}}},"@VERSION@",{requires:["node"]}); +YUI.add("moodle-atto_strike-button",function(e,t){M.atto_strike=M.atto_strike||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("strikeThrough",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"strike",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]}); diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js index 34f2908e848..3807083bb86 100644 --- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js +++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js @@ -32,7 +32,7 @@ M.atto_strike = M.atto_strike || { document.execCommand('strikeThrough', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/strike/yui/src/button/js/button.js b/lib/editor/atto/plugins/strike/yui/src/button/js/button.js index 06b0629502d..c69ce0d1476 100644 --- a/lib/editor/atto/plugins/strike/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/strike/yui/src/button/js/button.js @@ -30,6 +30,6 @@ M.atto_strike = M.atto_strike || { document.execCommand('strikeThrough', false, null); }; - M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, click); + M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click); } }; diff --git a/lib/editor/atto/plugins/title/lib.php b/lib/editor/atto/plugins/title/lib.php index 6f40550c7d8..ae81ffd9d18 100644 --- a/lib/editor/atto/plugins/title/lib.php +++ b/lib/editor/atto/plugins/title/lib.php @@ -31,9 +31,13 @@ defined('MOODLE_INTERNAL') || die(); function atto_title_init_editor($elementid) { global $PAGE, $OUTPUT; - $icon = $OUTPUT->pix_icon('title', + $icon = $OUTPUT->pix_icon('e/styleprops', get_string('title', 'atto_title'), - 'atto_title', + 'moodle', + array('class'=>'icon')); + $icon .= $OUTPUT->pix_icon('t/expanded', + get_string('title', 'atto_title'), + 'moodle', array('class'=>'icon')); $PAGE->requires->strings_for_js(array('h3', @@ -44,14 +48,14 @@ function atto_title_init_editor($elementid) { 'p'), 'atto_title'); $PAGE->requires->yui_module('moodle-atto_title-button', 'M.atto_title.init', - array(array('elementid'=>$elementid, 'icon'=>$icon)), + array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'title')), true); } /** * Return the order this plugin should be displayed in the toolbar - * @return int + * @return int the absolute position within the toolbar */ function atto_title_sort_order() { return 9; diff --git a/lib/editor/atto/plugins/title/pix/title.png b/lib/editor/atto/plugins/title/pix/title.png deleted file mode 100644 index 9a587fb1440..00000000000 Binary files a/lib/editor/atto/plugins/title/pix/title.png and /dev/null differ diff --git a/lib/editor/atto/plugins/title/pix/title.svg b/lib/editor/atto/plugins/title/pix/title.svg deleted file mode 100644 index 18f1b62ee87..00000000000 --- a/lib/editor/atto/plugins/title/pix/title.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - T - - - - diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js index 641b0e5e92f..1908ff6bb6c 100644 --- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js +++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js @@ -53,6 +53,7 @@ M.atto_title = M.atto_title || { M.editor_atto.add_toolbar_menu(params.elementid, 'title', params.icon, + params.group, [ {'text' : h3, 'handler' : click_h3}, {'text' : h4, 'handler' : click_h4}, diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js index 2235d53c86e..9dfde66a4df 100644 --- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js +++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_title-button",function(e,t){M.atto_title=M.atto_title||{init:function(e){var t=function(e,t){M.atto_title.change_title(e,t,"

")},n=function(e,t){M.atto_title.change_title(e,t,"

")},r=function(e,t){M.atto_title.change_title(e,t,"

")},i=function(e,t){M.atto_title.change_title(e,t,"
")},s=function(e,t){M.atto_title.change_title(e,t,"
")},o=function(e,t){M.atto_title.change_title(e,t,"
")},u="
"+M.util.get_string("h3","atto_title")+"
",a="
"+M.util.get_string("h4","atto_title")+"
",f="
"+M.util.get_string("h5","atto_title")+"
",l="
"+M.util.get_string("pre","atto_title")+"
",c="
    "+M.util.get_string("blockquote","atto_title")+"
",h="
"+M.util.get_string("p","atto_title")+"
";M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_title-button",function(e,t){M.atto_title=M.atto_title||{init:function(e){var t=function(e,t){M.atto_title.change_title(e,t,"
")},n=function(e,t){M.atto_title.change_title(e,t,"
")},r=function(e,t){M.atto_title.change_title(e,t,"
")},i=function(e,t){M.atto_title.change_title(e,t,"
")},s=function(e,t){M.atto_title.change_title(e,t,"
")},o=function(e,t){M.atto_title.change_title(e,t,"
")},u="
"+M.util.get_string("h3","atto_title")+"
",a="
"+M.util.get_string("h4","atto_title")+"
",f="
"+M.util.get_string("h5","atto_title")+"
",l="
"+M.util.get_string("pre","atto_title")+"
",c="
    "+M.util.get_string("blockquote","atto_title")+"
",h="
"+M.util.get_string("p","atto_title")+"
";M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,e.group,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
index 641b0e5e92f..1908ff6bb6c 100644
--- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
+++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
@@ -53,6 +53,7 @@ M.atto_title = M.atto_title || {
         M.editor_atto.add_toolbar_menu(params.elementid,
                                                   'title',
                                                   params.icon,
+                                                  params.group,
                                                   [
                                                       {'text' : h3, 'handler' : click_h3},
                                                       {'text' : h4, 'handler' : click_h4},
diff --git a/lib/editor/atto/plugins/title/yui/src/button/js/button.js b/lib/editor/atto/plugins/title/yui/src/button/js/button.js
index d6241e496b0..151311a591b 100644
--- a/lib/editor/atto/plugins/title/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/title/yui/src/button/js/button.js
@@ -51,6 +51,7 @@ M.atto_title = M.atto_title || {
         M.editor_atto.add_toolbar_menu(params.elementid,
                                                   'title',
                                                   params.icon,
+                                                  params.group,
                                                   [
                                                       {'text' : h3, 'handler' : click_h3},
                                                       {'text' : h4, 'handler' : click_h4},
diff --git a/lib/editor/atto/plugins/underline/lib.php b/lib/editor/atto/plugins/underline/lib.php
index bde1f90be8a..946145df476 100644
--- a/lib/editor/atto/plugins/underline/lib.php
+++ b/lib/editor/atto/plugins/underline/lib.php
@@ -31,21 +31,21 @@ defined('MOODLE_INTERNAL') || die();
 function atto_underline_init_editor($elementid) {
     global $PAGE, $OUTPUT;
 
-    $icon = $OUTPUT->pix_icon('underline',
+    $icon = $OUTPUT->pix_icon('e/underline',
                               get_string('underline', 'atto_underline'),
-                              'atto_underline',
+                              'moodle',
                               array('class'=>'icon'));
 
     $PAGE->requires->yui_module('moodle-atto_underline-button',
                                 'M.atto_underline.init',
-                                array(array('elementid'=>$elementid, 'icon'=>$icon)),
+                                array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'style')),
                                 true);
 
 }
 
 /**
  * Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
  */
 function atto_underline_sort_order() {
     return 2;
diff --git a/lib/editor/atto/plugins/underline/pix/underline.png b/lib/editor/atto/plugins/underline/pix/underline.png
deleted file mode 100644
index 329e4970db0..00000000000
Binary files a/lib/editor/atto/plugins/underline/pix/underline.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/underline/pix/underline.svg b/lib/editor/atto/plugins/underline/pix/underline.svg
deleted file mode 100644
index 1d1feb4d523..00000000000
--- a/lib/editor/atto/plugins/underline/pix/underline.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-  
-  
-  
-    
-      
-        image/svg+xml
-        
-        
-      
-    
-  
-  
-    u
-    
-  
-
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
index caa347e4017..218a6705384 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
@@ -32,7 +32,7 @@ M.atto_underline = M.atto_underline || {
             document.execCommand('underline', false, null);
         };
 
-        M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click);
+        M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
     }
 };
 
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
index 6954ce22235..86d3a2f098e 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
index caa347e4017..218a6705384 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
@@ -32,7 +32,7 @@ M.atto_underline = M.atto_underline || {
             document.execCommand('underline', false, null);
         };
 
-        M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click);
+        M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
     }
 };
 
diff --git a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
index f4ac98f8806..973461022af 100644
--- a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_underline = M.atto_underline || {
             document.execCommand('underline', false, null);
         };
 
-        M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, click);
+        M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
     }
 };
diff --git a/lib/editor/atto/plugins/unlink/lib.php b/lib/editor/atto/plugins/unlink/lib.php
index eef044961ac..b1023b046c5 100644
--- a/lib/editor/atto/plugins/unlink/lib.php
+++ b/lib/editor/atto/plugins/unlink/lib.php
@@ -29,21 +29,21 @@
 function atto_unlink_init_editor($elementid) {
     global $PAGE, $OUTPUT;
 
-    $icon = $OUTPUT->pix_icon('unlink',
+    $icon = $OUTPUT->pix_icon('e/remove_link',
                               get_string('unlink', 'atto_unlink'),
-                              'atto_unlink',
+                              'moodle',
                               array('class'=>'icon'));
 
     $PAGE->requires->yui_module('moodle-atto_unlink-button',
                                 'M.atto_unlink.init',
-                                array(array('elementid'=>$elementid, 'icon'=>$icon)),
+                                array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'link')),
                                 true);
 
 }
 
 /**
  * Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
  */
 function atto_unlink_sort_order() {
     return 12;
diff --git a/lib/editor/atto/plugins/unlink/pix/unlink.png b/lib/editor/atto/plugins/unlink/pix/unlink.png
deleted file mode 100644
index 1dbbb9ccd0c..00000000000
Binary files a/lib/editor/atto/plugins/unlink/pix/unlink.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/unlink/pix/unlink.svg b/lib/editor/atto/plugins/unlink/pix/unlink.svg
deleted file mode 100644
index 79126bcda80..00000000000
--- a/lib/editor/atto/plugins/unlink/pix/unlink.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-  
-  
-  
-    
-      
-        image/svg+xml
-        
-        
-      
-    
-  
-  
-    
-      
-      
-    
-    
-      
-      
-    
-  
-
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
index 365a993c350..89959a891b3 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
@@ -32,7 +32,7 @@ M.atto_unlink = M.atto_unlink || {
             document.execCommand('unlink', false, null);
         };
 
-        M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click);
+        M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
     }
 };
 
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
index 4f412d02606..c306b0a19ea 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
index 365a993c350..89959a891b3 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
@@ -32,7 +32,7 @@ M.atto_unlink = M.atto_unlink || {
             document.execCommand('unlink', false, null);
         };
 
-        M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click);
+        M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
     }
 };
 
diff --git a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
index fd19d81ea2a..73923fba978 100644
--- a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_unlink = M.atto_unlink || {
             document.execCommand('unlink', false, null);
         };
 
-        M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, click);
+        M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
     }
 };
diff --git a/lib/editor/atto/plugins/unorderedlist/lib.php b/lib/editor/atto/plugins/unorderedlist/lib.php
index 6224f905bab..b70903eb262 100644
--- a/lib/editor/atto/plugins/unorderedlist/lib.php
+++ b/lib/editor/atto/plugins/unorderedlist/lib.php
@@ -29,21 +29,21 @@
 function atto_unorderedlist_init_editor($elementid) {
     global $PAGE, $OUTPUT;
 
-    $icon = $OUTPUT->pix_icon('unorderedlist',
+    $icon = $OUTPUT->pix_icon('e/bullet_list',
                               get_string('unorderedlist', 'atto_unorderedlist'),
-                              'atto_unorderedlist',
+                              'moodle',
                               array('class'=>'icon'));
 
     $PAGE->requires->yui_module('moodle-atto_unorderedlist-button',
                                 'M.atto_unorderedlist.init',
-                                array(array('elementid'=>$elementid, 'icon'=>$icon)),
+                                array(array('elementid'=>$elementid, 'icon'=>$icon, 'group'=>'list')),
                                 true);
 
 }
 
 /**
  * Return the order this plugin should be displayed in the toolbar
- * @return int
+ * @return int the absolute position within the toolbar
  */
 function atto_unorderedlist_sort_order() {
     return 7;
diff --git a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png b/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png
deleted file mode 100644
index 95b9d12d548..00000000000
Binary files a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png and /dev/null differ
diff --git a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg b/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg
deleted file mode 100644
index 8cf123137e3..00000000000
--- a/lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-  
-  
-  
-    
-      
-        image/svg+xml
-        
-        
-      
-    
-  
-  
-    
-      *
-      -
-    
-    
-      *
-      -
-    
-  
-
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
index 4915b2e40d7..e430b83d2fc 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
@@ -32,7 +32,7 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
             document.execCommand('insertUnorderedList', false, null);
         };
 
-        M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click);
+        M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
     }
 };
 
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
index 5694eae1bf4..dc606fc7f52 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
index 4915b2e40d7..e430b83d2fc 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
@@ -32,7 +32,7 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
             document.execCommand('insertUnorderedList', false, null);
         };
 
-        M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click);
+        M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
     }
 };
 
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
index e86e3e9f84f..6e1d30cf283 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
@@ -30,6 +30,6 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
             document.execCommand('insertUnorderedList', false, null);
         };
 
-        M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, click);
+        M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
     }
 };
diff --git a/lib/editor/atto/styles.css b/lib/editor/atto/styles.css
index e794e853fe6..a633da9a542 100644
--- a/lib/editor/atto/styles.css
+++ b/lib/editor/atto/styles.css
@@ -11,20 +11,25 @@ div.editor_atto {
 div.editor_atto_toolbar {
     display: block;
     background: #F2F2F2;
-    min-height: 36px;
+    min-height: 42px;
     border-top: 1px solid #BBB;
     border-left: 1px solid #BBB;
     border-right: 1px solid #BBB;
+    padding: 0 0 9px 0;
 }
 
 div.editor_atto_toolbar button {
-    margin-top: 5px;
-    margin-bottom: 0px;
-    padding: 3px;
+    padding: 5px 9px 4px 9px;
     background: none;
-    border: none;
+    border: 0px;
+    margin: 0;
+    border-radius: 0;
  }
 
+div.editor_atto_toolbar button + button {
+   border-left: 1px solid #CCC;
+}
+
 div.editor_atto_toolbar button[disabled] {
     opacity: .45;
 }
@@ -33,30 +38,20 @@ div.editor_atto_toolbar button img {
     padding: 1px;
 }
 
-div.editor_atto_toolbar button.atto_strike_button,
-div.editor_atto_toolbar button.atto_unorderedlist_button,
-div.editor_atto_toolbar button.atto_clear_button,
-div.editor_atto_toolbar button.atto_indent_button {
-    margin-right: 1em;
-}
-body.dir-rtl div.editor_atto_toolbar button.atto_strike_button,
-body.dir-rtl div.editor_atto_toolbar button.atto_unorderedlist_button,
-body.dir-rtl div.editor_atto_toolbar button.atto_clear_button,
-body.dir-rtl div.editor_atto_toolbar button.atto_indent_button {
-    margin-right: 0px;
-    margin-left: 1em;
-}
 
-.atto_hasmenu .icon {
-    width: 32px;
+div.editor_atto_toolbar div.atto_group {
+    display: inline-block;
+    border: 1px solid #CCC;
+    border-bottom: 1px solid #B3B3B3;
+    border-radius: 4px;
+    margin: 9px 0px 0px 9px;
+    background: #FFF;
 }
 
 .editor_atto img {
     resize: both; overflow: auto;
 }
-.atto_menuentry {
-    clear: left;
-}
+
 .atto_menuentry img {
     width: 16px;
     height: 16px;
@@ -74,6 +69,7 @@ body.dir-rtl div.editor_atto_toolbar button.atto_indent_button {
 .atto_menuentry {
     border-bottom: 1px solid #eee;
     padding: 2px;
+    clear: left;
 }
 
 .atto_menuentry h1,
@@ -88,3 +84,16 @@ body.dir-rtl div.editor_atto_toolbar button.atto_indent_button {
     margin: 5px;
 }
 
+/* RTL Rules */
+body.dir-rtl div.editor_atto_toolbar button + button {
+    border-left: 0;
+    border-right: 1px solid #CCC;
+}
+
+body.dir-rtl div.editor_atto_toolbar img.icon {
+    padding: 0;
+}
+
+body.dir-rtl div.editor_atto_toolbar div.atto_group {
+    margin: 9px 9px 0px 0px;
+}
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index 495df236b09..2ebeb90b866 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -154,17 +154,23 @@ M.editor_atto = M.editor_atto || {
      * @param string elementid - the id of the textarea we created this editor from.
      * @param string plugin - the plugin defining the button
      * @param string icon - the html used for the content of the button
+     * @param string groupname - the group the button should be appended to.
      * @handler function handler- A function to call when the button is clicked.
      */
-    add_toolbar_menu : function(elementid, plugin, icon, entries) {
-        var toolbar = Y.one('#' + elementid + '_toolbar');
+    add_toolbar_menu : function(elementid, plugin, icon, groupname, entries) {
+        var toolbar = Y.one('#' + elementid + '_toolbar'),
+            group = Y.one('#' + elementid + '_toolbar .atto_group.' + groupname + '_group');
+        if (!group) {
+            group = Y.Node.create('
');
+            toolbar.append(group);
+        }
         var button = Y.Node.create('');
 
-        toolbar.append(button);
+        group.append(button);
 
         // Save the name of the plugin.
         M.editor_atto.widgets[plugin] = plugin;
@@ -215,12 +221,18 @@ M.editor_atto = M.editor_atto || {
     /**
      * Add a button to the toolbar belonging to the editor for element with id "elementid".
      * @param string elementid - the id of the textarea we created this editor from.
-     * @param string plugin - the plugin defining the button
-     * @param string icon - the html used for the content of the button
+     * @param string plugin - the plugin defining the button.
+     * @param string icon - the html used for the content of the button.
+     * @param string groupname - the group the button should be appended to.
      * @handler function handler- A function to call when the button is clicked.
      */
-    add_toolbar_button : function(elementid, plugin, icon, handler) {
-        var toolbar = Y.one('#' + elementid + '_toolbar');
+    add_toolbar_button : function(elementid, plugin, icon, groupname, handler) {
+        var toolbar = Y.one('#' + elementid + '_toolbar'),
+            group = Y.one('#' + elementid + '_toolbar .atto_group.' + groupname + '_group');
+        if (!group) {
+            group = Y.Node.create('
');
+            toolbar.append(group);
+        }
         var button = Y.Node.create('");s.append(o),M.editor_atto.widgets[n]=n;var u=e.Node.create('
'),a=0,f={};for(a=0;a'+f.text+""+"")),M.editor_atto.buttonhandlers[n+"_action_"+a]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_action_"+a),M.editor_atto.buttonhandlers[n+"_action_"+a]=f.handler);M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.showhide_menu_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=!0);var l=new M.core.dialogue({bodyContent:u,visible:!1,width:"14em",zindex:100,lightbox:!1,closeButton:!1,centered:!1,align:{node:o,points:[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]}});M.editor_atto.menus[n+"_"+t]=l,l.render(),l.hide(),l.headerNode.hide()},add_toolbar_button:function(t,n,r,i){var s=e.one("#"+t+"_toolbar"),o=e.Node.create('");s.append(o),M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=i),M.editor_atto.widgets[n]=n},is_active:function(t){var n=M.editor_atto.get_selection();n.length&&(n=n.pop());var r=null;return n.parentElement?r=e.one(n.parentElement()):r=e.one(n.startContainer),r&&r.ancestor("#"+t+"editable")!==null},focus:function(t){e.one("#"+t+"editable").focus()},init:function(t){var n=e.one("#"+t.elementid),r=e.Node.create('
'),i="",s=e.Node.create('
'),o=e.io(t.content_css,{sync:!0}),u=o.responseText.indexOf("font:");u&&(i=o.responseText.substring(u+"font:".length,o.responseText.length-1),r.setStyle("font",i)),r.setStyle("minHeight",1.2*(n.getAttribute("rows")-1)+"em"),r.append(n.get("value")),n.get("parentNode").insert(s,n),n.get("parentNode").insert(r,n),r.setStyle("color",n.getStyle("color")),r.setStyle("lineHeight",n.getStyle("lineHeight")),r.setStyle("fontSize",n.getStyle("fontSize")),n.hide(),r.on("blur",function(){n.set("value",r.getHTML())}),M.editor_atto.filepickeroptions[t.elementid]=t.filepickeroptions},show_filepicker:function(t,n,r){e.use("core_filepicker",function(e){var i=M.editor_atto.filepickeroptions[t][n];i.formcallback=r,i.editor_target=e.one(t),M.core_filepicker.show(e,i)})},get_selection_from_node:function(e){var t;return window.getSelection?(t=document.createRange(),t.setStartBefore(e.getDOMNode()),t.setEndAfter(e.getDOMNode()),[t]):document.selection?(t=document.body.createTextRange(),t.moveToElementText(e.getDOMNode()),t):!1},get_selection:function(){if(window.getSelection){var e=window.getSelection(),t=[],n=0;for(n=0;n0)return e[0].commonAncestorContainer},get_selection_text:function(){var e=M.editor_atto.get_selection();if(e.length>0&&e[0].cloneContents)return e[0].cloneContents()},set_selection:function(e){var t,n;if(window.getSelection){t=window.getSelection(),t.removeAllRanges();for(n=0;n
'),o.append(u));var a=e.Node.create('");u.append(a),M.editor_atto.widgets[n]=n;var f=e.Node.create('
'),l=0,c={};for(l=0;l'+c.text+""+"
")),M.editor_atto.buttonhandlers[n+"_action_"+l]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_action_"+l),M.editor_atto.buttonhandlers[n+"_action_"+l]=c.handler);M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.showhide_menu_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=!0);var h=new M.core.dialogue({bodyContent:f,visible:!1,width:"14em",zindex:100,lightbox:!1,closeButton:!1,centered:!1,align:{node:a,points:[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]}});M.editor_atto.menus[n+"_"+t]=h,h.render(),h.hide(),h.headerNode.hide()},add_toolbar_button:function(t,n,r,i,s){var o=e.one("#"+t+"_toolbar"),u=e.one("#"+t+"_toolbar .atto_group."+i+"_group");u||(u=e.Node.create('
'),o.append(u));var a=e.Node.create('");u.append(a),M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=s),M.editor_atto.widgets[n]=n},is_active:function(t){var n=M.editor_atto.get_selection();n.length&&(n=n.pop());var r=null;return n.parentElement?r=e.one(n.parentElement()):r=e.one(n.startContainer),r&&r.ancestor("#"+t+"editable")!==null},focus:function(t){e.one("#"+t+"editable").focus()},init:function(t){var n=e.one("#"+t.elementid),r=e.Node.create('
'),i="",s=e.Node.create('
'),o=e.io(t.content_css,{sync:!0}),u=o.responseText.indexOf("font:");u&&(i=o.responseText.substring(u+"font:".length,o.responseText.length-1),r.setStyle("font",i)),r.setStyle("minHeight",1.2*(n.getAttribute("rows")-1)+"em"),r.append(n.get("value")),n.get("parentNode").insert(s,n),n.get("parentNode").insert(r,n),r.setStyle("color",n.getStyle("color")),r.setStyle("lineHeight",n.getStyle("lineHeight")),r.setStyle("fontSize",n.getStyle("fontSize")),n.hide(),r.on("blur",function(){n.set("value",r.getHTML())}),M.editor_atto.filepickeroptions[t.elementid]=t.filepickeroptions},show_filepicker:function(t,n,r){e.use("core_filepicker",function(e){var i=M.editor_atto.filepickeroptions[t][n];i.formcallback=r,i.editor_target=e.one(t),M.core_filepicker.show(e,i)})},get_selection_from_node:function(e){var t;return window.getSelection?(t=document.createRange(),t.setStartBefore(e.getDOMNode()),t.setEndAfter(e.getDOMNode()),[t]):document.selection?(t=document.body.createTextRange(),t.moveToElementText(e.getDOMNode()),t):!1},get_selection:function(){if(window.getSelection){var e=window.getSelection(),t=[],n=0;for(n=0;n0)return e[0].commonAncestorContainer},get_selection_text:function(){var e=M.editor_atto.get_selection();if(e.length>0&&e[0].cloneContents)return e[0].cloneContents()},set_selection:function(e){var t,n;if(window.getSelection){t=window.getSelection(),t.removeAllRanges();for(n=0;n
');
+            toolbar.append(group);
+        }
         var button = Y.Node.create('');
 
-        toolbar.append(button);
+        group.append(button);
 
         // Save the name of the plugin.
         M.editor_atto.widgets[plugin] = plugin;
@@ -215,12 +221,18 @@ M.editor_atto = M.editor_atto || {
     /**
      * Add a button to the toolbar belonging to the editor for element with id "elementid".
      * @param string elementid - the id of the textarea we created this editor from.
-     * @param string plugin - the plugin defining the button
-     * @param string icon - the html used for the content of the button
+     * @param string plugin - the plugin defining the button.
+     * @param string icon - the html used for the content of the button.
+     * @param string groupname - the group the button should be appended to.
      * @handler function handler- A function to call when the button is clicked.
      */
-    add_toolbar_button : function(elementid, plugin, icon, handler) {
-        var toolbar = Y.one('#' + elementid + '_toolbar');
+    add_toolbar_button : function(elementid, plugin, icon, groupname, handler) {
+        var toolbar = Y.one('#' + elementid + '_toolbar'),
+            group = Y.one('#' + elementid + '_toolbar .atto_group.' + groupname + '_group');
+        if (!group) {
+            group = Y.Node.create('
');
+            toolbar.append(group);
+        }
         var button = Y.Node.create('');
 
-        toolbar.append(button);
+        group.append(button);
 
         // Save the name of the plugin.
         M.editor_atto.widgets[plugin] = plugin;
@@ -213,12 +219,18 @@ M.editor_atto = M.editor_atto || {
     /**
      * Add a button to the toolbar belonging to the editor for element with id "elementid".
      * @param string elementid - the id of the textarea we created this editor from.
-     * @param string plugin - the plugin defining the button
-     * @param string icon - the html used for the content of the button
+     * @param string plugin - the plugin defining the button.
+     * @param string icon - the html used for the content of the button.
+     * @param string groupname - the group the button should be appended to.
      * @handler function handler- A function to call when the button is clicked.
      */
-    add_toolbar_button : function(elementid, plugin, icon, handler) {
-        var toolbar = Y.one('#' + elementid + '_toolbar');
+    add_toolbar_button : function(elementid, plugin, icon, groupname, handler) {
+        var toolbar = Y.one('#' + elementid + '_toolbar'),
+            group = Y.one('#' + elementid + '_toolbar .atto_group.' + groupname + '_group');
+        if (!group) {
+            group = Y.Node.create('
');
+            toolbar.append(group);
+        }
         var button = Y.Node.create('