MDL-41713 atto - implement new icons with matching UI
authorJason Fowler <phalacee@gmail.com>
Wed, 18 Sep 2013 06:22:32 +0000 (14:22 +0800)
committerJason Fowler <phalacee@gmail.com>
Fri, 20 Sep 2013 06:20:05 +0000 (14:20 +0800)
110 files changed:
lib/editor/atto/plugins/bold/lib.php
lib/editor/atto/plugins/bold/pix/bold.png [deleted file]
lib/editor/atto/plugins/bold/pix/bold.svg [deleted file]
lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js
lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js
lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js
lib/editor/atto/plugins/bold/yui/src/button/js/button.js
lib/editor/atto/plugins/clear/lib.php
lib/editor/atto/plugins/clear/pix/clear.png [deleted file]
lib/editor/atto/plugins/clear/pix/clear.svg [deleted file]
lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js
lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js
lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js
lib/editor/atto/plugins/clear/yui/src/button/js/button.js
lib/editor/atto/plugins/html/lib.php
lib/editor/atto/plugins/html/pix/html.png [deleted file]
lib/editor/atto/plugins/html/pix/html.svg [deleted file]
lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js
lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js
lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js
lib/editor/atto/plugins/html/yui/src/button/js/button.js
lib/editor/atto/plugins/image/lib.php
lib/editor/atto/plugins/image/pix/image.png [deleted file]
lib/editor/atto/plugins/image/pix/image.svg [deleted file]
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
lib/editor/atto/plugins/image/yui/src/button/js/button.js
lib/editor/atto/plugins/indent/lib.php
lib/editor/atto/plugins/indent/pix/indent.png [deleted file]
lib/editor/atto/plugins/indent/pix/indent.svg [deleted file]
lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js
lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js
lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js
lib/editor/atto/plugins/indent/yui/src/button/js/button.js
lib/editor/atto/plugins/italic/lib.php
lib/editor/atto/plugins/italic/pix/italic.png [deleted file]
lib/editor/atto/plugins/italic/pix/italic.svg [deleted file]
lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js
lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js
lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js
lib/editor/atto/plugins/italic/yui/src/button/js/button.js
lib/editor/atto/plugins/link/lib.php
lib/editor/atto/plugins/link/pix/link.png [deleted file]
lib/editor/atto/plugins/link/pix/link.svg [deleted file]
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
lib/editor/atto/plugins/link/yui/src/button/js/button.js
lib/editor/atto/plugins/media/lib.php
lib/editor/atto/plugins/media/pix/media.png [deleted file]
lib/editor/atto/plugins/media/pix/media.svg [deleted file]
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js
lib/editor/atto/plugins/media/yui/src/button/js/button.js
lib/editor/atto/plugins/orderedlist/lib.php
lib/editor/atto/plugins/orderedlist/pix/orderedlist.png [deleted file]
lib/editor/atto/plugins/orderedlist/pix/orderedlist.svg [deleted file]
lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js
lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js
lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js
lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js
lib/editor/atto/plugins/outdent/lib.php
lib/editor/atto/plugins/outdent/pix/outdent.png [deleted file]
lib/editor/atto/plugins/outdent/pix/outdent.svg [deleted file]
lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js
lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js
lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js
lib/editor/atto/plugins/outdent/yui/src/button/js/button.js
lib/editor/atto/plugins/strike/lib.php
lib/editor/atto/plugins/strike/pix/strike.png [deleted file]
lib/editor/atto/plugins/strike/pix/strike.svg [deleted file]
lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js
lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js
lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js
lib/editor/atto/plugins/strike/yui/src/button/js/button.js
lib/editor/atto/plugins/title/lib.php
lib/editor/atto/plugins/title/pix/title.png [deleted file]
lib/editor/atto/plugins/title/pix/title.svg [deleted file]
lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js
lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js
lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
lib/editor/atto/plugins/title/yui/src/button/js/button.js
lib/editor/atto/plugins/underline/lib.php
lib/editor/atto/plugins/underline/pix/underline.png [deleted file]
lib/editor/atto/plugins/underline/pix/underline.svg [deleted file]
lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
lib/editor/atto/plugins/underline/yui/src/button/js/button.js
lib/editor/atto/plugins/unlink/lib.php
lib/editor/atto/plugins/unlink/pix/unlink.png [deleted file]
lib/editor/atto/plugins/unlink/pix/unlink.svg [deleted file]
lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
lib/editor/atto/plugins/unorderedlist/lib.php
lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.png [deleted file]
lib/editor/atto/plugins/unorderedlist/pix/unorderedlist.svg [deleted file]
lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
lib/editor/atto/styles.css
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
lib/editor/atto/yui/src/editor/js/editor.js

