XHTML changes and general tidy up

diff --git a/mod/forum/mod.html b/mod/forum/mod.html
index 10e043d201a8b2b326d779a477f6adc4cd83e19a..92c6ef0cda5353c01a93895afd109704512b09a8 100644 (file)
--- a/mod/forum/mod.html
+++ b/mod/forum/mod.html
@@ -42,13 +42,13 @@
 <form name="form" method="post" action="mod.php">
 <table cellpadding="5">
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("forumname", "forum")?>:</b></p></td>
+    <td align="right"><b><?php print_string("forumname", "forum")?>:</b></td>
     <td>
         <input type="text" name="name" size="30" value="<?php p($form->name) ?>" />
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("forumtype", "forum")?>:</b></p></td>
+    <td align="right"><b><?php print_string("forumtype", "forum")?>:</b></td>
     <td>
     <?php
        $student = strtolower($course->student);
@@ -72,7 +72,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("forumintro", "forum")?>:</b></p>
+    <td align="right"><b><?php print_string("forumintro", "forum")?>:</b><br />
     <font size="1">
      <?php
         helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
@@ -90,7 +90,7 @@
 </tr>
 
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("allowdiscussions", "forum", strtolower("$course->student")) ?>:</b></p></td>
+    <td align="right"><b><?php print_string("allowdiscussions", "forum", strtolower("$course->student")) ?>:</b></td>
     <td>
         <?php
             choose_from_menu($FORUM_OPEN_MODES, "open", $form->open, "");
@@ -100,7 +100,7 @@
     </td>
 </tr>
 <tr>
-    <td align="right"><p><b><?php print_string("forcesubscribeq", "forum") ?>:</b></p></td>
+    <td align="right"><b><?php print_string("forcesubscribeq", "forum") ?>:</b></td>
     <td>
         <?php
             unset($options);
@@ -113,7 +113,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php  print_string("maxattachmentsize", "forum") ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("maxattachmentsize", "forum") ?>:</b></td>
     <td>
         <?php
             $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes);
@@ -128,7 +128,7 @@
     //Only show rss parameters if rss is activated at site and forum levels
     if ($CFG->enablerssfeeds && $CFG->forum_enablerssfeeds) {
         echo "<tr valign=\"top\">";
-        echo "<td align=\"right\"><p><b>".get_string("rsstype").":</b></p></td>";
+        echo "<td align=\"right\"><b>".get_string("rsstype").":</b></td>";
         echo "<td>";
         unset($choices);
         $choices[0] = get_string("none");
@@ -140,7 +140,7 @@
         echo "</tr>";
 
         echo "<tr valign=\"top\">";
-        echo "<td align=\"right\"><p><b>".get_string("rssarticles").":</b></p></td>";
+        echo "<td align=\"right\"><b>".get_string("rssarticles").":</b></td>";
         echo "<td>";
         unset($choices);
         $choices[0] = "0";
@@ -163,7 +163,7 @@
     }
 ?>
 <tr>
-    <td align="right" valign="top"><p><b><?php print_string("allowratings", "forum") ?>:</b></p></td>
+    <td align="right" valign="top"><b><?php print_string("allowratings", "forum") ?>:</b></td>
     <td>
         <?php
             echo "<script type=\"text/javascript\">";

diff --git a/mod/forum/post.html b/mod/forum/post.html
index 25ee247d6fb2c188977f7193747a68bcee8080f1..2bf1444c5b968f1e677d2de20ef489a3bccdd9bf 100644 (file)
--- a/mod/forum/post.html
+++ b/mod/forum/post.html
@@ -1,15 +1,15 @@
 <form name="theform" method="post" action="post.php" enctype="multipart/form-data">
 <table border="0" cellpadding="5">
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("subject", "forum"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("subject", "forum"); ?>:</b></td>
     <td>
-        <input type="text" name="subject" size="60" value="<?php p($post->subject) ?>" />
+        <input type="text" name="subject" size="60" value="<?php p($post->subject) ?>" alt="<?php print_string("subject", "forum"); ?>" />
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b>
+    <td align="right"><b>
      <?php print_string("message", "forum"); ?>:
-     </b></p></td>
+     </b></td>
     <td align="left" rowspan="2">
     <?php print_textarea($usehtmleditor, 25, 65, 630, 400, "message", $post->message); ?>
     </td>
@@ -40,7 +40,7 @@
 
 
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("formattexttype"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("formattexttype"); ?>:</b></td>
     <td>
     <?php 
         if ($usehtmleditor) {   /// Trying this out for a while
@@ -56,7 +56,7 @@
 
 
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("subscription", "forum") ?>:</b></p></td>
+    <td align="right"><b><?php print_string("subscription", "forum") ?>:</b></td>
     <td>
     <?php 
        if (forum_is_forcesubscribed($forum->id)) {
@@ -86,11 +86,11 @@
 <?php if ($forum->maxbytes != 1) {  //  1 = No attachments at all  ?>
 
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("attachment", "forum") ?>:<br />(<?php print_string("optional") ?>)&nbsp;</b></p></td>
+    <td align="right"><b><?php print_string("attachment", "forum") ?>:<br />(<?php print_string("optional") ?>)&nbsp;</b></td>
     <td>
     <?php $maxbytes = get_max_upload_file_size($CFG->maxbytes, $course->maxbytes, $forum->maxbytes); ?>
     <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $maxbytes ?>" />
-    <input type="file" name="attachment" size="40" />
+    <input type="file" name="attachment" size="40" alt="<?php print_string("attachment", "forum") ?>" />
     <?php
     helpbutton("attachment", get_string("attachment", "forum"), "forum"); 
     print_string("maxsize", "", display_size($maxbytes)); 

diff --git a/mod/forum/post.php b/mod/forum/post.php
index 44915eaf225dc40ea3256aa07292a9c1fb5817c4..f0f60bb3387c820fdf9193a7792a50740da93868 100644 (file)
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -488,7 +488,7 @@
 
     if ($course->category) {
         print_header("$course->shortname: $discussion->name: $toppost->subject", "$course->fullname",
-                 "<a href=../../course/view.php?id=$course->id>$course->shortname</a> ->
+                 "<a href=\"../../course/view.php?id=$course->id\">$course->shortname</a> ->
                   $navmiddle -> $navtail", $formstart, "", true, "", navmenu($course, $cm));
     } else {
         print_header("$course->shortname: $discussion->name: $toppost->subject", "$course->fullname",