From: moodler <moodler>
Date: Fri, 19 Mar 2004 08:18:13 +0000 (+0000)
Subject: To avoid some unpleasant stuff with filters etc, I made slight changes
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5f8505882eb5272367f03f11fab1394f9842b39c;p=moodle.git

To avoid some unpleasant stuff with filters etc, I made slight changes
to separate the printing of the summary text from the edit button ...

Might need some testing because people have adjusted old texts to
work the old way ...   if anyone complains I'll put it back ...
---

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 83f7baacab..e27d08cb0b 100644
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -138,13 +138,15 @@
         echo "<td nowrap bgcolor=\"$THEME->cellheading\" class=\"topicsoutlineside\" valign=top width=20>&nbsp;</td>";
         echo "<td valign=top bgcolor=\"$THEME->cellcontent\" class=\"topicsoutlinecontent\" width=\"100%\">";
     
+        echo format_text($thissection->summary, FORMAT_HTML);
+
         if (isediting($course->id)) {
-            $thissection->summary .= " <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></p>";
+            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 />";
         }
     
-        echo format_text($thissection->summary);
+        echo '<br clear="all">';
     
         print_section($course, $thissection, $mods, $modnamesused);
     
@@ -227,12 +229,14 @@
         } else {
             echo "<td valign=top $colormain width=\"100%\">";
 
+            echo format_text($thissection->summary, FORMAT_HTML);
+
             if (isediting($course->id)) {
-                $thissection->summary .= " <a title=\"$streditsummary\" href=editsection.php?id=$thissection->id>".
-                     "<img src=\"$CFG->pixpath/t/edit.gif\" border=0 height=11 width=11></a>";
+                echo " <a title=\"$streditsummary\" href=editsection.php?id=$thissection->id>".
+                     "<img src=\"$CFG->pixpath/t/edit.gif\" border=0 height=11 width=11></a><br />";
             }
-    
-            echo format_text($thissection->summary);
+
+            echo '<br clear="all">';
     
             print_section($course, $thissection, $mods, $modnamesused);
     
diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 64657906d0..fca6ac4c18 100644
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -125,13 +125,15 @@
         echo "<td nowrap bgcolor=\"$THEME->cellheading\" class=\"weeklyoutlineside\" valign=top width=20>&nbsp;</td>";
         echo "<td valign=top bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlinecontent\" width=\"100%\">";
 
+        echo format_text($thissection->summary, FORMAT_HTML);
+
         if (isediting($course->id)) {
-            $thissection->summary .= " <a title=\"$streditsummary\" ".
-                                  "href=\"editsection.php?id=$thissection->id\"><img height=11 width=11 src=\"$CFG->pixpath/t/edit.gif\" ".
-                                  "border=0 alt=\"$streditsummary\"></a></p>";
+            echo " <a title=\"$streditsummary\" ".
+                 " href=\"editsection.php?id=$thissection->id\"><img height=11 width=11 src=\"$CFG->pixpath/t/edit.gif\" ".
+                 " border=0 alt=\"$streditsummary\"></a><br />";
         }
-    
-        echo format_text($thissection->summary);
+
+        echo '<br clear="all">';
     
         print_section($course, $thissection, $mods, $modnamesused);
 
@@ -217,12 +219,14 @@
 
             echo "<p class=\"weeklydatetext\">$weekday - $endweekday</p>";
 
+            echo format_text($thissection->summary, FORMAT_HTML);
+
             if (isediting($course->id)) {
-                $thissection->summary .= " <a title=\"$streditsummary\" href=\"editsection.php?id=$thissection->id\">".
-                      "<img src=\"$CFG->pixpath/t/edit.gif\" height=11 width=11 border=0></a></p>";
+                echo " <a title=\"$streditsummary\" href=\"editsection.php?id=$thissection->id\">".
+                     "<img src=\"$CFG->pixpath/t/edit.gif\" height=11 width=11 border=0></a><br />";
             }
 
-            echo format_text($thissection->summary);
+            echo '<br clear="all">';
 
             print_section($course, $thissection, $mods, $modnamesused);