index 35d97c8..823a6a0 100644 (file)
@@ -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 (file)
index 57ee78e..0000000
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 (file)
index b4a76d1..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="bold.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-8.2482624"
-     inkscape:cy="15.312045"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Arial Bold"
-       x="7.2604713"
-       y="1049.6475"
-       id="text2984"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2986"
-         x="7.2604713"
-         y="1049.6475"
-         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Bold">b</tspan></text>
-  </g>
-</svg>
index 210bb07..254c68d 100644 (file)
Binary files a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js and b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js differ
index e843f39..14ec201 100644 (file)
Binary files a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js and b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js differ
index 210bb07..254c68d 100644 (file)
Binary files a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js and b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js differ
index 5648d91..0522419 100644 (file)
@@ -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);
     }
 };
index 0e2081c..f62f633 100644 (file)
@@ -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 (file)
index 7f5815b..0000000
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 (file)
index cce05ef..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="clear.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-3.8870379"
-     inkscape:cy="15.312045"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:clear />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       id="g3756"
-       transform="translate(0,-0.44194174)">
-      <rect
-         ry="0"
-         transform="translate(0,1036.3622)"
-         y="2.3629408"
-         x="7.0079331"
-         height="5.3664355"
-         width="2.0203052"
-         id="rect2982"
-         style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         ry="0.4152233"
-         y="1043.2078"
-         x="3.9774756"
-         height="2.7870839"
-         width="8.0812302"
-         id="rect2984"
-         style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0.82672101;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         ry="0.053281363"
-         y="1045.6699"
-         x="4.4825521"
-         height="3.1562684"
-         width="7.0079417"
-         id="rect3754"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-    </g>
-  </g>
-</svg>
index bcfb704..0efa72c 100644 (file)
Binary files a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js and b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js differ
index 7716f7b..4a1ad97 100644 (file)
Binary files a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js and b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js differ
index bcfb704..0efa72c 100644 (file)
Binary files a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js and b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js differ
index 0430f8b..77d6d1e 100644 (file)
@@ -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);
     }
 };
index f97ed33..997585e 100644 (file)
@@ -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 (file)
index 0623bd7..0000000
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 (file)
index fa06412..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="html.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-8.155614"
-     inkscape:cy="13.234355"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>media/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillMedia" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:52.96332169000000079px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#999999;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS"
-       x="10.191385"
-       y="836.76996"
-       id="text2988"
-       sodipodi:linespacing="125%"
-       transform="scale(0.79843788,1.2524456)"><tspan
-         sodipodi:role="line"
-         id="tspan2990"
-         x="10.191385"
-         y="836.76996"
-         style="font-size:9.93062304999999945px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold;fill:#999999;fill-opacity:1">&lt;/&gt;</tspan></text>
-  </g>
-</svg>
index 8b32aad..d69df96 100644 (file)
Binary files a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js and b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-debug.js differ
index bf8e2cc..d22d650 100644 (file)
Binary files a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js and b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button-min.js differ
index 8b32aad..d69df96 100644 (file)
Binary files a/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js and b/lib/editor/atto/plugins/html/yui/build/moodle-atto_html-button/moodle-atto_html-button.js differ
index 18520ed..5b030ad 100644 (file)
@@ -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);
     }
 };
