From abcaf2cfa570a3b97168bd5bf9fe320a4674614d Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Fri, 5 Jan 2007 16:40:04 +0000
Subject: [PATCH] XHTML Strict fixes

---
 course/format/social/format.php  | 11 ++++-------
 course/format/topics/format.php  | 21 ++++++++++-----------
 theme/standard/styles_fonts.css  |  3 ++-
 theme/standard/styles_layout.css |  3 ++-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/course/format/social/format.php b/course/format/social/format.php
index f917e08e65..ddb2512bf3 100644
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -30,17 +30,14 @@
 
     echo '<td id="middle-column"><a name="startofcontent"></a>';
     if ($forum = forum_get_course_forum($course->id, 'social')) {
+        print_heading_block(get_string('socialheadline'));
         if (forum_is_forcesubscribed($forum->id)) {
-            $subtext = '<div class="link">'.get_string('everyoneissubscribed', 'forum').'</div>';
+            echo '<div class="subscribelink">'.get_string('everyoneissubscribed', 'forum').'</div>';
         } else if (forum_is_subscribed($USER->id, $forum->id)) {
-            $subtext = '<div class="link"><a href="../mod/forum/subscribe.php?id='.$forum->id.'">'.get_string('unsubscribe', 'forum').'</a></div>';
+            echo '<div class="subscribelink"><a href="../mod/forum/subscribe.php?id='.$forum->id.'">'.get_string('unsubscribe', 'forum').'</a></div>';
         } else {
-            $subtext = '<div class="link"><a href="../mod/forum/subscribe.php?id='.$forum->id.'">'.get_string('subscribe', 'forum').'</a></div>';
+            echo '<div class="subscribelink"><a href="../mod/forum/subscribe.php?id='.$forum->id.'">'.get_string('subscribe', 'forum').'</a></div>';
         }
-        $headertext = '<table width="100%" border="0" cellspacing="0" cellpadding="0"><tr>'.
-                      '<td><div class="title">'.get_string('socialheadline').'</div></td>'.
-                      '<td>'.$subtext.'</td></tr></table>';
-        print_heading_block($headertext);
 
         forum_print_latest_discussions($course, $forum, 10, 'plain', '', false);
 
diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 92616da7be..7485e77a72 100644
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -107,11 +107,10 @@
         $summaryformatoptions->noclean = true;
         echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
 
-        //Accessibility: added Alt, filled empty Alt-link text.
         if (isediting($course->id)) {
             echo '<a title="'.$streditsummary.'" '.
                  ' href="editsection.php?id='.$thissection->id.'"><img src="'.$CFG->pixpath.'/t/edit.gif" '.
-                 ' height="11" width="11" border="0" alt="'.$streditsummary.'" /></a><br /><br />';
+                 ' alt="'.$streditsummary.'" /></a><br /><br />';
         }
         echo '</div>';
 
@@ -192,7 +191,7 @@
 
                 if (isediting($course->id)) {
                     echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/edit.gif" border="0" height="11" width="11" alt="'.$streditsummary.'" /></a><br /><br />';
+                         '<img src="'.$CFG->pixpath.'/t/edit.gif" alt="'.$streditsummary.'" /></a><br /><br />';
                 }
                 echo '</div>';
 
@@ -207,38 +206,38 @@
             echo '<td class="right side">';
             if ($displaysection == $section) {      // Show the zoom boxes
                 echo '<a href="view.php?id='.$course->id.'&amp;topic=0#section-'.$section.'" title="'.$strshowalltopics.'">'.
-                     '<img src="'.$CFG->pixpath.'/i/all.gif" height="25" width="16" border="0" alt="'.$strshowalltopics.'" /></a><br />';
+                     '<img src="'.$CFG->pixpath.'/i/all.gif" alt="'.$strshowalltopics.'" /></a><br />';
             } else {
                 $strshowonlytopic = get_string('showonlytopic', '', $section);
                 echo '<a href="view.php?id='.$course->id.'&amp;topic='.$section.'" title="'.$strshowonlytopic.'">'.
-                     '<img src="'.$CFG->pixpath.'/i/one.gif" height="16" width="16" border="0" alt="'.$strshowonlytopic.'" /></a><br />';
+                     '<img src="'.$CFG->pixpath.'/i/one.gif" alt="'.$strshowonlytopic.'" /></a><br />';
             }
 
             if (isediting($course->id)) {
                 if ($course->marker == $section) {  // Show the "light globe" on/off
                     echo '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/marked.gif" vspace="3" height="16" width="16" border="0" alt="'.$strmarkedthistopic.'" /></a><br />';
+                         '<img src="'.$CFG->pixpath.'/i/marked.gif" alt="'.$strmarkedthistopic.'" /></a><br />';
                 } else {
                     echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkthistopic.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/marker.gif" vspace="3" height="16" width="16" border="0" alt="'.$strmarkthistopic.'" /></a><br />';
+                         '<img src="'.$CFG->pixpath.'/i/marker.gif" alt="'.$strmarkthistopic.'" /></a><br />';
                 }
 
                 if ($thissection->visible) {        // Show the hide/show eye
                     echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/hide.gif" vspace="3" height="16" width="16" border="0" alt="'.$strtopichide.'" /></a><br />';
+                         '<img src="'.$CFG->pixpath.'/i/hide.gif" alt="'.$strtopichide.'" /></a><br />';
                 } else {
                     echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopicshow.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/show.gif" vspace="3" height="16" width="16" border="0" alt="'.$strtopicshow.'" /></a><br />';
+                         '<img src="'.$CFG->pixpath.'/i/show.gif" alt="'.$strtopicshow.'" /></a><br />';
                 }
 
                 if ($section > 1) {                       // Add a arrow to move section up
                     echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/up.gif" vspace="3" height="11" width="11" border="0" alt="'.$strmoveup.'" /></a><br />';
+                         '<img src="'.$CFG->pixpath.'/t/up.gif" alt="'.$strmoveup.'" /></a><br />';
                 }
 
                 if ($section < $course->numsections) {    // Add a arrow to move section down
                     echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/down.gif" vspace="3" height="11" width="11" border="0" alt="'.$strmovedown.'" /></a><br />';
+                         '<img src="'.$CFG->pixpath.'/t/down.gif" alt="'.$strmovedown.'" /></a><br />';
                 }
 
             }
diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index e42b54aa28..bd5a3b65a9 100644
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -124,7 +124,8 @@ h4 {
   font-weight: bold;
 }
 
-#site-index .subscribelink {
+#site-index .subscribelink,
+#course-view .subscribelink {
   font-size: 0.8em;
 }
 
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 814fcae94f..01c83c7af2 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1318,7 +1318,8 @@ body#course-user .section h2 {
   margin:0;
 }
 
-#site-index .subscribelink {
+#site-index .subscribelink,
+#course-view .subscribelink {
   text-align:right;
 }
 
-- 
2.39.5