More tweaks to fix on/off button for admins o ncourse listings

diff --git a/course/category.php b/course/category.php
index db2fe1525e8b2d90e6d4d38da94407bc0eedd28b..c15781886b9d9a1f88cd1954e1fa1408f98b9409 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -69,7 +69,7 @@
                print_header("$site->shortname: $category->name", "$site->fullname", 
                          "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> ".
                          "<a href=\"index.php\">$strcategories</a> -> $category->name",
-                         "", "", true, $updatebutton);
+                         "", "", true, $navbaritem);
         } else {
                print_header("$site->shortname: $category->name", "$site->fullname", 
                          "<a href=\"index.php\">$strcourses</a> -> $category->name", "", "", true, $navbaritem);
@@ -269,8 +269,8 @@
             echo "<tr>";
             echo "<td><a $linkcss href=\"view.php?id=$course->id\">$course->fullname</a></td>";
             if ($creatorediting) {
-                echo "<td>";
                 if ($adminediting) {
+                    echo "<td>";
                     echo "<a title=\"$strassignteachers\" href=\"$CFG->wwwroot/course/teacher.php?id=$course->id\"><img".
                          " src=\"$pixpath/t/user.gif\" height=11 width=11 border=0></a> ";
                     echo "<a title=\"$strdelete\" href=\"delete.php?id=$course->id\"><img".

diff --git a/lib/weblib.php b/lib/weblib.php
index f36f8efea1a9b1fd65ec62220cf54268f0d24f24..4c9e3a7376aafda9b9b5754fd3f73ad9932b15a1 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1265,8 +1265,8 @@ function update_category_button($categoryid) {
         } else {
             $string = get_string("turneditingon");
             $edit = "on";
-        }
-        return "<form target=_parent method=get action=\"$CFG->wwwroot/course/category.php\">".
+        } 
+        return "<form method=get action=\"$CFG->wwwroot/course/category.php\">".
                "<input type=hidden name=id value=\"$categoryid\">".
                "<input type=hidden name=edit value=\"$edit\">".
                "<input type=submit value=\"$string\"></form>";