index ed4a2b9..c25c4ec 100644 (file)
@@ -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 (file)
index b5644b2..0000000
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 (file)
index 30e6fcf..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="image.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="11.577509"
-     inkscape:cy="9.3016902"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <rect
-       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-opacity:1"
-       id="rect2986"
-       width="14.142136"
-       height="13.131983"
-       x="1.0101526"
-       y="1.4159228"
-       transform="translate(0,1036.3622)"
-       ry="0.053281363" />
-    <path
-       style="fill:#999999;fill-opacity:1;stroke:none"
-       d="m 13.794977,1041.1242 c 0,0.9241 -0.749059,1.6732 -1.673146,1.6732 -0.9241,0 -1.673146,-0.7491 -1.673146,-1.6732 0,-0.924 0.749059,-1.6731 1.673146,-1.6731 0.9241,0 1.673146,0.7491 1.673146,1.6731 z"
-       id="path3761"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(0,1036.3622)"
-       style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       d="m 1.5711386,10.553572 c 1.7890625,-0.125 3.8205354,-3.734909 6.286004,-3.75 2.4654684,-0.015091 3.8591064,3.4375 6.4645754,3.75 0.01465,0.0018 0.02808,0.0059 0.03771,0.01557 0.0096,0.0096 0.01557,0.02295 0.01557,0.03771 l 0,3.018437 c 0,0.02952 -0.02376,0.05328 -0.05328,0.05328 l -12.7505794,0 c -0.029518,0 -0.053281,-0.02376 -0.053281,-0.05328 l 0,-3.018437 c 0,-0.01476 0.00594,-0.02808 0.015572,-0.03771 0.00963,-0.0096 0.022987,-0.01454 0.037709,-0.01557 z"
-       id="rect3753"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="szssssssssss" />
-  </g>
-</svg>
index 2658d79..d8c624d 100644 (file)
Binary files a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js and b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js differ
index 6fed538..d489732 100644 (file)
Binary files a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js and b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js differ
index 2658d79..d8c624d 100644 (file)
Binary files a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js and b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js differ
index ee7989b..791d224 100644 (file)
@@ -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');
index eb31579..52c58d2 100644 (file)
@@ -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 (file)
index 227ddd6..0000000
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 (file)
index 54ed187..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="indent.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-8.2482624"
-     inkscape:cy="15.312045"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:64px;font-style:normal;font-variant:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Arial Indent"
-       x="7.2604713"
-       y="1049.6475"
-       id="text2984"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2986"
-         x="7.2604713"
-         y="1049.6475"
-         style="font-size:14px;font-style:normal;font-variant:normal;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Indent">&gt;</tspan></text>
-  </g>
-</svg>
index 0a98a2b..aa393bf 100644 (file)
Binary files a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js and b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js differ
index 3079b97..6e10e44 100644 (file)
Binary files a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js and b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js differ
index 0a98a2b..aa393bf 100644 (file)
Binary files a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js and b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js differ
index 05593e3..4e6ce3a 100644 (file)
@@ -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);
     }
 };
index fb12b86..61993f1 100644 (file)
@@ -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 (file)
index 0efebc2..0000000
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 (file)
index 558e730..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="italic.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-8.2482624"
-     inkscape:cy="15.312045"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS"
-       x="7.2604713"
-       y="1049.6475"
-       id="text2984"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2986"
-         x="7.2604713"
-         y="1049.6475"
-         style="font-size:14px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Italic;fill:#999999;fill-opacity:1">i</tspan></text>
-  </g>
-</svg>
index 78285fc..78b18b2 100644 (file)
Binary files a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js and b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js differ
index 568d6df..8e51967 100644 (file)
Binary files a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js and b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js differ
index 78285fc..78b18b2 100644 (file)
Binary files a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js and b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js differ
index c22dcce..d7da568 100644 (file)
@@ -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);
     }
 };
