notice_yesno install time fixes

diff --git a/admin/index.php b/admin/index.php
index cf744deb00adab8420763f12d95088daae82bf31..3aad6066389bbecf56238401847965c24cd1f585 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -136,13 +136,14 @@
             echo "<br />";
             notice_yesno(get_string('doyouagree'), "index.php?agreelicense=1",
                                                    "http://docs.moodle.org/en/License");
+            print_footer('none');
             exit;
         }
         if (empty($confirmrelease)) {
             $strcurrentrelease = get_string("currentrelease");
             print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
             print_heading("Moodle $release");
-            print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'));
+            print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'generalbox boxaligncenter boxwidthwide');
             echo '<form action="index.php"><div>';
             echo '<input type="hidden" name="agreelicense" value="1" />';
             echo '<input type="hidden" name="confirmrelease" value="1" />';
@@ -531,7 +532,7 @@
 
 /// Deprecated database! Warning!!
     if (!empty($CFG->migrated_to_new_db)) {
-        print_box(print_string('dbmigrationdeprecateddb','admin'));
+        print_box(print_string('dbmigrationdeprecateddb', 'admin'), 'generalbox adminwarning');
     }
 
 /// Check for any special upgrades that might need to be run
@@ -540,11 +541,11 @@
     }
 
     if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
-        print_box(get_string('globalsquoteswarning', 'admin'));
+        print_box(get_string('globalsquoteswarning', 'admin'), 'generalbox adminwarning');
     }
 
     if (is_dataroot_insecure()) {
-        print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot));
+        print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
     }
 
 /// If no recently cron run
@@ -552,17 +553,17 @@
     if (time() - $lastcron > 3600 * 24) {
         $strinstallation = get_string('installation', 'install');
         $helpbutton = helpbutton('install', $strinstallation, 'moodle', true, false, '', true);
-        print_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton);
+        print_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'generalbox adminwarning');
     }
 
 /// Print multilang upgrade notice if needed
     if (empty($CFG->filter_multilang_converted)) {
-        print_box(get_string('multilangupgradenotice', 'admin'));
+        print_box(get_string('multilangupgradenotice', 'admin'), 'generalbox adminwarning');
     }
 
 /// Alert if we are currently in maintenance mode
     if (file_exists($CFG->dataroot.'/1/maintenance.html')) {
-        print_box(get_string('sitemaintenancewarning', 'admin'));
+        print_box(get_string('sitemaintenancewarning', 'admin'), 'generalbox adminwarning');
     }
 
 
@@ -572,7 +573,7 @@
     if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
         $options = array();
         $options['sesskey'] = $USER->sesskey;
-        print_box_start();
+        print_box_start('generalbox adminwarning');
         print_string('pleaseregister', 'admin');
         print_single_button('register.php', $options, get_string('registration'));
         print_box_end();

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index fd4d9302889b8af0389543b1e6bf6a5bea8130de..51402871e037150272b7387a0e5702c8b16787d3 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -182,7 +182,7 @@ img.grouppicture {
   padding:10px;
 }
 
-#notice, box {
+#notice.generalbox {
   width: 60%;
   margin-left:auto;
   margin-right:auto;
@@ -200,6 +200,7 @@ img.grouppicture {
 #notice .singlebutton {
   text-align:center;
   padding: 5px;
+  margin: 0px;
 }
 
 .errorbox {
@@ -821,15 +822,14 @@ body#admin-modules table.generaltable td.c0
   margin:auto;
 }
 
-#admin-index .generalbox {
+#admin-index .adminwarning {
   text-align:center;
-  margin:auto;
   border-width: 1px;
   border-style: solid;
   margin:20px;
 }
 
-#admin-index .singlebutton {
+#admin-index .adminwarning .singlebutton {
   text-align:center;
   margin:20px;
 }
@@ -3136,3 +3136,4 @@ wikiadminactions {
 .workshopkey {
   text-align:center;
 }
+