]> git.mjollnir.org Git - moodle.git/commitdiff
Some cleanups of the admin page to make it
authormoodler <moodler>
Sun, 10 Aug 2003 08:01:14 +0000 (08:01 +0000)
committermoodler <moodler>
Sun, 10 Aug 2003 08:01:14 +0000 (08:01 +0000)
  - more explanatory
  - more expandable

Apologies for the lost muscle memories, but I think this
will work better in the long run.

13 files changed:
admin/admin.php
admin/auth.php
admin/creators.php
admin/index.php
admin/lang.php
admin/user.php
admin/users.php [new file with mode: 0644]
course/lib.php
files/index.php
lang/en/moodle.php
lib/weblib.php
user/edit.php
user/index.php

index 7b131087fd7c5bb21deb8caa25571ddda58b5a52..daea0c42a66c59e333291b9528f20974f5708c44 100644 (file)
@@ -40,6 +40,7 @@
         "search",
         "searchagain",
         "toomanytoshow",
+        "users",
         "searchresults"
         );
 
@@ -56,8 +57,7 @@
 
        print_header("$site->shortname: $strassignadmins", 
                  "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> 
-                  <a href=\"{$_SERVER['PHP_SELF']}\">$strassignadmins</a>", "");
+                 "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strassignadmins", "");
 
 /// Get all existing admins
     $admins = get_admins();
index c6fafff09c8cf5de1a17047ca85c395c81ddde54..7f1cdc83e9dfc0204ab3ac7ca404d7d6597d218a 100644 (file)
     $strauthentication        = get_string("authentication");
     $strauthenticationoptions = get_string("authenticationoptions","auth");
     $strsettings = get_string("settings");
+    $strusers = get_string("users");
 
     print_header("$site->shortname: $strauthenticationoptions", "$site->fullname",
-                  "<A HREF=\"index.php\">$stradministration</A> -> $strauthenticationoptions", "$focus");
+                  "<A HREF=\"index.php\">$stradministration</A> -> <a href=\"users.php\">$strusers</a> -> $strauthenticationoptions", "$focus");
 
     echo "<CENTER><P><B>";
     echo "<form TARGET=\"{$CFG->framename}\" NAME=\"authmenu\" method=\"post\" action=\"auth.php\">";
index 139e2231da6a6496863fe89d3bc87d410adc9df1..3505abab0176a66949eebadb58302528a3b4a21f 100755 (executable)
@@ -39,6 +39,7 @@
         "removecreator",
         "search",
         "searchagain",
+        "users",
         "toomanytoshow",
         );
 
@@ -55,8 +56,8 @@
 
        print_header("$site->shortname: $strassigncreators", 
                  "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> 
-                  <a href=\"{$_SERVER['PHP_SELF']}\">$strassigncreators</a>", "");
+                 "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> ->
+                  $strassigncreators", "");
 
 /// Get all existing creators
     $creators = get_creators();
index f5a1f09255e11e20ddf02f114e038b65dbef8167..9d2536c5fbe01c4200c1abd44f452b32c082e225 100644 (file)
     }
 
 /// Check for valid admin user
