From: moodler Date: Mon, 2 Aug 2004 09:49:20 +0000 (+0000) Subject: Some tidy ups in mail formatting X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=9c674431b9e7aaddc47d19f38af1f263d54ffd50;p=moodle.git Some tidy ups in mail formatting --- diff --git a/mod/forum/lib.php b/mod/forum/lib.php index a93b5ee1a7..f8ec2f35a1 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -378,7 +378,14 @@ function forum_cron () { $posttext = get_string('digestmailheader', 'forum', $headerdata)."\n\n"; $headerdata->userprefs = ''.get_string('digestmailprefs', 'forum').''; - $posthtml = "cellcontent2\">"; + + $posthtml = "stylesheet."\" />\n"; + $posthtml .= "cellcontent2\">"; + $posthtml .= "\n\n"; $posthtml .= '

'.get_string('digestmailheader', 'forum', $headerdata).'

'; foreach($thesediscussions as $discussionid) { @@ -548,14 +555,22 @@ function forum_make_mail_html($course, $forum, $discussion, $post, $userfrom, $u $canreply = forum_user_can_post($forum, $userto); $canunsubscribe = ! forum_is_forcesubscribed($forum->id); - $posthtml = "

". - "wwwroot/course/view.php?id=$course->id\">$course->shortname -> ". - "wwwroot/mod/forum/index.php?id=$course->id\">$strforums -> ". + $posthtml = ''; + $posthtml .= "stylesheet."\" />\n"; + $posthtml .= "\n\n"; + + $posthtml .= "

". + "wwwroot/course/view.php?id=$course->id\">$course->shortname » ". + "wwwroot/mod/forum/index.php?id=$course->id\">$strforums » ". "wwwroot/mod/forum/view.php?f=$forum->id\">$forum->name"; if ($discussion->name == $forum->name) { $posthtml .= "

"; } else { - $posthtml .= " -> wwwroot/mod/forum/discuss.php?d=$discussion->id\">$discussion->name

"; + $posthtml .= " » wwwroot/mod/forum/discuss.php?d=$discussion->id\">$discussion->name

"; } $posthtml .= forum_make_mail_post($post, $userfrom, $userto, $course, false, $canreply, false, false); @@ -1281,23 +1296,16 @@ function forum_make_mail_post(&$post, $user, $touser, $course, $output = ""; - $output .= "\n\n"; - - $output .= '

'; - $output .= ''; + $output .= '

'; - $output .= ""; if ($post->parent) { - $output .= ""; - $output .= "

cellcontent2\" width=\"35\" valign=\"top\">"; + $output .= "
cellcontent2\" width=\"35\" valign=\"top\" class=\"forumpostpicture\">"; $output .= print_user_picture($user->id, $course->id, $user->picture, false, true); $output .= "	cellheading\">"; + $output .= "	cellheading\" class=\"forumpostheader\">"; } else { - $output .= "	cellheading2\">"; + $output .= "	cellheading2\" class=\"forumpostheadertopic\">"; } $output .= " "; $output .= "$post->subject "; @@ -1309,9 +1317,9 @@ function forum_make_mail_post(&$post, $user, $touser, $course, $output .= get_string("bynameondate", "forum", $by); $output .= "
cellcontent2\" width=10>"; + $output .= "
cellcontent2\" width=\"10\" class=\"forumpostside\">"; $output .= " "; - $output .= "	cellcontent\">\n"; + $output .= "	cellcontent\" class=\"forumpostmessage\">\n"; if ($post->attachment) { $post->course = $course->id; @@ -1357,7 +1365,6 @@ function forum_make_mail_post(&$post, $user, $touser, $course, if ($footer) { $output .= " $footer "; } - $output .= "

\n"; $output .= "

\n\n"; return $output;