Merged button from stable

diff --git a/course/category.php b/course/category.php
index 87bbdd14337a523635dd58b2ace1fda6a150be54..59303efc5dfb4cbda969d6f84548ce15ecce5660 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -262,7 +262,8 @@
         $strhide     = get_string("hide");
         $strshow     = get_string("show");
         $strsummary  = get_string("summary");
-        $strassignteachers     = get_string("assignteachers");
+        $strsettings = get_string("settings");
+        $strassignteachers  = get_string("assignteachers");
         $strallowguests     = get_string("allowguests");
         $strrequireskey     = get_string("requireskey");
 
@@ -300,6 +301,8 @@
             if ($creatorediting) {
                 if ($adminediting) {
                     echo "<td>";
+                    echo "<a title=\"$strsettings\" href=\"$CFG->wwwroot/course/edit.php?id=$acourse->id\"><img".
+                         " src=\"$pixpath/t/edit.gif\" height=11 width=11 border=0></a> ";
                     echo "<a title=\"$strassignteachers\" href=\"$CFG->wwwroot/course/teacher.php?id=$acourse->id\"><img".
                          " src=\"$pixpath/t/user.gif\" height=11 width=11 border=0></a> ";
                     echo "<a title=\"$strdelete\" href=\"delete.php?id=$acourse->id\"><img".
@@ -339,6 +342,8 @@
 
                 } else if (isteacheredit($acourse->id)) {
                     echo "<td>";
+                    echo "<a title=\"$strsettings\" href=\"$CFG->wwwroot/course/edit.php?id=$acourse->id\"><img".
+                         " src=\"$pixpath/t/edit.gif\" height=11 width=11 border=0></a> ";
                     echo "<a title=\"$strassignteachers\" href=\"$CFG->wwwroot/course/teacher.php?id=$acourse->id\"><img".
                          " src=\"$pixpath/t/user.gif\" height=11 width=11 border=0></a> ";
                 }