-    if (!iscreator()) {
-        error("You need to be an admin user or teacher to use this page.", "$CFG->wwwroot/login/index.php");
+    if (!isadmin()) {
+        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
     }
 
 
 /// At this point everything is set up and the user is an admin, so print menu
 
     $stradministration = get_string("administration");
-    print_header("$site->shortname: $stradministration","$site->fullname: $stradministration", "$stradministration");
-    if (isadmin()) {
-        $table->head  = array (get_string("site"), get_string("courses"), get_string("users"));
-               $table->align = array ("CENTER", "CENTER", "CENTER");
-               $table->data[0][0] = "<p><a href=\"config.php\">".get_string("configvariables")."</a></p>".
-                         "<p><a href=\"site.php\">".get_string("sitesettings")."</a></p>".
-                         "<p><a href=\"../course/log.php?id=$site->id\">".get_string("sitelogs")."</a></p>".
-                         "<p><a href=\"../theme/index.php\">".get_string("choosetheme")."</a></p>".
-                         "<p><a href=\"lang.php\">".get_string("checklanguage")."</a></p>".
-                         "<p><a href=\"modules.php\">".get_string("managemodules")."</a></p>";
-               if (file_exists("$CFG->dirroot/admin/$CFG->dbtype")) {
-            $table->data[0][0] .= "<p><a href=\"$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a></p>";
-               }
-               $table->data[0][1] = "<p><a href=\"../course/index.php?edit=on\">".get_string("coursemanagement")."</a></p>".
-        $table->data[0][1] .= "<p><a href=\"../files/index.php?id=$site->id\">".get_string("courserestore")."</a></p>";
-        if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual") {
-                   $table->data[0][2] = "<p><a href=\"user.php?newuser=true\">".get_string("addnewuser")."</a></p>";
-        }    
-        $table->data[0][2] .=  "<p><a href=\"user.php\">".get_string("edituser")."</a></p>".
-                         "<p><a href=\"admin.php\">".get_string("assignadmins")."</a></p>".
-                         "<p><a href=\"creators.php\">".get_string("assigncreators")."</a></p>".
-                         "<p><a href=\"auth.php\">".get_string("authentication")."</a></p>";
-    } else { /// user is coursecreator
-           $table->head  = array (get_string("courses"));
-               $table->align = array ("CENTER");
-               $table->data[0][1] = "<p><a href=\"../course/edit.php\">".get_string("addnewcourse")."</a></p>".
-                 "<p><a href=\"teacher.php\">".get_string("assignteachers")."</a></p>";
-       }
-    
+    print_header("$site->shortname: $stradministration","$site->fullname", "$stradministration");
+    print_simple_box_start("center", "80%", "#FFFFFF", 20);
+    print_heading($stradministration);
+
+    $table->align = array ("right", "left");
+    $table->data[] = array("<a href=\"../course/index.php?edit=on\">".get_string("courses")."</a>",
+                           "<font size=-1>".get_string("adminhelpcourses"));
+    $table->data[] = array("<a href=\"users.php\">".get_string("users")."</a>",
+                           "<font size=-1>".get_string("adminhelpusers"));
+    $table->data[] = array("<a href=\"config.php\">".get_string("configvariables")."</a>",
+                           "<font size=-1>".get_string("adminhelpconfiguration"));
+    $table->data[] = array("<a href=\"site.php\">".get_string("sitesettings")."</a>",
+                           "<font size=-1>".get_string("adminhelpsitesettings"));
+    $table->data[] = array("<a href=\"../files/index.php?id=$site->id\">".get_string("sitefiles")."</a>",
+                           "<font size=-1>".get_string("adminhelpsitefiles"));
+    $table->data[] = array("<a href=\"../theme/index.php\">".get_string("themes")."</a>",
+                           "<font size=-1>".get_string("adminhelpthemes"));
+    $table->data[] = array("<a href=\"lang.php\">".get_string("language")."</a>",
+                           "<font size=-1>".get_string("adminhelplanguage"));
+    $table->data[] = array("<a href=\"modules.php\">".get_string("managemodules")."</a>",
+                           "<font size=-1>".get_string("adminhelpmanagemodules"));
+    $table->data[] = array("<a href=\"../course/log.php?id=$site->id.php\">".get_string("logs")."</a>",
+                           "<font size=-1>".get_string("adminhelplogs"));
+    if (file_exists("$CFG->dirroot/admin/$CFG->dbtype")) {
+        $table->data[] = array("<a href=\"$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a>",
+                               "<font size=-1>".get_string("adminhelpmanagedatabase"));
+    }
+
+    $table->width = "90%";
+
     print_table($table);
+    
+    $copyrighttext = "<a href=\"http://moodle.org/\">Moodle</a> ".
+                     "<a href=\"../doc/?frame=release.html\">$CFG->release</a> ($CFG->version)<br />".
+                     "Open Source under the terms of the ".
+                     "<a href=\"../doc/?frame=licence.html\">GNU Public License</a><br />".
+                     "Copyright &copy; 2000-2003 Martin Dougiamas";
+
+    echo "<center><p><font size=1>$copyrighttext</font></p></center>";
+
 
-    echo "<br><div align=center>";
+    echo "<table border=0 align=center width=100%><tr>";
+    echo "<td align=center width=50%>";
     print_single_button("$CFG->wwwroot/doc", NULL, get_string("documentation"));
