Merge branch 'w36_MDL-35177_m24_editoradminicons' of git://github.com/skodak/moodle

2012-09-05 11:45:56 +08:00
parent 937b0acba1 03f48b4797
commit 01ba041fa6
7 changed files with 8 additions and 1 deletions
@@ -145,7 +145,7 @@ class tiynce_subplugins_settings extends admin_setting {
     * @return string
     */
    public function output_html($data, $query='') {
-        global $CFG, $OUTPUT;
+        global $CFG, $OUTPUT, $PAGE;
        require_once("$CFG->libdir/editorlib.php");
        require_once("$CFG->libdir/pluginlib.php");
        require_once(__DIR__.'/lib.php');
@@ -198,6 +198,13 @@ class tiynce_subplugins_settings extends admin_setting {
                $displayname = html_writer::tag('span', $namestr, array('class'=>'dimmed_text'));
            }

+            if ($PAGE->theme->resolve_image_location('icon', 'tinymce_' . $name)) {
+                $icon = $OUTPUT->pix_icon('icon', '', 'tinymce_' . $name, array('class' => 'smallicon pluginicon'));
+            } else {
+                $icon = $OUTPUT->pix_icon('spacer', '', 'moodle', array('class' => 'smallicon pluginicon noicon'));
+            }
+            $displayname  = $icon . ' ' . $displayname;
+
            // Add available buttons.
            $buttons = implode(', ', $plugin->get_buttons());
            $buttons = html_writer::tag('span', $buttons, array('class'=>'tinymcebuttons'));