From 440eb0d79d1eb7ab30b65d6d941a025754d5667e Mon Sep 17 00:00:00 2001 From: moodler Date: Sun, 10 Aug 2003 08:39:29 +0000 Subject: [PATCH] More clean ups --- admin/index.php | 42 +++++++++++++++++++++--------------------- admin/users.php | 26 +++++++++++++------------- course/lib.php | 14 ++++++++------ lang/en/moodle.php | 8 +++++--- 4 files changed, 47 insertions(+), 43 deletions(-) diff --git a/admin/index.php b/admin/index.php index 9d2536c5fb..5a191110d0 100644 --- a/admin/index.php +++ b/admin/index.php @@ -347,31 +347,31 @@ $stradministration = get_string("administration"); print_header("$site->shortname: $stradministration","$site->fullname", "$stradministration"); - print_simple_box_start("center", "80%", "#FFFFFF", 20); + print_simple_box_start("center", "90%", "$THEME->cellcontent2", 20); print_heading($stradministration); $table->align = array ("right", "left"); - $table->data[] = array("".get_string("courses")."", - "".get_string("adminhelpcourses")); - $table->data[] = array("".get_string("users")."", - "".get_string("adminhelpusers")); - $table->data[] = array("".get_string("configvariables")."", - "".get_string("adminhelpconfiguration")); - $table->data[] = array("".get_string("sitesettings")."", - "".get_string("adminhelpsitesettings")); - $table->data[] = array("id\">".get_string("sitefiles")."", - "".get_string("adminhelpsitefiles")); - $table->data[] = array("".get_string("themes")."", - "".get_string("adminhelpthemes")); - $table->data[] = array("".get_string("language")."", - "".get_string("adminhelplanguage")); - $table->data[] = array("".get_string("managemodules")."", - "".get_string("adminhelpmanagemodules")); - $table->data[] = array("id.php\">".get_string("logs")."", - "".get_string("adminhelplogs")); + $table->data[] = array("".get_string("configvariables")."", + get_string("adminhelpconfiguration")); + $table->data[] = array("".get_string("sitesettings")."", + get_string("adminhelpsitesettings")); + $table->data[] = array("".get_string("courses")."", + get_string("adminhelpcourses")); + $table->data[] = array("".get_string("users")."", + get_string("adminhelpusers")); + $table->data[] = array("".get_string("themes")."", + get_string("adminhelpthemes")); + $table->data[] = array("".get_string("language")."", + get_string("adminhelplanguage")); + $table->data[] = array("".get_string("managemodules")."", + get_string("adminhelpmanagemodules")); + $table->data[] = array("id.php\">".get_string("logs")."", + get_string("adminhelplogs")); + $table->data[] = array("id\">".get_string("sitefiles")."", + get_string("adminhelpsitefiles")); if (file_exists("$CFG->dirroot/admin/$CFG->dbtype")) { - $table->data[] = array("dbtype/frame.php\">".get_string("managedatabase")."", - "".get_string("adminhelpmanagedatabase")); + $table->data[] = array("dbtype/frame.php\">".get_string("managedatabase")."", + get_string("adminhelpmanagedatabase")); } $table->width = "90%"; diff --git a/admin/users.php b/admin/users.php index 5ae320f659..f27b1dc675 100644 --- a/admin/users.php +++ b/admin/users.php @@ -18,28 +18,28 @@ print_header("$site->shortname: $stradministration", "$site->fullname", "$stradministration -> $strusers"); - print_simple_box_start("center", "80%", "#FFFFFF", 20); print_heading($strusers); $table->align = array ("right", "left"); + $table->data[] = array("".get_string("authentication")."", + get_string("adminhelpauthentication")); + if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){ - $table->data[] = array("wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."", - "".get_string("adminhelpaddnewuser")); + $table->data[] = array("wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."", + get_string("adminhelpaddnewuser")); } - $table->data[] = array("".get_string("edituser")."", - "".get_string("adminhelpedituser")); - $table->data[] = array("".get_string("assignadmins")."", - "".get_string("adminhelpassignadmins")); - $table->data[] = array("".get_string("assigncreators")."", - "".get_string("adminhelpassigncreators")); - $table->data[] = array("".get_string("authentication")."", - "".get_string("adminhelpauthentication")); + $table->data[] = array("".get_string("edituser")."", + get_string("adminhelpedituser")); + $table->data[] = array("".get_string("assignadmins")."", + get_string("adminhelpassignadmins")); + $table->data[] = array("".get_string("assigncreators")."", + get_string("adminhelpassigncreators")); + $table->data[] = array("".get_string("assignteachers")."", + get_string("adminhelpassignteachers")." "); print_table($table); - print_simple_box_end(); - print_footer($site); ?> diff --git a/course/lib.php b/course/lib.php index 11783de559..d4134f1a2f 100644 --- a/course/lib.php +++ b/course/lib.php @@ -692,6 +692,12 @@ function print_admin_links ($siteid, $width=180) { $icon = "wwwroot/theme/$CFG->theme/pix/i/admin.gif\" height=16 width=16 alt=\"\">"; } + if (isadmin()) { + $moddata[]="wwwroot/$CFG->admin/config.php\">".get_string("configvariables").""; + $modicon[]=$icon; + $moddata[]="wwwroot/$CFG->admin/site.php\">".get_string("sitesettings").""; + $modicon[]=$icon; + } if (iscreator()) { $moddata[]="wwwroot/course/index.php?edit=on\">".get_string("courses").""; $modicon[]=$icon; @@ -700,12 +706,6 @@ function print_admin_links ($siteid, $width=180) { if (isadmin()) { $moddata[]="wwwroot/$CFG->admin/users.php\">".get_string("users").""; $modicon[]=$icon; - $moddata[]="wwwroot/$CFG->admin/config.php\">".get_string("configvariables").""; - $modicon[]=$icon; - $moddata[]="wwwroot/$CFG->admin/site.php\">".get_string("sitesettings").""; - $modicon[]=$icon; - $moddata[]="wwwroot/files/index.php?id=$siteid\">".get_string("sitefiles").""; - $modicon[]=$icon; $moddata[]="wwwroot/theme/index.php\">".get_string("themes").""; $modicon[]=$icon; $moddata[]="wwwroot/$CFG->admin/lang.php\">".get_string("language").""; @@ -714,6 +714,8 @@ function print_admin_links ($siteid, $width=180) { $modicon[]=$icon; $moddata[]="wwwroot/course/log.php?id=$siteid\">".get_string("logs").""; $modicon[]=$icon; + $moddata[]="wwwroot/files/index.php?id=$siteid\">".get_string("sitefiles").""; + $modicon[]=$icon; if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) { $moddata[]="wwwroot/$CFG->admin/$CFG->dbtype/frame.php\">".get_string("managedatabase").""; $modicon[]=$icon; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 4da25ea7af..61df8c96b2 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -28,14 +28,15 @@ $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['adminhelpassignteachers'] = "Select a course then use the icon to add teachers"; +$string['adminhelpauthentication'] = "You can use 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['adminhelpmanagedatabase'] = "Access the database directly (be careful!)"; $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"; @@ -58,7 +59,8 @@ $string['answer'] = "Answer"; $string['areyousuretorestorethis'] = "Are you sure to restore it ?"; $string['assessment'] = "Assessment"; $string['assignadmins'] = "Assign admins"; -$string['assigncreators'] = "Assign course creators"; +$string['assigncreators'] = "Assign creators"; +$string['assignstudents'] = "Assign students"; $string['assignteachers'] = "Assign teachers"; $string['authentication'] = "Authentication"; $string['autosubscribe'] = "Forum auto-subscribe"; -- 2.39.5