-    echo "</div>";
+    echo "</td>";
 
-    echo "<br><div align=center>";
+    echo "<td align=center width=50%>";
     print_single_button("register.php", NULL, get_string("registration"));
-    echo "</div>";
+    echo "</td>";
+    echo "<tr></table>";
 
-    print_heading("Moodle $CFG->release ($CFG->version)", "CENTER", 1);
+    print_simple_box_end();
 
     print_footer($site);
 
index ed3f95931f6bc7c1f34a0694438e94499e0ab411..09f1013ebebc2e62ae4a81de34898a426e2520ea 100644 (file)
@@ -15,7 +15,7 @@
     }
 
     $stradministration = get_string("administration");
-    $strchecklanguage = get_string("checklanguage");
+    $strlanguage = get_string("language");
     $strcurrentlanguage = get_string("currentlanguage");
     $strmissingstrings = get_string("missingstrings");
     $strcomparelanguage = get_string("comparelanguage");
 
     switch ($mode) {
         case "missing":
-            $navigation = "<A HREF=\"lang.php\">$strchecklanguage</A> -> $strmissingstrings";
+            $navigation = "<A HREF=\"lang.php\">$strlanguage</A> -> $strmissingstrings";
             $title = $strmissingstrings;
             break;
         case "compare":
-            $navigation = "<A HREF=\"lang.php\">$strchecklanguage</A> -> $strcomparelanguage";
+            $navigation = "<A HREF=\"lang.php\">$strlanguage</A> -> $strcomparelanguage";
             $title = $strcomparelanguage;
             break;
         default:
-            $title = $strchecklanguage;
-            $navigation = $strchecklanguage;
+            $title = $strlanguage;
+            $navigation = $strlanguage;
             break;
     }
 
index 709576a383aa1de1925af636e0e2857833f608be..3c23aa7f46c1440cf273a59fd9dc9b12507e222c 100644 (file)
@@ -99,6 +99,7 @@
 
         $stredituser = get_string("edituser");
         $stradministration = get_string("administration");