index 56067e7..90b953c 100644 (file)
@@ -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 (file)
index 5a0ac7f..0000000
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 (file)
index 13bfc7c..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="link.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="-3.7446839"
-     inkscape:cy="10.171143"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="872"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <rect
-       style="fill:none;stroke:#999999;stroke-width:2.89999999999999991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect2984"
-       width="19.107143"
-       height="6.8750005"
-       x="-13.535714"
-       y="1040.9337"
-       ry="0.053281363" />
-    <rect
-       ry="0.053281363"
-       y="1040.9337"
-       x="10.432884"
-       height="6.8750005"
-       width="19.107143"
-       id="rect3754"
-       style="fill:none;stroke:#999999;stroke-width:2.90000010000000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-    <rect
-       style="fill:none;stroke:#999999;stroke-width:2.90000010000000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3756"
-       width="9.0510426"
-       height="0.26916784"
-       x="3.5273302"
-       y="1044.2031"
-       ry="0.053281363" />
-  </g>
-</svg>
index c352f07..69cc689 100644 (file)
Binary files a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js and b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js differ
index 6454678..68806af 100644 (file)
Binary files a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js and b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js differ
index c352f07..69cc689 100644 (file)
Binary files a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js and b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js differ
index b719e9a..329e1f7 100644 (file)
@@ -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.
index d0a4428..c38198b 100644 (file)
@@ -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 (file)
index 36b2828..0000000
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 (file)
index 4842828..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="media.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="6.077509"
-     inkscape:cy="9.3016902"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>media/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillMedia" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <rect
-       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-opacity:1"
-       id="rect2986"
-       width="14.142136"
-       height="13.131983"
-       x="1.0101526"
-       y="1.4159228"
-       transform="translate(0,1036.3622)"
-       ry="0.053281363" />
-    <g
-       id="g3766"
-       transform="matrix(0.84027762,0,0,0.84027762,1.3177096,166.78804)">
-      <path
-         transform="matrix(1.5411765,0,0,1.5411765,-1.938603,1033.428)"
-         d="M 5.71875,5.421875 C 5.71875,6.1553782 5.1241282,6.75 4.390625,6.75 3.6571218,6.75 3.0625,6.1553782 3.0625,5.421875 c 0,-0.7335032 0.5946218,-1.328125 1.328125,-1.328125 0.7335032,0 1.328125,0.5946218 1.328125,1.328125 z"
-         sodipodi:ry="1.328125"
-         sodipodi:rx="1.328125"
-         sodipodi:cy="5.421875"
-         sodipodi:cx="4.390625"
-         id="path3756"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3760"
-         sodipodi:cx="4.390625"
-         sodipodi:cy="5.421875"
-         sodipodi:rx="1.328125"
-         sodipodi:ry="1.328125"
-         d="M 5.71875,5.421875 C 5.71875,6.1553782 5.1241282,6.75 4.390625,6.75 3.6571218,6.75 3.0625,6.1553782 3.0625,5.421875 c 0,-0.7335032 0.5946218,-1.328125 1.328125,-1.328125 0.7335032,0 1.328125,0.5946218 1.328125,1.328125 z"
-         transform="matrix(1.5411765,0,0,1.5411765,2.655147,1033.428)" />
-      <rect
-         ry="0.74078137"
-         y="1043.9247"
-         x="2.375"
-         height="4.8125"
-         width="9.625"
-         id="rect3762"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <rect
-         ry="0.74078137"
-         y="1045.4247"
-         x="12.09375"
-         height="2"
-         width="2.03125"
-         id="rect3764"
-         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    </g>
-  </g>
-</svg>
index 587b482..e4fcc22 100644 (file)
Binary files a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js and b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js differ
index 207fa8f..5faab6e 100644 (file)
Binary files a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js and b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js differ
index 587b482..e4fcc22 100644 (file)
Binary files a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js and b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js differ
index ccbbbb5..70fe607 100644 (file)
@@ -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');
index 524202c..0fe7d65 100644 (file)
@@ -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 (file)
index 33fbb63..0000000
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 (file)
index 1bf589a..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="orderedlist.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-8.2482624"
-     inkscape:cy="4.0559186"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:64px;font-style:normal;font-variant:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Arial Ordered list"
-       x="6.2503185"
-       y="1043.1448"
-       id="text2984"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         x="6.2503185"
-         y="1043.1448"
-         style="font-size:9px;font-style:normal;font-variant:normal;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Ordered list"
-         id="tspan2984">1-</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text2987"
-       y="1051.6046"
-       x="6.2503185"
-       style="font-size:64px;font-style:normal;font-variant:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Arial Ordered list"
-       xml:space="preserve"><tspan
-         id="tspan2989"
-         style="font-size:9px;font-style:normal;font-variant:normal;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Ordered list"
-         y="1051.6046"
-         x="6.2503185"
-         sodipodi:role="line">2-</tspan></text>
-  </g>
-</svg>
index c1a0706..a2cc475 100644 (file)
Binary files a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js and b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js differ
index d606ba0..d5cc764 100644 (file)
Binary files a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js and b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js differ
index c1a0706..a2cc475 100644 (file)
Binary files a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js and b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js differ
index 8f54943..93a00c0 100644 (file)
@@ -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);
     }
 };
