Tidying up some strict!

diff --git a/admin/index.php b/admin/index.php
index 8bcf530fac200056f4f53bd066d2eaadb8557ee8..050be7bb69675f5cce580b75da82eb6dae5604bc 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -483,24 +483,20 @@
 
 /// Deprecated database! Warning!!
     if (!empty($CFG->migrated_to_new_db)) {
-        print_simple_box_start('center','60%');
-        print_string('dbmigrationdeprecateddb','admin');
-        print_simple_box_end();
+        print_box(print_string('dbmigrationdeprecateddb','admin'));
     }
 
 /// Check for any special upgrades that might need to be run
     if (!empty($CFG->upgrade)) {
-        print_simple_box(get_string("upgrade$CFG->upgrade", "admin",
-                                    "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"), "center", '60%');
-        print_spacer(10,10);
+        print_box(get_string("upgrade$CFG->upgrade", "admin", "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"));
     }
 
     if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
-        print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
+        print_box(get_string('globalsquoteswarning', 'admin'));
     }
 
     if (is_dataroot_insecure()) {
-        print_simple_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'center', '60%');
+        print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot));
     }
 
 /// If no recently cron run
@@ -508,17 +504,17 @@
     if (time() - $lastcron > 3600 * 24) {
         $strinstallation = get_string('installation', 'install');
         $helpbutton = helpbutton('install', $strinstallation, 'moodle', true, false, '', true);
-        print_simple_box(get_string('cronwarning', 'admin')." ".$helpbutton, 'center', '60%');
+        print_box(get_string('cronwarning', 'admin')." ".$helpbutton);
     }
 
 /// Print multilang upgrade notice if needed
     if (empty($CFG->filter_multilang_converted)) {
-        print_simple_box(get_string('multilangupgradenotice', 'admin'), 'center', '60%');
+        print_box(get_string('multilangupgradenotice', 'admin'));
     }
 
 /// Alert if we are currently in maintenance mode
     if (file_exists($CFG->dataroot.'/1/maintenance.html')) {
-        print_simple_box(get_string('sitemaintenancewarning', 'admin') , 'center', '60%');
+        print_box(get_string('sitemaintenancewarning', 'admin'));
     }
 
 
@@ -528,12 +524,10 @@
     if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
         $options = array();
         $options['sesskey'] = $USER->sesskey;
-        print_simple_box_start('center','60%');
-        echo '<div align="center">';
+        print_box_start();
         print_string('pleaseregister', 'admin');
         print_single_button('register.php', $options, get_string('registration'));
-        echo '</div>';
-        print_simple_box_end();
+        print_box_end();
         $registrationbuttonshown = true;
     }
 
@@ -544,29 +538,26 @@
                      'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
                      'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
                      '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
-    echo '<p class="copyright">'.$copyrighttext.'</p>';
+    print_box($copyrighttext, 'copyright');
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
 
     if (empty($registrationbuttonshown)) {
-        echo '<div align="center">';
         $options = array();
         $options['sesskey'] = $USER->sesskey;
         print_single_button('register.php', $options, get_string('registration'));
-        echo '</div>';
     }
 
 
     if (optional_param('dbmigrate')) {               // ??? Is this actually used?
-        print_simple_box_start('center','60%');
+        print_box_start();
         require_once($CFG->dirroot.'/'.$CFG->admin.'/utfdbmigrate.php');
         db_migrate2utf8();
-        print_simple_box_end();
+        print_box_end();
     }
 
 
     admin_externalpage_print_footer($adminroot);
 
 
-
 ?>

diff --git a/admin/langimport.php b/admin/langimport.php
index f671df4985c29fde629a3e3324de307656bcfa9b..38e056ed31b88d8df4da1ca1aa554c4e9a60b707 100755 (executable)
--- a/admin/langimport.php
+++ b/admin/langimport.php
@@ -236,17 +236,16 @@
             }
 */
             if (!$remote) {
-                print_simple_box_start('center','60%');
-                echo '<div align="center">';
+                print_box_start();
                 print_string('remotelangnotavailable','admin',$CFG->dataroot.'/lang/');
-                echo '</div>';
-                print_simple_box_end();
+                print_box_end();
             }
 
-            print_simple_box_start('center','60%');
-            echo '<table summary="" width="100%">';
+            print_box_start();
+            echo '<table summary="">';
             echo '<tr><td align="center" valign="top">';
             echo '<form id="uninstallform" action="langimport.php?mode=4" method="post">';
+            echo '<fieldset class="invisiblefieldset">';
             echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
             unset($CFG->langlist);   // ignore admin's langlist
             $installedlangs = get_list_of_languages();
@@ -260,9 +259,12 @@
             }
             echo '</select>';
             echo '<br /><input type="submit" value="'.get_string('uninstall','admin').'" />';
+            echo '</fieldset>';
             echo '</form>';
             echo '<form id="updateform" action="langimport.php?mode=5" method="post">';
+            echo '<fieldset class="invisiblefieldset">';
             echo '<br /><input type="submit" value="'.get_string('updatelangs','admin').'" />';
+            echo '</fieldset>';
             echo '</form>';
 
             /// Display option to change site language
@@ -276,6 +278,7 @@
             /// if this language pack is not already installed, then we allow installation
 
             echo '<form id="installform" method="post" action="langimport.php?mode=2">';
+            echo '<fieldset class="invisiblefieldset">';
             echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
             echo '<label for="pack">'.get_string('availablelangs','admin')."</label><br />\n";
             if ($remote) {
@@ -303,6 +306,7 @@
                 echo '</select>';
                 echo '<br /><input type="submit" value="&larr; '.get_string('install','admin').'" />';
             }
+            echo '</fieldset>';
             echo '</form>';
 
             if ($empty) {