Course category listings now have a search box in the navbar for students

and non-users

diff --git a/course/category.php b/course/category.php
index 3bd0d95ef3095d10fb0c3ae6cb23e6d2fde09d11..65e070173689f8a08614d5c102f3bcc3c76a8231 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -27,13 +27,13 @@
                 $USER->editing = false;
             }
         }
-        $updatebutton = update_category_button($category->id);
+        $navbaritem = update_category_button($category->id);
 
         $creatorediting = !empty($USER->editing);
         $adminediting = (isadmin() and $creatorediting);
 
     } else {
-        $updatebutton = "";
+        $navbaritem = print_course_search("", true, "navbar");
         $adminediting = false;
     }
 
@@ -72,11 +72,11 @@
                          "", "", true, $updatebutton);
         } else {
                print_header("$site->shortname: $category->name", "$site->fullname", 
-                         "<a href=\"index.php\">$strcourses</a> -> $category->name", "", "", true, $updatebutton);
+                         "<a href=\"index.php\">$strcourses</a> -> $category->name", "", "", true, $navbaritem);
         }
     } else {
            print_header("$site->shortname: $category->name", "$site->fullname", 
-                     "<a href=\"index.php\">$strcourses</a> -> $category->name", "", "", true, $updatebutton);
+                     "<a href=\"index.php\">$strcourses</a> -> $category->name", "", "", true, $navbaritem);
     }
 
 

diff --git a/course/lib.php b/course/lib.php
index c874760836050662b09f960129b2697d4ec913fa..0a75604e5c1513f6e8990d83c4073455d09886c0 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1147,7 +1147,6 @@ function print_course_search($value="", $return=false, $format="plain") {
         $output .= "<form name=\"coursesearch\" action=\"$CFG->wwwroot/course/search.php\" method=\"get\">";
         $output .= "<input type=\"text\" size=20 name=\"search\" value=\"$value\">";
         $output .= "<input type=\"submit\" value=\"$strsearchcourses\">";
-        $output .= "<input name=id type=hidden value=\"$course->id\">";
         $output .= "</form>";
         $output .= "</td></tr></table>";
     }