From 554cec9f270d7b6f4f70ad440aba131c403de8f5 Mon Sep 17 00:00:00 2001 From: moodler Date: Tue, 25 Jan 2005 14:18:51 +0000 Subject: [PATCH] Removed a lot of THEMES and some other clean up A LOT of clean up and speed-up is still possible in these important files by converting all "strings" to 'strings' --- course/format/topics/format.php | 32 ++++++++++++++++---------------- course/format/weeks/format.php | 20 ++++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/course/format/topics/format.php b/course/format/topics/format.php index 903517cccc..9a344017b8 100644 --- a/course/format/topics/format.php +++ b/course/format/topics/format.php @@ -82,7 +82,7 @@ $stractivityclipboard = strip_tags(get_string("activityclipboard", "", addslashes($USER->activitycopyname))); $strcancel= get_string("cancel"); echo ""; - echo "cellcontent\" class=\"topicoutlineclip\" width=\"100%\">"; + echo ""; echo "

"; echo "$stractivityclipboard  (sesskey\">$strcancel)"; echo "

"; @@ -99,16 +99,16 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) { echo ''; - echo "cellheading\" class=\"topicsoutlineside\" valign=\"top\" width=\"20\"> "; - echo "cellcontent\" class=\"topicsoutlinecontent\" width=\"100%\">"; + echo ' '; + echo ''; $summaryformatoptions->noclean = true; echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); if (isediting($course->id)) { - echo "id\">pixpath/t/edit.gif\" ". - " height=\"11\" width=\"11\" border=\"0\" alt=\"$streditsummary\" />

"; + echo ''.$streditsummary.'

'; } print_section($course, $thissection, $mods, $modnamesused); @@ -117,10 +117,10 @@ print_section_add_menus($course, $section, $modnames); } - echo ""; - echo "cellheading\" class=\"topicsoutlineside\" valign=\"top\" align=\"center\" width=\"10\">"; - echo " "; - echo "\"\""; + echo ''; + echo ''; + echo ' '; + echo ''; } @@ -170,14 +170,14 @@ $currenttopic = ($course->marker == $section); if (!$thissection->visible) { - $colorsides = "bgcolor=\"$THEME->hidden\" class=\"topicsoutlinesidehidden\""; - $colormain = "bgcolor=\"$THEME->cellcontent\" class=\"topicsoutlinecontenthidden\""; + $colorsides = 'class="topicsoutlinesidehidden"'; + $colormain = 'class="topicsoutlinecontenthidden"'; } else if ($currenttopic) { - $colorsides = "bgcolor=\"$THEME->cellheading2\" class=\"topicsoutlinesidehighlight\""; - $colormain = "bgcolor=\"$THEME->cellcontent\" class=\"topicsoutlinecontenthighlight\""; + $colorsides = 'class="topicsoutlinesidehighlight"'; + $colormain = 'class="topicsoutlinecontenthighlight"'; } else { - $colorsides = "bgcolor=\"$THEME->cellheading\" class=\"topicsoutlineside\""; - $colormain = "bgcolor=\"$THEME->cellcontent\" class=\"topicsoutlinecontent\""; + $colorsides = 'class="topicsoutlineside"'; + $colormain = 'class="topicsoutlinecontent"'; } echo ""; diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php index f8e07aa8c5..9e9ca9c61a 100644 --- a/course/format/weeks/format.php +++ b/course/format/weeks/format.php @@ -72,7 +72,7 @@ $stractivityclipboard = strip_tags(get_string("activityclipboard", "", addslashes($USER->activitycopyname))); $strcancel= get_string("cancel"); echo ""; - echo "cellcontent\" class=\"weeklyoutlineclip\" width=\"100%\">"; + echo ""; echo "

"; echo "$stractivityclipboard  (sesskey\">$strcancel)"; echo "

"; @@ -88,8 +88,8 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) { echo ""; - echo "cellheading\" class=\"weeklyoutlineside\" valign=\"top\" width=\"20\"> "; - echo "cellcontent\" class=\"weeklyoutlinecontent\" width=\"100%\">"; + echo " "; + echo ""; $summaryformatoptions->noclean = true; echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); @@ -107,7 +107,7 @@ } echo ""; - echo "cellheading\" class=\"weeklyoutlineside\" valign=\"top\" align=\"center\" width=\"10\">"; + echo ""; echo " "; echo "\"\""; } @@ -158,14 +158,14 @@ $currentweek = (($weekdate <= $timenow) && ($timenow < $nextweekdate)); if (!$thissection->visible) { - $colorsides = "bgcolor=\"$THEME->hidden\" class=\"weeklyoutlinesidehidden\""; - $colormain = "bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlinecontenthidden\""; + $colorsides = "class=\"weeklyoutlinesidehidden\""; + $colormain = "class=\"weeklyoutlinecontenthidden\""; } else if ($currentweek) { - $colorsides = "bgcolor=\"$THEME->cellheading2\" class=\"weeklyoutlinesidehighlight\""; - $colormain = "bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlinecontenthighlight\""; + $colorsides = "class=\"weeklyoutlinesidehighlight\""; + $colormain = "class=\"weeklyoutlinecontenthighlight\""; } else { - $colorsides = "bgcolor=\"$THEME->cellheading\" class=\"weeklyoutlineside\""; - $colormain = "bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlinecontent\""; + $colorsides = "class=\"weeklyoutlineside\""; + $colormain = "class=\"weeklyoutlinecontent\""; } echo ""; -- 2.39.5