From 8140c67e4504d58bea2ad95e75193453d3072a9e Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sun, 4 May 2003 12:34:43 +0000
Subject: [PATCH] More tweaks to the topic interface ... nice light globes!

---
 course/topics.php  |  20 ++++++++++++--------
 lang/en/moodle.php |   1 +
 pix/i/marked.gif   | Bin 0 -> 282 bytes
 pix/i/marker.gif   | Bin 269 -> 276 bytes
 4 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100755 pix/i/marked.gif

diff --git a/course/topics.php b/course/topics.php
index 2f3766f741..94df410c34 100644
--- 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 40bc73705a..6a7ac547dc 100644
--- 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
index 0000000000000000000000000000000000000000..18949cd8e66357dbd7a1f3c5eca93046b14ee555
GIT binary patch
literal 282
zcmZ?wbhEHb6krfwxXJ(m|NsC0_wV1|zkmPy`Sbht?;k&YeEIU_-Me>BpFVx~@Zp08
z5ANN&ckSA>t5>gHxpL*wrArqtUOa#P{MoZ-Pn|k-<j9e|d-rbMym{@~wX0UGnmv2=
ztXZ?Vy1F_#IvN@pYHMq=v$M0ZvSMRnqoSfBA|k@W!-Io^{r&xYeSN*Xy`7w#Y;0`I
z%*>39jkUG4<>lpNWo2b#WF#ac#KgpegoFeI1-ZGo+1S`vSy@?FSb$CiI~hSJ{$ycf
zU|?j>0SSTp#K2~LprOD+N2-<Kz{VL@UQRmAaKLk_-0~}HCe6GmwejwA(>=1mr_<DL
Y?b)Yx`~F$Bb2aYm43>NAc$gTh0s3Bj0RR91

literal 0
HcmV?d00001

diff --git a/pix/i/marker.gif b/pix/i/marker.gif
index 6f0dbbf20a41932a3835c5ac28b9ae89f593f526..6fc2690e9fee902990d95cda5fb1e8a0249eb116 100755
GIT binary patch
delta 59
zcmV-B0L1@|0+a%f;50G7fN)4G8ifGBv6w_EmrtQC5G7WnRO5BH-6D_OWtJ-*f6GrV
RGpV+o(d_cMZS@8L06Xp78ZiI>

delta 52
zcmV-40L%ZB0*wNY;4Lb^fN)4G8jr{%5}+gkn9aZws(ebPSgJJ%-ExQCBlUXChRadm
Kxteafg8(~9CKufR

-- 
2.39.5