Merged from 1.7.

diff --git a/course/lib.php b/course/lib.php
index 3869afa98dda3ed76c7b505145c08af8d7e28825..a23096959c3f33b87caf124ad1f39877fe271330 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1882,16 +1882,16 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
     static $sesskey;
 
     if (!isset($str)) {
-        $str->delete    = get_string("delete");
-        $str->move      = get_string("move");
-        $str->moveup    = get_string("moveup");
-        $str->movedown  = get_string("movedown");
-        $str->moveright = get_string("moveright");
-        $str->moveleft  = get_string("moveleft");
-        $str->update    = get_string("update");
-        $str->duplicate    = get_string("duplicate");
-        $str->hide      = get_string("hide");
-        $str->show      = get_string("show");
+        $str->delete         = get_string("delete");
+        $str->move           = get_string("move");
+        $str->moveup         = get_string("moveup");
+        $str->movedown       = get_string("movedown");
+        $str->moveright      = get_string("moveright");
+        $str->moveleft       = get_string("moveleft");
+        $str->update         = get_string("update");
+        $str->duplicate      = get_string("duplicate");
+        $str->hide           = get_string("hide");
+        $str->show           = get_string("show");
         $str->clicktochange  = get_string("clicktochange");
         $str->forcedmode     = get_string("forcedmode");
         $str->groupsnone     = get_string("groupsnone");
@@ -1913,32 +1913,35 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
     }
 
     if ($mod->visible) {
-        $hideshow = '<a title="'.$str->hide.'" href="'.$path.'/mod.php?hide='.$mod->id.
+        $hideshow = '<a class="editing_hide" title="'.$str->hide.'" href="'.$path.'/mod.php?hide='.$mod->id.
                     '&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/hide.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->hide.'" /></a> ';
+                    ' border="0" alt="'.$str->hide.'" /></a>'."\n";
     } else {
-        $hideshow = '<a title="'.$str->show.'" href="'.$path.'/mod.php?show='.$mod->id.
+        $hideshow = '<a class="editing_show" title="'.$str->show.'" href="'.$path.'/mod.php?show='.$mod->id.
                     '&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/show.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->show.'" /></a> ';
+                    ' border="0" alt="'.$str->show.'" /></a>'."\n";
     }
     if ($mod->groupmode !== false) {
         if ($mod->groupmode == SEPARATEGROUPS) {
             $grouptitle = $str->groupsseparate;
+            $groupclass = 'editing_groupseparate';
             $groupimage = $CFG->pixpath.'/t/groups.gif';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=0&amp;sesskey='.$sesskey;
         } else if ($mod->groupmode == VISIBLEGROUPS) {
             $grouptitle = $str->groupsvisible;
+            $groupclass = 'editing_groupvisible';
             $groupimage = $CFG->pixpath.'/t/groupv.gif';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=1&amp;sesskey='.$sesskey;
         } else {
             $grouptitle = $str->groupsnone;
+            $groupclass = 'editing_groupsnone';
             $groupimage = $CFG->pixpath.'/t/groupn.gif';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=2&amp;sesskey='.$sesskey;
         }
         if ($mod->groupmodelink) {
-            $groupmode = '<a title="'.$grouptitle.' ('.$str->clicktochange.')" href="'.$grouplink.'">'.
+            $groupmode = '<a class="'.$groupclass.'" title="'.$grouptitle.' ('.$str->clicktochange.')" href="'.$grouplink.'">'.
                          '<img src="'.$groupimage.'" hspace="2" height="11" width="11" '.
                          'border="0" alt="'.$grouptitle.'" /></a>';
         } else {
@@ -1951,44 +1954,44 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
     }
 
     if ($moveselect) {
-        $move =     '<a title="'.$str->move.'" href="'.$path.'/mod.php?copy='.$mod->id.
+        $move =     '<a class="editing_move" title="'.$str->move.'" href="'.$path.'/mod.php?copy='.$mod->id.
                     '&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/move.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->move.'" /></a>';
+                    ' border="0" alt="'.$str->move.'" /></a>'."\n";
     } else {
-        $move =     '<a title="'.$str->moveup.'" href="'.$path.'/mod.php?id='.$mod->id.
+        $move =     '<a class="editing_moveup" title="'.$str->moveup.'" href="'.$path.'/mod.php?id='.$mod->id.
                     '&amp;move=-1&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/up.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->moveup.'" /></a>'.
-                    '<a title="'.$str->movedown.'" href="'.$path.'/mod.php?id='.$mod->id.
+                    ' border="0" alt="'.$str->moveup.'" /></a>'."\n".
+                    '<a class="editing_movedown" title="'.$str->movedown.'" href="'.$path.'/mod.php?id='.$mod->id.
                     '&amp;move=1&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/down.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->movedown.'" /></a>';
+                    ' border="0" alt="'.$str->movedown.'" /></a>'."\n";
     }
 
     $leftright = "";
     if ($indent > 0) {
-        $leftright .= '<a title="'.$str->moveleft.'" href="'.$path.'/mod.php?id='.$mod->id.
+        $leftright .= '<a class="editing_moveleft" title="'.$str->moveleft.'" href="'.$path.'/mod.php?id='.$mod->id.
                       '&amp;indent=-1&amp;sesskey='.$sesskey.$section.'"><img'.
                       ' src="'.$CFG->pixpath.'/t/left.gif" hspace="2" height="11" width="11" '.
-                      ' border="0" alt="'.$str->moveleft.'" /></a>';
+                      ' border="0" alt="'.$str->moveleft.'" /></a>'."\n";
     }
     if ($indent >= 0) {
-        $leftright .= '<a title="'.$str->moveright.'" href="'.$path.'/mod.php?id='.$mod->id.
+        $leftright .= '<a class="editing_moveright" title="'.$str->moveright.'" href="'.$path.'/mod.php?id='.$mod->id.
                       '&amp;indent=1&amp;sesskey='.$sesskey.$section.'"><img'.
                       ' src="'.$CFG->pixpath.'/t/right.gif" hspace="2" height="11" width="11" '.
-                      ' border="0" alt="'.$str->moveright.'" /></a>';
+                      ' border="0" alt="'.$str->moveright.'" /></a>'."\n";
     }
 
-    return '<span class="commands">'.$leftright.$move.
-           '<a title="'.$str->update.'" href="'.$path.'/mod.php?update='.$mod->id.
+    return '<span class="commands">'."\n".$leftright.$move.
+           '<a class="editing_update" title="'.$str->update.'" href="'.$path.'/mod.php?update='.$mod->id.
            '&amp;sesskey='.$sesskey.$section.'"><img'.
            ' src="'.$CFG->pixpath.'/t/edit.gif" hspace="2" height="11" width="11" border="0" '.
-           ' alt="'.$str->update.'" /></a>'.
-           '<a title="'.$str->delete.'" href="'.$path.'/mod.php?delete='.$mod->id.
+           ' alt="'.$str->update.'" /></a>'."\n".
+           '<a class="editing_delete" title="'.$str->delete.'" href="'.$path.'/mod.php?delete='.$mod->id.
            '&amp;sesskey='.$sesskey.$section.'"><img'.
            ' src="'.$CFG->pixpath.'/t/delete.gif" hspace="2" height="11" width="11" border="0" '.
-           ' alt="'.$str->delete.'" /></a>'.$hideshow.$groupmode.'</span>';
+           ' alt="'.$str->delete.'" /></a>'."\n".$hideshow.$groupmode."\n".'</span>';
 }
 
 /**

diff --git a/lib/ajax/ajaxcourse.js b/lib/ajax/ajaxcourse.js
index 3346e6a56369158835ddf17fa291c09a77cdcec4..0ac21766728e3de5d4eff8144aed1821b61ccad6 100644 (file)
--- a/lib/ajax/ajaxcourse.js
+++ b/lib/ajax/ajaxcourse.js
@@ -164,6 +164,7 @@ main_class.prototype.mk_button = function(tag, imgSrc, attributes, imgAttributes
             image.setAttribute(imgAttributes[c][0], imgAttributes[c][1]);                
         }
     }
+       image.setAttribute('hspace', '3');
     return container;
 }
 

diff --git a/lib/ajax/section_classes.js b/lib/ajax/section_classes.js
index d7b60984617206724aa5e0134249ea69428c023b..e2179cb2c2df067675622d9efb0e31bca102b425 100755 (executable)
--- a/lib/ajax/section_classes.js
+++ b/lib/ajax/section_classes.js
@@ -561,17 +561,17 @@ resource_class.prototype.init_buttons = function() {
     var updateButton = null;
 
     for (var x=0; x<buttons.length; x++) {
-               if (buttons[x].title == main.portal.strings['moveleft']) {
+               if (buttons[x].className == 'editing_moveleft') {
             moveLeft = true;
-        } else if (buttons[x].title == main.portal.strings['moveright']) {
+        } else if (buttons[x].className == 'editing_moveright') {
             moveRight = true;
-        } else if (buttons[x].title == main.portal.strings['update']) {
+        } else if (buttons[x].className == 'editing_update') {
             updateButton = buttons[x].cloneNode(true);
-        } else if (buttons[x].title == strgroupsnone) {
+        } else if (buttons[x].className == 'editing_groupsnone') {
                        this.groupmode = this.NOGROUPS;
-               } else if (buttons[x].title == strgroupsseparate) {
+               } else if (buttons[x].className == 'editing_groupsseparate') {
                        this.groupmode = this.SEPARATEGROUPS;
-               } else if (buttons[x].title == strgroupsvisible) {
+               } else if (buttons[x].className == 'editing_groupsvisible') {
                        this.groupmode = this.VISIBLEGROUPS;
                }
     }