From 15a169222b4731cccf68d384e45404a92614232b Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Wed, 27 Sep 2006 07:49:34 +0000
Subject: [PATCH] Some extra changes from the duplicate work I did on
 upgradesettings.php

main change is that adminsettings is now an ID on the form
---
 admin/settings.php               |  2 +-
 admin/upgradesettings.php        | 10 ++++++----
 lib/adminlib.php                 |  4 ++--
 theme/standard/styles_color.css  |  4 ++--
 theme/standard/styles_fonts.css  |  2 +-
 theme/standard/styles_layout.css | 28 ++++++++++++++--------------
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/admin/settings.php b/admin/settings.php
index a39e1b9daf..639a22a27d 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -105,7 +105,7 @@ if (!empty($SITE->fullname)) {
 
 }
 
-echo '<form action="settings.php" method="post" name="mainform">';
+echo '<form action="settings.php" method="post" name="mainform" id="adminsettings">';
 echo '<input type="hidden" name="section" value="' . $PAGE->section . '" />';
 echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';
 echo '<input type="hidden" name="return" value="' . $return . '" />';
diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php
index b3872a9d91..ebeb44f800 100644
--- a/admin/upgradesettings.php
+++ b/admin/upgradesettings.php
@@ -56,11 +56,13 @@ if ($data = data_submitted()) {
 // to modify them
 admin_externalpage_print_header($adminroot);
 
-echo '<form action="upgradesettings.php" method="post" name="mainform">';
-echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
+print_simple_box(get_string('upgradesettingsintro','admin'),'','100%','',5,'generalbox','');
 
+echo '<form action="upgradesettings.php" method="post" name="mainform" id="adminsettings">';
+echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
+echo '<fieldset>';
+echo '<div class="clearer"><!-- --></div>';
 echo $newsettingshtml;
-
 echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
 echo '</form>';
 
@@ -140,4 +142,4 @@ function output_new_settings_by_page(&$node) {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 0d2e88d4cc..4ce0c64c97 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1233,10 +1233,10 @@ class admin_settingpage extends part_of_admin_tree {
     // outputs this page as html in a table (suitable for inclusion in an admin pagetype)
     // returns a string of the html
     function output_html() {
-        $return = '<fieldset class="adminsettings">' . "\n";
+        $return = '<fieldset>' . "\n";
         $return .= '<div class="clearer"><!-- --></div>' . "\n";
         foreach($this->settings as $setting) {
-          $return .= $setting->output_html();
+            $return .= $setting->output_html();
         }
         $return .= '</fieldset>';
         return $return;
diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index 4bc101850a..78f7197be5 100644
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -308,13 +308,13 @@ table.flexible .r1 {
   background-color: green;
 }
 
-fieldset.adminsettings {
+#adminsettings {
     background-color: #EEE;
     border-color: #BBB;
     color: #000;
 }
 
-fieldset.adminsettings .form-shortname {
+#adminsettings .form-shortname {
     color: #888;
 }
 
diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index 353a85de96..0663729353 100644
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -228,7 +228,7 @@ body#admin-index .copyright {
   font-size: 0.8em;
 }
 
-fieldset.adminsettings .form-shortname {
+#adminsettings .form-shortname {
     font-size: 75%;
 }
 
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 424ea9be68..7879a1da86 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -451,63 +451,63 @@ body#admin-roles-manage table.generalbox {
   text-align:center;
 }
 
-fieldset.adminsettings {
+#adminsettings fieldset {
     margin-top: 1em;
     padding: 1em 0.5em;
 }
 
-fieldset.adminsettings legend {
+#adminsettings legend {
     display: none;
 }
 
-fieldset.adminsettings .form-group {
+#adminsettings .form-group {
     float: left;
 }
 
-fieldset.adminsettings .form-item {
+#adminsettings .form-item {
     margin: 0;
 }
 
-fieldset.adminsettings label {
+#adminsettings label {
     display: block;
     float: left;
     width: 150px;
     text-align: right;
 }
 
-fieldset.adminsettings .form-shortname {
+#adminsettings .form-shortname {
     display: block;
 }
 
-fieldset.adminsettings select,
-fieldset.adminsettings input {
+#adminsettings select,
+#adminsettings input {
     float: left;
     margin: 0 0 0 10px;
 }
 
-fieldset.adminsettings textarea {
+#adminsettings textarea {
     float: left;
     margin: 0 0 0 10px;
     width: 65%;
 }
 
-fieldset.adminsettings .form-group select,
-fieldset.adminsettings .form-group input {
+#adminsettings .form-group select,
+#adminsettings .form-group input {
     display: inline;
     float: none;
 }
 
-/* fieldset.adminsettings .admin-configtime .form-select {
+/* #adminsettings .admin-configtime .form-select {
     display: inline;
     float: none;
 }
 
-fieldset.adminsettings div.admin-frontpage div.form-group select.form-select {
+#adminsettings div.admin-frontpage div.form-group select.form-select {
     display: inline;
     float: none;
 } */
 
-fieldset.adminsettings .description {
+#adminsettings .description {
     clear: both;
     margin: 0 1em 0 160px;
     padding: 0.3em 0 1.5em 0;
-- 
2.39.5