Tweaks to page titles to make them more consistent

diff --git a/admin/config.php b/admin/config.php
index 337844a4ffea6087da05ed43d2fa594a4d353000..478f61ce057f22d7a121a6ed162fdfa8455faee0 100644 (file)
--- a/admin/config.php
+++ b/admin/config.php
@@ -66,7 +66,7 @@
     $strconfigvariables = get_string("configvariables");
 
     if ($site) {
-        print_header("$site->fullname", "$site->fullname",
+        print_header("$site->shortname: $strconfigvariables", "$site->fullname",
                       "<A HREF=\"$CFG->wwwroot/admin/\">$stradmin</A> -> $strconfigvariables", "$focus");
         print_heading($strconfigvariables);
     } else {

diff --git a/admin/index.php b/admin/index.php
index 70d7f16d5cea10c8c9d4c33351a0b180a0146905..30447a6702617e0917fa7258c98e63e966f5ce13 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -230,7 +230,7 @@
 /// At this point everything is set up and the user is an admin, so print menu
 
     $stradministration = get_string("administration");
-    print_header("$site->fullname: $stradministration","$site->fullname: $stradministration", "$stradministration");
+    print_header("$site->shortname: $stradministration","$site->fullname: $stradministration", "$stradministration");
 
     $table->head  = array (get_string("site"), get_string("courses"), get_string("users"));
     $table->align = array ("CENTER", "CENTER", "CENTER");

diff --git a/admin/lang.php b/admin/lang.php
index 6ae710736948093154a601a0ff1fd0f88735734e..8c10772177a087570d06f5e0283103edfd72bdd9 100644 (file)
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -31,6 +31,7 @@
             $title = $strcomparelanguage;
             break;
         default:
+            $title = $strchecklanguage;
             $navigation = $strchecklanguage;
             break;
     }
@@ -41,7 +42,7 @@
         $currentlang = $CFG->lang;
     }
 
