Added help link to course pages (for teachers) and tidied up the

course admin links in general (new fucntion and reorder)

diff --git a/course/lib.php b/course/lib.php
index 935344e8fee2336e215cc0b71c861751c1d0e6f3..8da6a722bbdd5e73857b71bce9f9f3e6b0433fb6 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -528,6 +528,34 @@ function print_admin_links ($siteid) {
     echo "<IMG SRC=\"$CFG->wwwroot/pix/spacer.gif\" WIDTH=200 HEIGHT=0><BR>";
 }
 
+function print_course_admin_links($courseid) {
+    global $THEME, $CFG;
+
+    echo "<BR>";
+    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+    if (isediting($courseid)) {
+        $admindata[]="<A HREF=\"view.php?id=$courseid&edit=off\">".get_string("turneditingoff")."</A>";
+    } else {
+        $admindata[]="<A HREF=\"view.php?id=$courseid&edit=on\">".get_string("turneditingon")."</A>";
+    }
+    $admindata[]="<A HREF=\"edit.php?id=$courseid\">".get_string("settings")."...</A>";
+    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+    $admindata[]="<A HREF=\"log.php?id=$courseid\">".get_string("logs")."...</A>";
+    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/log.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+    $admindata[]="<A HREF=\"$CFG->wwwroot/files/index.php?id=$courseid\">".get_string("files")."...</A>";
+    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/files/pix/files.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+
+    $admindata[]="<A TARGET=helpwindow HREF=\"$CFG->wwwroot/doc/teacher.html\">".get_string("help")."...</A>";
+    $adminicon[]="<IMG SRC=\"$CFG->wwwroot/mod/reading/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+
+    if ($teacherforum = forum_get_course_forum($courseid, "teacher")) {
+        $admindata[]="<A HREF=\"$CFG->wwwroot/mod/forum/view.php?f=$teacherforum->id\">".get_string("teacherforum")."</A>";
+        $adminicon[]="<IMG SRC=\"$CFG->wwwroot/mod/forum/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
+    }
+
+    print_simple_box(get_string("administration"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
+    print_side_block("", $admindata, "", $adminicon);
+}
 
 
 function print_log_graph($course, $userid=0, $type="course.png", $date=0) {

diff --git a/course/social.php b/course/social.php
index 8207626c97502ded5145e167c9f9c4a302c82d6e..3d2a5a97541edaee6e7855a06caea443ce39fe0c 100644 (file)
--- a/course/social.php
+++ b/course/social.php
@@ -49,30 +49,9 @@
       forum_print_search_form($course);
       echo "</DIV>";
 
-      // Print Admin links for teachers and admin.
+      // Admin links and controls
       if (isteacher($course->id)) {
-          echo "<BR>";
-          $admindata[]="<A HREF=\"edit.php?id=$course->id\">".get_string("settings")."...</A>";
-          $adminicon[]="<IMG SRC=\"../pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-          $admindata[]="<A HREF=\"log.php?id=$course->id\">".get_string("logs")."...</A>";
-          $adminicon[]="<IMG SRC=\"../pix/i/log.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-          $admindata[]="<A HREF=\"../files/index.php?id=$course->id\">".get_string("files")."...</A>";
-          $adminicon[]="<IMG SRC=\"../files/pix/files.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-  
-          if ($teacherforum = forum_get_course_forum($course->id, "teacher")) {
-              $admindata[]="<A HREF=\"../mod/forum/view.php?f=$teacherforum->id\">".get_string("teacherforum")."</A>";
-              $adminicon[]="<IMG SRC=\"../mod/forum/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-          }
-  
-          $adminicon[]="<IMG SRC=\"../pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-          if (isediting($course->id)) {
-              $admindata[]="<A HREF=\"view.php?id=$course->id&edit=off\">".get_string("turneditingoff")."</A>";
-          } else {
-              $admindata[]="<A HREF=\"view.php?id=$course->id&edit=on\">".get_string("turneditingon")."</A>";
-          }
-  
-          print_simple_box(get_string("administration"),"CENTER", "100%", $THEME->cellheading);
-          print_side_block("", $admindata, "", $adminicon);
+          print_course_admin_links($course->id);
       }
 
       echo "</TD>";

diff --git a/course/topics.php b/course/topics.php
index 8198ce4952fdf6bd8f928fffff45dfd49cccb38c..d7a5628af37d6f2a24e2faecea44d3e0ed236aba 100644 (file)
--- a/course/topics.php
+++ b/course/topics.php
@@ -78,33 +78,10 @@
     echo "</DIV>";
 
     // Admin links and controls
-
     if (isteacher($course->id)) {
-        echo "<BR>";
-        $admindata[]="<A HREF=\"edit.php?id=$course->id\">".get_string("settings")."...</A>";
-        $adminicon[]="<IMG SRC=\"../pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        $admindata[]="<A HREF=\"log.php?id=$course->id\">".get_string("logs")."...</A>";
-        $adminicon[]="<IMG SRC=\"../pix/i/log.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        $admindata[]="<A HREF=\"../files/index.php?id=$course->id\">".get_string("files")."...</A>";
-        $adminicon[]="<IMG SRC=\"../files/pix/files.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-
-        if ($teacherforum = forum_get_course_forum($course->id, "teacher")) {
-            $admindata[]="<A HREF=\"../mod/forum/view.php?f=$teacherforum->id\">".get_string("teacherforum")."</A>";
-            $adminicon[]="<IMG SRC=\"../mod/forum/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        }
-
-        $adminicon[]="<IMG SRC=\"../pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        if (isediting($course->id)) {
-            $admindata[]="<A HREF=\"view.php?id=$course->id&edit=off\">".get_string("turneditingoff")."</A>";
-        } else {
-            $admindata[]="<A HREF=\"view.php?id=$course->id&edit=on\">".get_string("turneditingon")."</A>";
-        }
-
-        print_simple_box(get_string("administration"),"CENTER", "100%", $THEME->cellheading);
-        print_side_block("", $admindata, "", $adminicon);
+        print_course_admin_links($course->id);
     }
 
-
     // Start main column
     echo "</TD><TD WIDTH=\"*\">";
 

diff --git a/course/weeks.php b/course/weeks.php
index 2c8f333fa2c7d54596d4afbc76c8229680e7e921..83cc21bec936c81989bf0291dbfb3f9c0594dd8f 100644 (file)
--- a/course/weeks.php
+++ b/course/weeks.php
@@ -65,33 +65,10 @@
     echo "</DIV>";
 
     // Admin links and controls
-
     if (isteacher($course->id)) {
-        echo "<BR>";
-        $admindata[]="<A HREF=\"edit.php?id=$course->id\">".get_string("settings")."...</A>";
-        $adminicon[]="<IMG SRC=\"../pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        $admindata[]="<A HREF=\"log.php?id=$course->id\">".get_string("logs")."...</A>";
-        $adminicon[]="<IMG SRC=\"../pix/i/log.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        $admindata[]="<A HREF=\"../files/index.php?id=$course->id\">".get_string("files")."...</A>";
-        $adminicon[]="<IMG SRC=\"../files/pix/files.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-
-        if ($teacherforum = forum_get_course_forum($course->id, "teacher")) {
-            $admindata[]="<A HREF=\"../mod/forum/view.php?f=$teacherforum->id\">".get_string("teacherforum")."</A>";
-            $adminicon[]="<IMG SRC=\"../mod/forum/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        }
-        $adminicon[]="<IMG SRC=\"../pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        if (isediting($course->id)) {
-            $admindata[]="<A HREF=\"view.php?id=$course->id&edit=off\">".get_string("turneditingoff")."</A>";
-        } else {
-            $admindata[]="<A HREF=\"view.php?id=$course->id&edit=on\">".get_string("turneditingon")."</A>";
-        }
-
-
-        print_simple_box(get_string("administration"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-        print_side_block("", $admindata, "", $adminicon);
+        print_course_admin_links($course->id);
     }
 
-
     // Start main column
     echo "</TD><TD WIDTH=\"*\">";
 

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 2a58161eb0f71d01186257798d4e5a86767cfa5d..5c117e325fc19b1197b6f1f4b9c2c895248b6790 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -142,6 +142,7 @@ http://www.gnu.org/copyleft/gpl.html";
 $string[grade] = "Grade";
 $string[guestsno] = "No, do not allow guests in";
 $string[guestsyes] = "Yes, allow 'guest' student in";
+$string[help] = "Help";
 $string[helppicture] = "How to upload a picture";
 $string[helptext] = "How to write text";
 $string[helpquestions] = "How to ask questions";