![](\"../pix/t/user.gif\"){kind=small}
";
+
+ $table->data[] = array("".get_string("users")."", $userdata);
+
$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")."",
@@ -374,8 +400,6 @@
get_string("adminhelpmanagedatabase"));
}
- $table->width = "90%";
-
print_table($table);
//////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/admin/lang.php b/admin/lang.php
index 09f1013ebeb..59eb83a8e45 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -15,6 +15,7 @@
}
$stradministration = get_string("administration");
+ $strconfiguration = get_string("configuration");
$strlanguage = get_string("language");
$strcurrentlanguage = get_string("currentlanguage");
$strmissingstrings = get_string("missingstrings");
@@ -39,7 +40,8 @@
$currentlang = current_language();
print_header("$site->shortname: $title", "$site->fullname",
- "$stradministration -> $navigation");
+ "$stradministration -> ".
+ "$strconfiguration -> $navigation");
if (!$mode) {
print_heading("$strcurrentlanguage: $currentlang - ".get_string("thislanguage"));
diff --git a/admin/modules.php b/admin/modules.php
index 93d0ee2c4fa..c43ae811e0c 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -21,6 +21,7 @@
/// Print headings
$stradministration = get_string("administration");
+ $strconfiguration = get_string("configuration");
$strmanagemodules = get_string("managemodules");
$strdelete = get_string("delete");
$strhide = get_string("hide");
@@ -29,7 +30,8 @@
$stractivitymodule = get_string("activitymodule");
print_header("$site->shortname: $strmanagemodules", "$site->fullname",
- "admin/index.php\">$stradministration -> $strmanagemodules");
+ "$stradministration -> ".
+ "$strconfiguration -> $strmanagemodules");
print_heading($strmanagemodules);
diff --git a/admin/site.php b/admin/site.php
index f6c74bbdc43..48f5b57e255 100644
--- a/admin/site.php
+++ b/admin/site.php
@@ -85,6 +85,7 @@
}
$stradmin = get_string("administration");
+ $strconfiguration = get_string("configuration");
$strsitesettings = get_string("sitesettings");
if ($firsttime) {
@@ -94,7 +95,8 @@
echo "![\"\"](\"$pixpath/i/admin.gif\"){kind=small}
";
+
+ $moddata[]="wwwroot/$CFG->admin/users.php\">".get_string("users")."...";
+ $modicon[]="![\"\"](\"$pixpath/i/users.gif\"){kind=small}
";
}
+
if (iscreator()) {
$moddata[]="wwwroot/course/index.php?edit=on\">".get_string("courses")."";
- $modicon[]=$icon;
+ $modicon[]="![\"\"](\"$pixpath/i/course.gif\"){kind=small}
";
$fulladmin = "";
}
+
if (isadmin()) {
- $moddata[]="wwwroot/$CFG->admin/users.php\">".get_string("users")."";
- $modicon[]=$icon;
- $moddata[]="wwwroot/theme/index.php\">".get_string("themes")."";
- $modicon[]=$icon;
- $moddata[]="wwwroot/$CFG->admin/lang.php\">".get_string("language")."";
- $modicon[]=$icon;
- $moddata[]="wwwroot/$CFG->admin/modules.php\">".get_string("managemodules")."";
- $modicon[]=$icon;
$moddata[]="wwwroot/course/log.php?id=$siteid\">".get_string("logs")."";
- $modicon[]=$icon;
+ $modicon[]="![\"\"](\"$pixpath/i/log.gif\"){kind=small}
";
+
$moddata[]="wwwroot/files/index.php?id=$siteid\">".get_string("sitefiles")."";
- $modicon[]=$icon;
+ $modicon[]="![\"\"](\"$pixpath/i/files.gif\"){kind=small}
";
+
if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
- $moddata[]="wwwroot/$CFG->admin/$CFG->dbtype/frame.php\">".get_string("managedatabase")."";
- $modicon[]=$icon;
+ $moddata[]="wwwroot/$CFG->admin/$CFG->dbtype/frame.php\">".
+ get_string("managedatabase")."";
+ $modicon[]="![\"\"](\"$pixpath/i/settings.gif\"){kind=small}
";
}
$fulladmin = "wwwroot/$CFG->admin/\">".get_string("admin")."...";
}
diff --git a/lib/weblib.php b/lib/weblib.php
index 2bd4e480d9c..6e4ef37ddea 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1073,6 +1073,114 @@ function print_table($table) {
return true;
}
+function make_table($table) {
+// Creates a nicely formatted table and returns it
+// $table is an object with several properties.
+// $table->head is an array of heading names.
+// $table->align is an array of column alignments
+// $table->size is an array of column sizes
+// $table->wrap is an array of "nowrap"s or nothing
+// $table->data[] is an array of arrays containing the data.
+// $table->width is an percentage of the page
+// $table->class is a class
+// $table->fontsize is the size of all the text
+// $table->tablealign align the whole table
+// $table->cellpadding padding on each cell
+// $table->cellspacing spacing between cells
+
+ if (isset($table->align)) {
+ foreach ($table->align as $key => $aa) {
+ if ($aa) {
+ $align[$key] = " align=\"$aa\"";
+ } else {
+ $align[$key] = "";
+ }
+ }
+ }
+ if (isset($table->size)) {
+ foreach ($table->size as $key => $ss) {
+ if ($ss) {
+ $size[$key] = " width=\"$ss\"";
+ } else {
+ $size[$key] = "";
+ }
+ }
+ }
+ if (isset($table->wrap)) {
+ foreach ($table->wrap as $key => $ww) {
+ if ($ww) {
+ $wrap[$key] = " nowrap ";
+ } else {
+ $wrap[$key] = "";
+ }
+ }
+ }
+
+ if (empty($table->width)) {
+ $table->width = "80%";
+ }
+
+ if (empty($table->tablealign)) {
+ $table->tablealign = "center";
+ }
+
+ if (empty($table->cellpadding)) {
+ $table->cellpadding = "5";
+ }
+
+ if (empty($table->cellspacing)) {
+ $table->cellspacing = "1";
+ }
+
+ if (empty($table->class)) {
+ $table->class = "generaltable";
+ }
+
+ if (empty($table->fontsize)) {
+ $fontsize = "";
+ } else {
+ $fontsize = "fontsize\">";
+ }
+
+ $output = "width\" valign=top align=\"$table->tablealign\" ";
+ $output .= " cellpadding=\"$table->cellpadding\" cellspacing=\"$table->cellspacing\" class=\"$table->class\">\n";
+
+ if (!empty($table->head)) {
+ $output .= "
\n";
+
+ return $output;
+}
+
+
function print_editing_switch($courseid) {
global $CFG, $USER;
diff --git a/theme/index.php b/theme/index.php
index 82d5d1c8098..6cf54d4d0a6 100644
--- a/theme/index.php
+++ b/theme/index.php
@@ -31,6 +31,7 @@
}
$stradministration = get_string("administration");
+ $strconfiguration = get_string("configuration");
$strthemes = get_string("themes");
$strpreview = get_string("preview");
$strsavechanges = get_string("savechanges");
@@ -38,7 +39,8 @@
$strthemesaved = get_string("themesaved");
print_header("$site->shortname: $strthemes", $site->fullname,
- "wwwroot/$CFG->admin/index.php\">$stradministration -> $strthemes");
+ "wwwroot/admin/index.php\">$stradministration -> ".
+ "wwwroot/admin/configure.php\">$strconfiguration -> $strthemes");
if ($choose) {
if (set_config("theme", $choose)) {
";
+ foreach ($table->head as $key => $heading) {
+ if (!isset($size[$key])) {
+ $size[$key] = "";
+ }
+ if (!isset($align[$key])) {
+ $align[$key] = "";
+ }
+ $output .= " \n";
+ }
+
+ foreach ($table->data as $row) {
+ $output .= "class}header\">$fontsize$heading ";
+ }
+ $output .= "";
+ foreach ($row as $key => $item) {
+ if (!isset($size[$key])) {
+ $size[$key] = "";
+ }
+ if (!isset($align[$key])) {
+ $align[$key] = "";
+ }
+ if (!isset($wrap[$key])) {
+ $wrap[$key] = "";
+ }
+ $output .= " \n";
+ }
+ $output .= "class}cell\">$fontsize$item ";
+ }
+ $output .= "