More tweaks to the topic interface ... nice light globes!

diff --git a/course/topics.php b/course/topics.php
index 2f3766f7410bdc69fd8457c14a314cf3a1839cfc..94df410c3418043fd900c48c112dc8bbbd1ada45 100644 (file)
--- a/course/topics.php
+++ b/course/topics.php
@@ -36,6 +36,7 @@
     $strcoursedisplay = get_string("coursedisplay");
     if (isediting($course->id)) { 
         $strmarkthistopic = get_string("markthistopic");
+        $strmarkedthistopic = get_string("markedthistopic");
         $strtopichide = get_string("topichide", "", moodle_strtolower($course->students));
         $strtopicshow = get_string("topicshow", "", moodle_strtolower($course->students));
     }
@@ -198,7 +199,7 @@
             echo "<td nowrap $colorsides valign=top align=center width=10>";
             echo "<font size=1>";
 
-            if ($displaysection == $section) {      // Show the zoom box
+            if ($displaysection == $section) {      // Show the zoom boxes
                 echo "<a href=\"view.php?id=$course->id&topic=all\" title=\"$strshowalltopics\">".
                      "<img src=\"$pixpath/i/all.gif\" height=25 width=16 border=0></a><br />";
             } else {
@@ -207,9 +208,16 @@
                      "<img src=\"$pixpath/i/one.gif\" height=16 width=16 border=0></a><br />";
             }
 
-            if (isediting($course->id)) {      // Show the hide/show eye
-                    $strmarkthistopic = get_string("markthistopic");
-                if ($thissection->visible) {
+            if (isediting($course->id)) {
+                if ($course->marker == $section) {  // Show the "light globe" on/off
+                    echo "<a href=\"view.php?id=$course->id&marker=0\" title=\"$strmarkedthistopic\">".
+                         "<img src=\"$pixpath/i/marked.gif\" height=16 width=16 border=0></a><br />";
+                } else {
+                    echo "<a href=\"view.php?id=$course->id&marker=$section\" title=\"$strmarkthistopic\">".
+                         "<img src=\"$pixpath/i/marker.gif\" height=16 width=16 border=0></a><br />";
+                }
+
+                if ($thissection->visible) {        // Show the hide/show eye
                     echo "<a href=\"view.php?id=$course->id&hide=$section\" title=\"$strtopichide\">".
                          "<img src=\"$pixpath/i/hide.gif\" height=16 width=16 border=0></a><br />";
                 } else {
@@ -217,10 +225,6 @@
                          "<img src=\"$pixpath/i/show.gif\" height=16 width=16 border=0></a><br />";
                 }
 
-                if ($course->marker != $section) {  // Show the "tick"
-                    echo "<a href=\"view.php?id=$course->id&marker=$section\" title=\"$strmarkthistopic\">".
-                         "<img src=\"$pixpath/i/marker.gif\" height=16 width=16 border=0></a><br />";
-                }
             }
 
             echo "</td>";

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 40bc73705a3aec73195cd720a61982c269534c96..6a7ac547dcead6605247ff5092b0a47a59b9935e 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -346,6 +346,7 @@ $string['makeafolder'] = "Make a folder";
 $string['makeeditable'] = "If you make '\$a' editable by the web server process (eg apache) then you could edit this file directly from this page";
 $string['mainmenu'] = "Main menu";
 $string['managedatabase'] = "Manage database";
+$string['markedthistopic'] = "This topic is highlighted as the current topic";
 $string['markthistopic'] = "Highlight this topic as the current topic";
 $string['maximumchars'] = "Maximum of \$a characters";
 $string['maximumgrade'] = "Maximum grade";

diff --git a/pix/i/marked.gif b/pix/i/marked.gif
new file mode 100755 (executable)
index 0000000..18949cd
Binary files /dev/null and b/pix/i/marked.gif differ

diff --git a/pix/i/marker.gif b/pix/i/marker.gif
index 6f0dbbf20a41932a3835c5ac28b9ae89f593f526..6fc2690e9fee902990d95cda5fb1e8a0249eb116 100755 (executable)
Binary files a/pix/i/marker.gif and b/pix/i/marker.gif differ