index 29cca4c..1383604 100644 (file)
 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 (file)
index 2c708fa..0000000
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 (file)
index 875d870..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="outdent.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-8.2482624"
-     inkscape:cy="15.312045"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:64px;font-style:normal;font-variant:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Arial Outdent"
-       x="7.2604713"
-       y="1049.6475"
-       id="text2984"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2986"
-         x="7.2604713"
-         y="1049.6475"
-         style="font-size:14px;font-style:normal;font-variant:normal;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Outdent">&lt;</tspan></text>
-  </g>
-</svg>
index cd8bd52..c0a4827 100644 (file)
Binary files a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js and b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js differ
index 4d14a82..16df6c4 100644 (file)
Binary files a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js and b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js differ
index cd8bd52..c0a4827 100644 (file)
Binary files a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js and b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js differ
index 2f7eebc..96e8a9c 100644 (file)
@@ -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);
     }
 };
index 000bb44..22e7796 100644 (file)
@@ -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 (file)
index c5c3a61..0000000
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 (file)
index 214f257..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="strike.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-8.2482624"
-     inkscape:cy="15.312045"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       id="g2985"
-       transform="translate(0.3788072,0.69447987)">
-      <text
-         sodipodi:linespacing="125%"
-         id="text2984"
-         y="1047.1852"
-         x="7.7024131"
-         style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS"
-         xml:space="preserve"><tspan
-           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-           y="1047.1852"
-           x="7.7024131"
-           id="tspan2986"
-           sodipodi:role="line">s</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path2984"
-         d="m 3.0304576,1043.3971 9.6595834,0"
-         style="fill:none;stroke:#999999;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
index 34f2908..3807083 100644 (file)
Binary files a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js and b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js differ
index d37fd84..873cb8c 100644 (file)
Binary files a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js and b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js differ
index 34f2908..3807083 100644 (file)
Binary files a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js and b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js differ
index 06b0629..c69ce0d 100644 (file)
@@ -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);
     }
 };
