More XHTML strict stuff

diff --git a/course/index.php b/course/index.php
index cb2c4f34050bf9a258a0e1321509baa4895cae00..ad7dcb5f664be6299988a505001b8b8ea1ea8db4 100644 (file)
--- a/course/index.php
+++ b/course/index.php
@@ -46,9 +46,9 @@
             print_header("$site->shortname: $strcategories", $strcourses, 
                           $strcategories, "", "", true, update_categories_button());
             print_heading($strcategories);
-            print_simple_box_start("center", "50%", "#FFFFFF", 5, "categorybox");
+            print_box_start('categorybox');
             print_whole_category_list();
-            print_simple_box_end();
+            print_box_end();
             print_course_search();
         } else {
             $strfulllistofcourses = get_string("fulllistofcourses");
@@ -57,8 +57,6 @@
             print_courses(0, "80%");
         }
 
-        echo "<center>";
-        
         /// I am not sure this context in the next has_capability call is correct. 
         if (isloggedin() and !isguest() and !has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {  // Print link to request a new course
             print_single_button("request.php", NULL, get_string("courserequest"), "get");
@@ -69,7 +67,6 @@
         if (has_capability('moodle/site:approvecourse', get_context_instance(CONTEXT_SYSTEM, SITEID))  and !empty($CFG->enablecourserequests)) {
             print_single_button('pending.php',NULL, get_string('coursespending'),"get");
         }
-        echo "</center>";
         print_footer();
         exit;
     }
@@ -279,15 +276,15 @@
 
 /// Print form for creating new categories
     if (has_capability('moodle/category:create', $context)) {
-        echo "<center>";
+        echo '<div class="addcategory">';
         echo "<form id=\"addform\" action=\"index.php\" method=\"post\">";
+        echo '<fieldset class="invisiblefieldset">';
         echo "<input type=\"text\" size=\"30\" alt=\"$straddnewcategory\" name=\"addcategory\" />";
         echo "<input type=\"submit\" value=\"$straddnewcategory\" />";
         echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />";
+        echo "</fieldset>";
         echo "</form>";
-        echo "</center>";
-    
-        echo "<br />";
+        echo "</div>";
     }
 
 /// Print out the categories with all the knobs
@@ -303,7 +300,7 @@
     $displaylist[0] = get_string("top");
     make_categories_list($displaylist, $parentlist, "");
 
-    echo "<table align=\"center\" border=\"0\" cellspacing=\"2\" cellpadding=\"5\" class=\"generalbox\"><tr>";
+    echo "<table class=\"generalbox\"><tr>";
     echo "<th scope=\"col\">$strcategories</th>";
     echo "<th scope=\"col\">$strcourses</th>";
     echo "<th scope=\"col\">$stredit</th>";

diff --git a/lib/weblib.php b/lib/weblib.php
index f349f8a0874e9e707b85ee3bd3a431a64549dd8a..84b71fbc4d5da77ff3d99b464800acee7e9fc164 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3907,8 +3907,9 @@ function update_mymoodle_icon() {
     }
 
     return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/my/index.php\">".
-        "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
-        "<input type=\"submit\" value=\"$string\" /></form>";
+           "<fieldset class='invisiblefieldset'>".
+           "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
+           "<input type=\"submit\" value=\"$string\" /></frameset></form>";
 }
 
 /**
@@ -3957,10 +3958,11 @@ function update_category_button($categoryid) {
         }
 
         return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/course/category.php\">".
+               '<frameset class="invisibleframeset">'.
                "<input type=\"hidden\" name=\"id\" value=\"$categoryid\" />".
                "<input type=\"hidden\" name=\"categoryedit\" value=\"$edit\" />".
                "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />".
-               "<input type=\"submit\" value=\"$string\" /></form>";
+               "<input type=\"submit\" value=\"$string\" /></frameset></form>";
     }
 }
 
@@ -3984,9 +3986,10 @@ function update_categories_button() {
         }
 
         return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/course/index.php\">".
+               '<frameset class="invisibleframeset">'.
                '<input type="hidden" name="categoryedit" value="'. $categoryedit .'" />'.
                '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />'.
-               '<input type="submit" value="'. $string .'" /></form>';
+               '<input type="submit" value="'. $string .'" /></frameset></form>';
     }
 }
 
@@ -4010,12 +4013,13 @@ function update_categories_search_button($search,$page,$perpage) {
         }
 
         return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/course/search.php\">".
+               '<frameset class="invisibleframeset">'.
                "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
                "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />".
                "<input type=\"hidden\" name=\"search\" value=\"".s($search, true)."\" />".
                "<input type=\"hidden\" name=\"page\" value=\"$page\" />".
                "<input type=\"hidden\" name=\"perpage\" value=\"$perpage\" />".
-               "<input type=\"submit\" value=\"".s($string)."\" /></form>";
+               "<input type=\"submit\" value=\"".s($string)."\" /></frameset></form>";
     }
 }
 
@@ -4035,10 +4039,11 @@ function update_group_button($courseid, $groupid) {
         $string = get_string('editgroupprofile');
 
         return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/course/group.php\">".
+               '<frameset class="invisibleframeset">'.
                '<input type="hidden" name="id" value="'. $courseid .'" />'.
                '<input type="hidden" name="group" value="'. $groupid .'" />'.
                '<input type="hidden" name="edit" value="on" />'.
-               '<input type="submit" value="'. $string .'" /></form>';
+               '<input type="submit" value="'. $string .'" /></frameset></form>';
     }
 }
 
@@ -4064,9 +4069,10 @@ function update_groups_button($courseid) {
         }
 
         return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/course/groups.php\">".
+               '<frameset class="invisibleframeset">'.
                "<input type=\"hidden\" name=\"id\" value=\"$courseid\" />".
                "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
-               "<input type=\"submit\" value=\"$string\" /></form>";
+               "<input type=\"submit\" value=\"$string\" /></frameset></form>";
     }
 }