-    print_header("$site->fullname: $title", "$site->fullname",
+    print_header("$site->shortname: $title", "$site->fullname",
                  "<A HREF=\"index.php\">$stradministration</A> -> $navigation");
 
     if (!$mode) {

diff --git a/admin/site.php b/admin/site.php
index f9b6021795e29ff2a1056635d47b959288b1d625..ca8090d2c7468bb4ca9674275f20fc75a029b24f 100644 (file)
--- a/admin/site.php
+++ b/admin/site.php
@@ -61,7 +61,7 @@
     $stradmin = get_string("administration");
     $strsitesettings = get_string("sitesettings");
 
-    print_header("$site->fullname", "$site->fullname",
+    print_header("$site->shortname: $strsitesettings", "$site->fullname",
                   "<A HREF=\"$CFG->wwwroot/admin/\">$stradmin</A> -> $strsitesettings", "$focus");
 
     print_heading($strsitesettings);

diff --git a/admin/user.php b/admin/user.php
index db67435e13a511ac2e4f716f71498f94c9efc8e4..780e1866faf6fe539472e749a3c97f12264934ef 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -91,7 +91,7 @@
         $strdelete = get_string("delete");
         $strdeletecheck = get_string("deletecheck");
 
-        print_header("$site->fullname : $stredituser", $site->fullname, 
+        print_header("$site->shortname: $stredituser", $site->fullname, 
                      "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> $stredituser");
 
         if ($delete) {              // Delete a selected user, after confirmation

diff --git a/course/categories.php b/course/categories.php
index 7e01d51c3dd94346c516d7b2197add249cc49916..2958736d82d315e6aa267cccfab6d0640c37a995 100644 (file)
--- a/course/categories.php
+++ b/course/categories.php
@@ -24,7 +24,7 @@
     $straction = get_string("action");
     $stradd = get_string("add");
 
-       print_header("$site->fullname: $strcategories", "$site->fullname", 
+       print_header("$site->shortname: $strcategories", "$site->fullname", 
                  "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> $strcategories");
 
     print_heading($strcategories);

diff --git a/course/delete.php b/course/delete.php
index 1df4f60d7d3e0a43dfe949e97897ccb6084b1ed1..45f9a8fc2fb1ec1cbd4be02b4239f634211e48ad 100644 (file)
--- a/course/delete.php
+++ b/course/delete.php
@@ -20,7 +20,7 @@
     $stradministration = get_string("administration");
 
     if (!$id) {
-           print_header("$site->fullname : $strdeletecourse", $site->fullname, 
+           print_header("$site->shortname: $strdeletecourse", $site->fullname, 
                      "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> $strdeletecourse");
 
         if ($courses = get_records_sql("SELECT * from course WHERE category > 0 ORDER BY fullname")) {
@@ -45,7 +45,7 @@
     if (! $delete) {
         $strdeletecheck = get_string("deletecheck", "", $course->shortname);
         $strdeletecoursecheck = get_string("deletecoursecheck");
-           print_header("$site->fullname : $strdeletecheck", $site->fullname, 
+           print_header("$site->shortname: $strdeletecheck", $site->fullname, 
                      "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
                       <A HREF=\"delete.php\">$strdeletecourse</A> -> $strdeletecheck");
 
@@ -62,7 +62,7 @@
     // OK checks done, delete the course now.
     $strdeletingcourse = get_string("deletingcourse", "", $course->shortname);
 
-       print_header("$site->fullname : $strdeletingcourse", $site->fullname, 
+       print_header("$site->shortname: $strdeletingcourse", $site->fullname, 
                  "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
                   <A HREF=\"delete.php\">$strdeletecourse</A> -> $strdeletingcourse");
 

diff --git a/course/edit.php b/course/edit.php
index f5d0e7629162bef0a56d68c898927f203e77ac17..540ec2150a8ce5adfdd26465275eb08f8ee7c1aa 100644 (file)
--- a/course/edit.php
+++ b/course/edit.php
@@ -112,7 +112,7 @@
                      "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
                       -> $streditcoursesettings", $focus);
     } else {
-        print_header("$site->shortname : $straddnewcourse", "$site->fullname",
+        print_header("$site->shortname: $straddnewcourse", "$site->fullname",
                      "<A HREF=\"$CFG->wwwroot/admin/\">$stradministration</A> 
                       -> $straddnewcourse", $focus);
     }

diff --git a/course/teacher.php b/course/teacher.php
index ad69fc231eddff1ca6567409a8ec49ae56ab6076..9718df5f58cd9265c01994443affe86f8d58b6d6 100644 (file)
--- a/course/teacher.php
+++ b/course/teacher.php
@@ -29,7 +29,7 @@
     $strtoomanytoshow   = get_string("toomanytoshow");
 
     if (!$id) {
-           print_header("$site->fullname: $strassignteachers", "$site->fullname", 
+           print_header("$site->shortname: $strassignteachers", "$site->fullname", 
                      "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> $strassignteachers");
 
         if ($courses = get_records_sql("SELECT * from course WHERE category > 0 ORDER BY fullname")) {
@@ -53,7 +53,7 @@
     }
 
 
-       print_header("$site->fullname: $course->shortname: $strassignteachers", 
+       print_header("$site->shortname: $course->shortname: $strassignteachers", 
                  "$site->fullname", 
                  "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
                   <A HREF=\"teacher.php\">$strassignteachers</A> ->

diff --git a/user/edit.php b/user/edit.php
index 02d981d54b9544d13f5a0501fa044c49d7accad0..c0cf126aa1db7e57b3cba0f49f74192c9700dc7f 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -169,13 +169,13 @@
             $userfullname = "$user->firstname $user->lastname";
         }
         if ($course->category) {
-               print_header("$course->fullname: $streditmyprofile", "$course->fullname: $streditmyprofile",
+               print_header("$course->shortname: $streditmyprofile", "$course->fullname: $streditmyprofile",
                         "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
                         -> <A HREF=\"index.php?id=$course->id\">$strparticipants</A>
                         -> <A HREF=\"view.php?id=$user->id&course=$course->id\">$userfullname</A> 
                         -> $streditmyprofile", "");
         } else {
-               print_header("$course->fullname: $streditmyprofile", "$course->fullname",
+               print_header("$course->shortname: $streditmyprofile", "$course->fullname",
                          "<A HREF=\"view.php?id=$user->id&course=$course->id\">$userfullname</A> 
                           -> $streditmyprofile", "");
         }
@@ -184,7 +184,7 @@
         $straddnewuser = get_string("addnewuser");
 
         $stradministration = get_string("administration");
-           print_header("$course->fullname: $streditmyprofile", "$course->fullname",
+           print_header("$course->shortname: $streditmyprofile", "$course->fullname",
                      "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> ->
                       $straddnewuser", "");
     }