index 6f40550..ae81ffd 100644 (file)
@@ -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 (file)
index 9a587fb..0000000
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 (file)
index 18f1b62..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="title.svg"
-   inkscape:export-filename="/home/damyonw/Documents/Moodle/instances/im/moodle/lib/editor/atto/plugins/title/pix/title.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="10.944636"
-     inkscape:cy="10.261282"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1175"
-     inkscape:window-height="714"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:60.68878555px;font-style:normal;font-variant:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Arial Title"
-       x="7.4835119"
-       y="1106.6505"
-       id="text2984"
-       sodipodi:linespacing="125%"
-       transform="scale(1.0545606,0.94826226)"><tspan
-         sodipodi:role="line"
-         id="tspan2986"
-         x="7.4835119"
-         y="1106.6505"
-         style="font-size:13.27567196px;font-style:normal;font-variant:normal;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Title">T</tspan></text>
-    <rect
-       style="fill:none;stroke:#999999;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect2984"
-       width="13.068849"
-       height="13.195118"
-       x="1.3889598"
-       y="1.2896537"
-       transform="translate(0,1036.3622)"
-       ry="0.74078137" />
-    <path
-       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0.46544716;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       d="m 23.655897,1047.3429 c -3.478888,-4.407 -1.017073,-1.216 -3.777349,-4.5667 0,-0.1504 0.1952,-0.2718 0.437667,-0.2718 l 6.845979,0 c 0.242467,0 0.547252,0.1374 0.437667,0.2718 l -3.506296,4.2951 c -0.109585,0.1342 -0.1952,0.2716 -0.437668,0.2716 z"
-       id="rect2985"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccssssc" />
-  </g>
-</svg>
index 641b0e5..1908ff6 100644 (file)
Binary files a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js and b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js differ
index 2235d53..9dfde66 100644 (file)
Binary files a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js and b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js differ
index 641b0e5..1908ff6 100644 (file)
Binary files a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js and b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js differ
index d6241e4..151311a 100644 (file)
@@ -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},
index bde1f90..946145d 100644 (file)
@@ -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 (file)
index 329e497..0000000
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 (file)
index 1d1feb4..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="underline.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-8.2482624"
-     inkscape:cy="15.312045"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS"
-       x="8.0812206"
-       y="1047.1852"
-       id="text2984"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2986"
-         x="8.0812206"
-         y="1047.1852"
-         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">u</tspan></text>
-    <path
-       style="fill:none;stroke:#999999;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3.5986684,1048.4479 9.6595836,0"
-       id="path2984"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
index caa347e..218a670 100644 (file)
Binary files a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js and b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js differ
index 6954ce2..86d3a2f 100644 (file)
Binary files a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js and b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js differ
index caa347e..218a670 100644 (file)
Binary files a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js and b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js differ
index f4ac98f..9734610 100644 (file)
@@ -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);
     }
 };
index eef0449..b1023b0 100644 (file)
 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 (file)
index 1dbbb9c..0000000
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 (file)
index 79126bc..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="unlink.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-8.5976985"
-     inkscape:cy="1.7715312"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="872"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       id="g3812">
-      <rect
-         ry="0.053281363"
-         y="1040.9337"
-         x="-13.535714"
-         height="6.8750005"
-         width="19.107143"
-         id="rect2984"
-         style="fill:none;stroke:#999999;stroke-width:2.90000010000000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <path
-         id="rect3756"
-         transform="translate(0,1036.3622)"
-         d="m 1.875,7.84375 c -0.029518,0 -0.03125,0.032982 -0.03125,0.0625 l 0,0.1875 c 0,0.029518 0.00173,0.0625 0.03125,0.0625 l 5.03125,0 0,-0.3125 z"
-         style="fill:none;stroke:#999999;stroke-width:2.89999999999999991;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssssccs" />
-    </g>
-    <g
-       id="g3808"
-       transform="matrix(0.92557914,0.37855417,-0.37855417,0.92557914,396.7365,74.82763)">
-      <rect
-         style="fill:none;stroke:#999999;stroke-width:2.90000010000000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         id="rect3754"
-         width="19.107143"
-         height="6.8750005"
-         x="10.432884"
-         y="1040.9337"
-         ry="0.053281363" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#999999;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         d="m 13.973214,1044.206 c 0.02952,0 0.03125,0.033 0.03125,0.063 l 0,0.1875 c 0,0.03 -0.0017,0.063 -0.03125,0.063 l -4.4838532,-0.2046 0,-0.3125 4.4838532,0.2046 z"
-         id="path3806"
-         sodipodi:nodetypes="cssscccc" />
-    </g>
-  </g>
-</svg>
index 365a993..89959a8 100644 (file)
Binary files a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js and b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js differ
index 4f412d0..c306b0a 100644 (file)
Binary files a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js and b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js differ
index 365a993..89959a8 100644 (file)
Binary files a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js and b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js differ
index fd19d81..73923fb 100644 (file)
@@ -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);
     }
 };