+        $strusers = get_string("users");
         $stredit   = get_string("edit");
         $strdelete = get_string("delete");
         $strdeletecheck = get_string("deletecheck");
         $strshowallusers = get_string("showallusers");
 
         print_header("$site->shortname: $stredituser", $site->fullname, 
-                     "<A HREF=\"index.php\">$stradministration</A> -> $stredituser");
+                     "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $stredituser");
 
         if ($delete) {              // Delete a selected user, after confirmation
             if (!$user = get_record("user", "id", "$delete")) {
diff --git a/admin/users.php b/admin/users.php
new file mode 100644 (file)
index 0000000..5ae320f
--- /dev/null
@@ -0,0 +1,47 @@
+<?PHP // $Id$
+
+    require_once("../config.php");
+
+    require_login();
+
+    if (!isadmin) {
+        error("Only admins can access this page");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    $stradministration = get_string("administration");
+    $strusers          = get_string("users");
+
+    print_header("$site->shortname: $stradministration", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strusers");
+
+    print_simple_box_start("center", "80%", "#FFFFFF", 20);
+    print_heading($strusers);
+
+    $table->align = array ("right", "left");
+
+    if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
+        $table->data[] = array("<a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."</a>",
+                               "<font size=-1>".get_string("adminhelpaddnewuser"));
+    }
+    $table->data[] = array("<a href=\"user.php\">".get_string("edituser")."</a>",
+                           "<font size=-1>".get_string("adminhelpedituser"));
+    $table->data[] = array("<a href=\"admin.php\">".get_string("assignadmins")."</a>",
+                           "<font size=-1>".get_string("adminhelpassignadmins"));
+    $table->data[] = array("<a href=\"creators.php\">".get_string("assigncreators")."</a>",
+                           "<font size=-1>".get_string("adminhelpassigncreators"));
+    $table->data[] = array("<a href=\"auth.php\">".get_string("authentication")."</a>",
+                           "<font size=-1>".get_string("adminhelpauthentication"));
+
+    print_table($table);
+    
+    print_simple_box_end();
+
+    print_footer($site);
+
+?>
+
+
index c5ee595a4ec311b604cbb8ca0b4b9d6a3759d178..11783de559407bf19eeb8964af6d54d7121168d1 100644 (file)
@@ -687,53 +687,37 @@ function print_admin_links ($siteid, $width=180) {
     global $CFG, $THEME;
     
     if (empty($THEME->custompix)) {
-        $icon = "<img src=\"$CFG->wwwroot/pix/i/settings.gif\" height=16 width=16 alt=\"\">";
+        $icon = "<img src=\"$CFG->wwwroot/pix/i/admin.gif\" height=16 width=16 alt=\"\">";
     } else {
-        $icon = "<img src=\"$CFG->wwwroot/theme/$CFG->theme/pix/i/settings.gif\" height=16 width=16 alt=\"\">";
+        $icon = "<img src=\"$CFG->wwwroot/theme/$CFG->theme/pix/i/admin.gif\" height=16 width=16 alt=\"\">";
     }
 
+    if (iscreator()) {
+           $moddata[]="<a href=\"$CFG->wwwroot/course/index.php?edit=on\">".get_string("courses")."</a>";
+               $modicon[]=$icon;
+        $fulladmin = "";
+    }
     if (isadmin()) {
+           $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/users.php\">".get_string("users")."</a>";
+               $modicon[]=$icon;
            $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/config.php\">".get_string("configvariables")."</a>";
                $modicon[]=$icon;
                $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/site.php\">".get_string("sitesettings")."</a>";
                $modicon[]=$icon;
-               $moddata[]="<a href=\"$CFG->wwwroot/course/log.php?id=$siteid\">".get_string("sitelogs")."</a>";
+               $moddata[]="<a href=\"$CFG->wwwroot/files/index.php?id=$siteid\">".get_string("sitefiles")."</a>";
                $modicon[]=$icon;
-               $moddata[]="<a href=\"$CFG->wwwroot/theme/index.php\">".get_string("choosetheme")."</a>";
+               $moddata[]="<a href=\"$CFG->wwwroot/theme/index.php\">".get_string("themes")."</a>";
                $modicon[]=$icon;
-               $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/lang.php\">".get_string("checklanguage")."</a>";
+               $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/lang.php\">".get_string("language")."</a>";
                $modicon[]=$icon;
                $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/modules.php\">".get_string("managemodules")."</a>";
                $modicon[]=$icon;
+               $moddata[]="<a href=\"$CFG->wwwroot/course/log.php?id=$siteid\">".get_string("logs")."</a>";
+               $modicon[]=$icon;
                if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
             $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a>";
                        $modicon[]=$icon;
                }
-               $moddata[]="<hr>";
-               $modicon[]="";
-    }
-    if (iscreator()) {
-           $moddata[]="<a href=\"$CFG->wwwroot/course/index.php?edit=on\">".get_string("coursemanagement")."</a>";
-               $modicon[]=$icon;
-        $fulladmin = "";
-    }
-    if (isadmin()) {
-               $moddata[]="<a href=\"$CFG->wwwroot/files/index.php?id=$siteid\">".get_string("courserestore")."</a>";
-               $modicon[]=$icon;
-               $moddata[]="<hr>";
-               $modicon[]="";
-        if($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
-                   $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."</a>";
-                   $modicon[]=$icon;
-        }
-               $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/user.php\">".get_string("edituser")."</a>";
-               $modicon[]=$icon;
-               $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/admin.php\">".get_string("assignadmins")."</a>";
-               $modicon[]=$icon;
-        $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/creators.php\">".get_string("assigncreators")."</a>";
-               $modicon[]=$icon;
-               $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/auth.php\">".get_string("authentication")."</a>";
-               $modicon[]=$icon;
         $fulladmin = "<p><a href=\"$CFG->wwwroot/$CFG->admin/\">".get_string("admin")."</a>...";
     }
 
index b6a48679ccf57de27885ed9b4598c0eabc280d51..d6ec5a0b39cbfca4680ca929aac1b010f9101950 100644 (file)
 
         global $CFG;
 
-        $strfiles = get_string("files");
+        if (! $site = get_site()) {
+            error("Invalid site!");
+        }
+
+        if ($course->id == $site->id) {
+            $strfiles = get_string("sitefiles");
+        } else {
+            $strfiles = get_string("files");
+        }
     
         if ($wdir == "/") {
             $fullnav = "$strfiles";
             for ($i=1; $i<$numdirs; $i++) {
                $navigation .= " -> ";
                $link .= "/".urlencode($dirs[$i]);
-               $navigation .= "<A HREF=\"index.php?id=$course->id&wdir=$link\">".$dirs[$i]."</A>";
+               $navigation .= "<a href=\"index.php?id=$course->id&wdir=$link\">".$dirs[$i]."</a>";
             }
             $fullnav = "<a href=\"index.php?id=$course->id&wdir=/\">$strfiles</a> $navigation";
         }
 
-        if (! $site = get_site()) {
-            error("Invalid site!");
-        }
-
         if ($course->id == $site->id) {
             print_header("$course->shortname: $strfiles", "$course->fullname", 
                          "<a href=\"../$CFG->admin/index.php\">".get_string("administration").
                          "</a> -> $fullnav", $formfield);
+
+            print_heading(get_string("publicsitefileswarning"), "center", 2);
+
         } else {
             print_header("$course->shortname: $strfiles", "$course->fullname", 
                          "<a href=\"../course/view.php?id=$course->id\">$course->shortname".
                          "</a> -> $fullnav", $formfield);
         }
+
         echo "<table border=0 align=center cellspacing=3 cellpadding=3 width=640>";
         echo "<tr>";
         echo "<td colspan=\"2\">";
@@ -728,10 +736,10 @@ function displaydir ($wdir) {
             $fileurlsafe = rawurlencode($fileurl);
             $filedate    = userdate(filectime($filename), "%d %b %Y, %I:%M %p");
 
-            echo "<TR>";
+            echo "<tr>";
 
             print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\">");
-            echo "<TD ALIGN=left NOWRAP>";
+            echo "<td align=left nowrap>";
             if ($CFG->slasharguments) {
                 $ffurl = "/file.php/$id$fileurl";
             } else {
@@ -740,22 +748,22 @@ function displaydir ($wdir) {
             link_to_popup_window ($ffurl, "display", 
                                   "<IMG SRC=\"pix/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">", 
                                   480, 640);
-            echo "<FONT SIZE=\"-1\" FACE=\"Arial, Helvetica\">";
+            echo "<font size=\"-1\" face=\"Arial, Helvetica\">";
             link_to_popup_window ($ffurl, "display", 
                                   htmlspecialchars($file),
                                   480, 640);
-            echo "</FONT></TD>";
+            echo "</font></td>";
 
             $file_size = filesize($filename);
             print_cell("right", display_size($file_size));
             print_cell("right", $filedate);
             if ($icon == "text.gif" || $icon == "html.gif") {
-                $edittext = "<A HREF=\"index.php?id=$id&wdir=$wdir&file=$fileurl&action=edit\">$stredit</A>";
+                $edittext = "<a href=\"index.php?id=$id&wdir=$wdir&file=$fileurl&action=edit\">$stredit</a>";
             } else if ($icon == "zip.gif") {
-                $edittext = "<A HREF=\"index.php?id=$id&wdir=$wdir&file=$fileurl&action=unzip\">$strunzip</A>&nbsp;";
-                $edittext .= "<A HREF=\"index.php?id=$id&wdir=$wdir&file=$fileurl&action=listzip\">$strlist</A> ";
+                $edittext = "<a href=\"index.php?id=$id&wdir=$wdir&file=$fileurl&action=unzip\">$strunzip</a>&nbsp;";
+                $edittext .= "<a href=\"index.php?id=$id&wdir=$wdir&file=$fileurl&action=listzip\">$strlist</a> ";
                 if (!empty($CFG->backup_version) && isteacher($id)) {
-                    $edittext .= "<A HREF=\"index.php?id=$id&wdir=$wdir&file=$filesafe&action=restore\">$strrestore</A> ";
+                    $edittext .= "<a href=\"index.php?id=$id&wdir=$wdir&file=$filesafe&action=restore\">$strrestore</a> ";
                 }
             } else {
                 $edittext = "";
index dabb3eccf43772af2e7dc4e9ed8a916934ada968..4da25ea7aff331ae9add8db1a66bf9f1b319a3da 100644 (file)
@@ -25,6 +25,21 @@ $string['addadmin'] = "Add admin";
 $string['addcreator'] = "Add course creator";
 $string['addteacher'] = "Add teacher";
 $string['admin'] = "Admin";
+$string['adminhelpaddnewuser'] = "To manually create a new user account";
+$string['adminhelpassignadmins'] = "Admins can do anything and go anywhere in the site";
+$string['adminhelpassigncreators'] = "Creators can create new courses and teach in them";
+$string['adminhelpauthentication'] = "Internal user accounts or external databases";
+$string['adminhelpconfiguration'] = "Configure variables that affect general operation of the site";
+$string['adminhelpcourses'] = "Define courses and categories and assign people to them";
+$string['adminhelpedituser'] = "Browse the list of user accounts and edit any of them";
+$string['adminhelplanguage'] = "For checking and editing the current language pack";
+$string['adminhelplogs'] = "Browse logs of all activity on this site";
+$string['adminhelpmanagemodules'] = "Manage installed modules and their settings";
+$string['adminhelpmanagedatabase'] = "Access your database directly";
+$string['adminhelpsitesettings'] = "Define the how the front page of the site looks";
+$string['adminhelpsitefiles'] = "For publishing general files or uploading external backups";
+$string['adminhelpthemes'] = "Choose how the site looks";
+$string['adminhelpusers'] = "Define your users and set up authentication";
 $string['administration'] = "Administration";
 $string['administrator'] = "Administrator";
 $string['administrators'] = "Administrators";
@@ -109,7 +124,7 @@ $string['configslasharguments'] = "Files (images, uploads etc) are provided via
 $string['configsmtphosts'] = "Give the full name of one or more local SMTP servers that Moodle should use to send mail (eg 'mail.a.com' or 'mail.a.com;mail.b.com'). If you leave it blank, Moodle will use the PHP default method of sending mail.";
 $string['configsmtpuser'] = "If you have specified an SMTP server above, and the server requires authentication, then enter the username and password here.";
 $string['configunzip'] = "Indicate the location of your unzip program (Unix only, optional).  If specified, this will be used to unpack zip archives on the server.  If you leave this blank, then Moodle will use internal routines.";
-$string['configvariables'] = "Configure variables";
+$string['configvariables'] = "Configuration";
 $string['configzip'] = "Indicate the location of your zip program (Unix only, optional).  If specified, this will be used to create zip archives on the server.  If you leave this blank, then Moodle will use internal routines.";
 $string['confirmed'] = "Your registration has been confirmed";
 $string['confirmednot'] = "Your registration has not yet been confirmed!";
@@ -131,7 +146,6 @@ $string['coursecreators'] = "Course creators";
 $string['courseinfo'] = "Course info";
 $string['coursefiles'] = "Course files";
 $string['courseformats'] = "Course formats";
-$string['coursemanagement'] = "Course management";
 $string['courserestore'] = "Course restore";
 $string['courses'] = "Courses";
 $string['courseupdates'] = "Course updates";
@@ -421,8 +435,8 @@ $string['logs'] = "Logs";
 $string['makeafolder'] = "Make a folder";
 $string['makeeditable'] = "If you make '\$a' editable by the web server process (eg apache) then you could edit this file directly from this page";
 $string['mainmenu'] = "Main menu";
-$string['managedatabase'] = "Manage database";
-$string['managemodules'] = "Manage modules";
+$string['managedatabase'] = "Database";
+$string['managemodules'] = "Modules";
 $string['markedthistopic'] = "This topic is highlighted as the current topic";
 $string['markthistopic'] = "Highlight this topic as the current topic";
 $string['maximumchars'] = "Maximum of \$a characters";
@@ -574,6 +588,7 @@ $string['publicdirectory'] = "Public directory";
 $string['publicdirectory0'] = "Please do not publish this site";
 $string['publicdirectory1'] = "Publish the site name only";
 $string['publicdirectory2'] = "Publish the site name with a link";
+$string['publicsitefileswarning'] = "Note: files placed here can be accessed by anyone";
 $string['question'] = "Question";
 $string['readinginfofrombackup'] = "Reading info from backup";
 $string['readme'] = "README";   // This is a file name
@@ -636,6 +651,7 @@ $string['showtheselogs'] = "Show these logs";
 $string['showallcourses'] = "Show all courses";
 $string['site'] = "Site";
 $string['sites'] = "Sites";
+$string['sitefiles'] = "Site files";
 $string['sitelogs'] = "Site logs";
 $string['sitenews'] = "Site news";
 $string['sitesettings'] = "Site settings";
@@ -672,6 +688,7 @@ $string['texteditor'] = "Use standard web forms";
 $string['timezone'] = "Timezone";
 $string['thanks'] = "Thanks";
 $string['theme'] = "Theme";
+$string['themes'] = "Themes";
 $string['themesaved'] = "New theme saved";
 $string['to'] = "To";
 $string['today'] = "Today";
@@ -693,7 +710,6 @@ $string['unknowncategory'] = "Unknown category";
 $string['unpacking'] = "Unpacking \$a";
 $string['unsafepassword'] = "Unsafe password - try something else";
 $string['unusedaccounts'] = "Accounts unused for more than \$a days are automatically unenrolled";
-$string['usingexistingcourse'] = "Using existing course";
 $string['unzip'] = "Unzip";
 $string['unzippingbackup'] = "Unzipping backup";
 $string['update'] = "Update";
@@ -710,14 +726,15 @@ $string['uploadedfileto'] = "Uploaded \$a->file to \$a->directory";
 $string['uploadnofilefound'] = "No file was found - are you sure you selected one to upload?";
 $string['uploadproblem'] = "An unknown problem occurred while uploading the file '\$a' (perhaps it was too large?)";
 $string['uploadthisfile'] = "Upload this file";
+$string['user'] = "User";
 $string['userdeleted'] = "This user account has been deleted";
 $string['userdescription'] = "Description";
 $string['userfiles'] = "User Files";
 $string['username'] = "Username";
 $string['usernameexists'] = "This username already exists, choose another";
 $string['userprofilefor'] = "User profile for \$a";
-$string['user'] = "User";
 $string['users'] = "Users";
+$string['usingexistingcourse'] = "Using existing course";
 $string['userzones'] = "User zones";
 $string['webpage'] = "Web page";
 $string['week'] = "Week";
index db95bfc8672d9eea69d95af874f197e12928ef1b..2fd5d93779d990bfe0c07580648481e3565ff0a8 100644 (file)
@@ -259,7 +259,7 @@ function link_to_popup_window ($url, $name="popup", $linkname="click here",
     $options = "menubar=0,location=0,scrollbars,resizable,width=$width,height=$height";
     $fullscreen = 0;
 
-    echo "<a target=\"$name\" title=\"$title\" href=\"$CFG->wwwroot/$url\" ".
+    echo "<a target=\"$name\" title=\"$title\" href=\"$CFG->wwwroot$url\" ".
          "onClick=\"return openpopup('$url', '$name', '$options', $fullscreen);\">$linkname</a>\n";
 }
 
index 149b796802180d25d0651893e4ba51486f1e14ec..416b6032a74bcf2add493c9ca5f8223ecc0d63fc 100644 (file)
 
         $stradministration = get_string("administration");
         print_header("$course->shortname: $streditmyprofile", "$course->fullname",
-                     "<A HREF=\"$CFG->wwwroot/admin/\">$stradministration</A> ->
-                      $straddnewuser", "");
+                     "<a href=\"$CFG->wwwroot/$CFG->admin/\">$stradministration</a> -> ".
+                     "<a href=\"$CFG->wwwroot/$CFG->admin/users.php\">$strusers</a> -> $straddnewuser", "");
     }
 
     $teacher = strtolower($course->teacher);
index 857ac2f319ced021ac9897d45c93d10d94fe3e05..2af4c3428b56c3e87e108d9f443fcab939e956dc 100644 (file)
@@ -11,6 +11,7 @@
     optional_variable($dir,"DESC");          //how to sort students
     optional_variable($showall,"");         //show all of the students?
 
+
     if (! $course = get_record("course", "id", $id)) {
         error("Course ID is incorrect");
     }