Clean up of terminology course categories and courses

diff --git a/course/category.php b/course/category.php
index 077901c007696ee2b839ed0a85d8cb633c4e0261..65883920a39f8c15299b5da03bdd34617dcdfc89 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -73,11 +73,11 @@
                          "", "", true, $navbaritem);
         } else {
                print_header("$site->shortname: $category->name", "$site->fullname", 
-                         "<a href=\"index.php\">$strcourses</a> -> $category->name", "", "", true, $navbaritem);
+                         "<a href=\"index.php\">$strcategories</a> -> $category->name", "", "", true, $navbaritem);
         }
     } else {
            print_header("$site->shortname: $category->name", "$site->fullname", 
-                     "<a href=\"index.php\">$strcourses</a> -> $category->name", "", "", true, $navbaritem);
+                     "<a href=\"index.php\">$strcategories</a> -> $category->name", "", "", true, $navbaritem);
     }
 
 
@@ -88,7 +88,9 @@
     
     make_categories_list($displaylist, $parentlist, "");
     
-    echo "<table align=center><tr><td>";
+    echo "<table align=center><tr><td align=\"right\">";
+    echo "<p>$strcategories:</p>";
+    echo "</td><td>";
     popup_form("category.php?id=", $displaylist, "switchcategory", "$category->id", "", "", "", false);
     echo "</td></tr></table><br />";
 

diff --git a/course/index.php b/course/index.php
index e0c19a68f6db4370b0924ce64ad9b376e1052003..465c20215d7c03768d8ee0e547b3229e200cf17b 100644 (file)
--- a/course/index.php
+++ b/course/index.php
@@ -33,8 +33,10 @@
 
         if ($countcategories > 1) {
             $strcourses = get_string("courses");
-            print_header($strcourses, $strcourses, $strcourses, "", "", true, update_categories_button());
-            print_heading(get_string("categories"));
+            $strcategories = get_string("categories");
+            print_header("$site->shortname: $strcategories", $strcourses, 
+                          $strcategories, "", "", true, update_categories_button());
+            print_heading($strcategories);
             print_simple_box_start("center", "50%", "#FFFFFF", 5, "categorybox");
             print_whole_category_list();
             print_simple_box_end();