index 6224f90..b70903e 100644 (file)
 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 (file)
index 95b9d12..0000000
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 (file)
index 8cf1231..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="unorderedlist.svg" preserveAspectRatio="xMinYMid meet">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-8.2482624"
-     inkscape:cy="15.941996"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="685"
-     inkscape:window-x="162"
-     inkscape:window-y="57"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       id="g3761">
-      <text
-         sodipodi:linespacing="125%"
-         id="text2984"
-         y="1048.511"
-         x="4.8613591"
-         style="font-size:64px;font-style:normal;font-variant:normal;font-weight:unorderedlist;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Arial Unordered list"
-         xml:space="preserve"><tspan
-           id="tspan2984"
-           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:unorderedlist;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Unordered list"
-           y="1048.511"
-           x="4.8613591"
-           sodipodi:role="line">*</tspan></text>
-      <text
-         sodipodi:linespacing="125%"
-         id="text2989"
-         y="1044.4072"
-         x="11.111678"
-         style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS"
-         xml:space="preserve"><tspan
-           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-           y="1044.4072"
-           x="11.111678"
-           id="tspan2991"
-           sodipodi:role="line">-</tspan></text>
-    </g>
-    <g
-       id="g3767"
-       transform="translate(0,6)">
-      <text
-         xml:space="preserve"
-         style="font-size:64px;font-style:normal;font-variant:normal;font-weight:unorderedlist;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Arial Unordered list"
-         x="4.8613591"
-         y="1048.511"
-         id="text3769"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           x="4.8613591"
-           y="1048.511"
-           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:unorderedlist;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Unordered list"
-           id="tspan3771">*</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS"
-         x="11.111678"
-         y="1044.4072"
-         id="text3773"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan3775"
-           x="11.111678"
-           y="1044.4072"
-           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#999999;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">-</tspan></text>
-    </g>
-  </g>
-</svg>
index 4915b2e..e430b83 100644 (file)
Binary files a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js and b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js differ
index 5694eae..dc606fc 100644 (file)
Binary files a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js and b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js differ
index 4915b2e..e430b83 100644 (file)
Binary files a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js and b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js differ
index e86e3e9..6e1d30c 100644 (file)
@@ -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);
     }
 };
index e794e85..a633da9 100644 (file)
@@ -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;
+}
index 495df23..2ebeb90 100644 (file)
Binary files a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js and b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js differ
index 8729081..9ce52aa 100644 (file)
Binary files a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js and b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js differ
index 495df23..2ebeb90 100644 (file)
Binary files a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js and b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js differ
index b794060..8dc7d7a 100644 (file)
@@ -152,17 +152,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('<div class="atto_group ' + groupname + '_group"></div>');
+            toolbar.append(group);
+        }
         var button = Y.Node.create('<button class="atto_' + plugin + '_button atto_hasmenu" ' +
                                     'data-editor="' + Y.Escape.html(elementid) + '" ' +
                                     'data-menu="' + plugin + '_' + elementid + '" >' +
                                     icon +
                                     '</button>');
 
-        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('<div class="atto_group ' + groupname +'_group"></div>');
+            toolbar.append(group);
+        }
         var button = Y.Node.create('<button class="atto_' + plugin + '_button" ' +
                                    'data-editor="' + Y.Escape.html(elementid) + '" ' +
                                    'data-plugin="' + Y.Escape.html(plugin) + '" ' +
@@ -226,7 +238,7 @@ M.editor_atto = M.editor_atto || {
                                     icon +
                                     '</button>');
 
-        toolbar.append(button);
+        group.append(button);
 
         // We only need to attach this once.
         if (!M.editor_atto.buttonhandlers[plugin]) {