mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 14:03:52 +01:00
Code Issues Projects Releases Wiki Activity

MDL-17458 fixed headers used during installation

Browse Source
This commit is contained in:
skodak 2009-02-01 17:45:32 +00:00
parent 2d6b0b04c1
commit 770f0cea30
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/index.php
View File

@ -145,9 +145,7 @@
$strdatabasesetup = get_string("databasesetup");
$navigation = build_navigation(array(array('name'=>$strdatabasesetup, 'link'=>null, 'type'=>'misc')));
print_header($strinstallation, $strinstallation, $navigation,
"", upgrade_get_javascript(), false, " ", " ");
print_header($strinstallation, $strinstallation, $navigation, "", upgrade_get_javascript(), false, " ", " ");
if (!$DB->setup_is_unicodedb()) {
if (!$DB->change_db_encoding()) {

4
admin/upgradesettings.php
View File

@ -49,7 +49,9 @@ if (!empty($adminroot->errors)) {
// to modify them
admin_externalpage_print_header($focus);
print_box(get_string('upgradesettingsintro','admin'), 'generalbox');
if (!empty($SITE->fullname) and !empty($SITE->shortname)) {
print_box(get_string('upgradesettingsintro','admin'), 'generalbox');
}
echo '<form action="upgradesettings.php" method="post" id="adminsettings">';
echo '<div>';

7
lib/adminlib.php
View File

@ -4039,7 +4039,7 @@ function admin_externalpage_print_header($focus='') {
define('ADMIN_EXT_HEADER_PRINTED', 'true');
if (!empty($SITE->fullname)) {
if (!empty($SITE->fullname) and !empty($SITE->shortname)) {
$pageblocks = blocks_setup($PAGE);
$preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH,
@ -4085,7 +4085,10 @@ function admin_externalpage_print_header($focus='') {
}
}
} else {
print_header();
$strinstallation = get_string('installation', 'install');
$strsettings = get_string('settings');
$navigation = build_navigation(array(array('name'=>$strsettings, 'link'=>null, 'type'=>'misc')));
print_header($strinstallation, $strinstallation, $navigation, "", "", false, "&nbsp;", "&nbsp;");
}
}

2
lib/weblib.php
View File

@ -3707,7 +3707,7 @@ function build_navigation($extranavlinks, $cm = null) {
$navlinks = array();
//Site name
if ($SITE) {
if (!empty($SITE->shortname)) {
$navlinks[] = array(
'name' => format_string($SITE->shortname),
'link' => "$CFG->wwwroot/",

4
user/editadvanced.php
View File

@ -196,8 +196,10 @@
print_heading($userfullname);
}
} else if (!empty($USER->newadminuser)) {
$strinstallation = get_string('installation', 'install');
$strprimaryadminsetup = get_string('primaryadminsetup');
print_header($strprimaryadminsetup, $strprimaryadminsetup);
$navigation = build_navigation(array(array('name'=>$strprimaryadminsetup, 'link'=>null, 'type'=>'misc')));
print_header($strinstallation, $strinstallation, $navigation, "", "", false, "&nbsp;", "&nbsp;");
print_simple_box(get_string('configintroadmin', 'admin'), 'center', '50%');
echo '<br />';
} else {