From 680afe2e262b7a8574842ba722a09eeb23e86eeb Mon Sep 17 00:00:00 2001 From: urs_hunkler Date: Wed, 19 Jan 2005 13:16:29 +0000 Subject: [PATCH] _ added the DIV framework for new CSS --- mod/forum/discuss.php | 5 +++++ mod/forum/index.php | 12 +++++++++--- mod/forum/post.php | 9 +++++++-- mod/forum/search.php | 12 ++++++++++++ mod/forum/subscribers.php | 32 +++++++++++++++++++------------- mod/forum/view.php | 9 ++++++--- 6 files changed, 58 insertions(+), 21 deletions(-) diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index f2ca6b69ea..566f401aa8 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -105,9 +105,13 @@ print_header("$course->shortname: $discussion->name", "$course->fullname", "id\">$course->shortname -> $navmiddle -> $navtail", "", "", true, $searchform, navmenu($course, $cm)); + + echo '
'; // forum-discuss wrapper start } else { print_header("$course->shortname: $discussion->name", "$course->fullname", "$navmiddle -> $navtail", "", "", true, $searchform, navmenu($course, $cm)); + + echo '
'; // forum-discuss wrapper start } @@ -194,6 +198,7 @@ forum_print_discussion($course, $forum, $discussion, $post, $displaymode, $canreply); + echo '
'; // forum-discuss wrapper end print_footer($course); diff --git a/mod/forum/index.php b/mod/forum/index.php index b015f4c1c9..3015e9e8da 100644 --- a/mod/forum/index.php +++ b/mod/forum/index.php @@ -50,7 +50,7 @@ $generaltable->align[] = "center"; } - if ($show_rss = (($can_subscribe || $course->id == SITEID) && + if ($show_rss = (($can_subscribe || $course->id == SITEID) && isset($CFG->enablerssfeeds) && isset($CFG->forum_enablerssfeeds) && $CFG->enablerssfeeds && $CFG->forum_enablerssfeeds)) { $generaltable->head[] = $strrss; @@ -202,7 +202,7 @@ $learningtable->align[] = "center"; } - if ($show_rss = (($can_subscribe || $course->id == SITEID) && + if ($show_rss = (($can_subscribe || $course->id == SITEID) && isset($CFG->enablerssfeeds) && isset($CFG->forum_enablerssfeeds) && $CFG->enablerssfeeds && $CFG->forum_enablerssfeeds)) { $learningtable->head[] = $strrss; @@ -268,7 +268,7 @@ $rsslink = rss_get_link($course->id, $userid, "forum", $forum->id, $tooltiptext); } } - + if ($can_subscribe) { if (forum_is_forcesubscribed($forum->id)) { $sublink = get_string("yes"); @@ -315,9 +315,13 @@ print_header("$course->shortname: $strforums", "$course->fullname", "id\">$course->shortname -> $strforums", "", "", true, $searchform, navmenu($course)); + + echo '
'; // forum-index wrapper start } else { print_header("$course->shortname: $strforums", "$course->fullname", "$strforums", "", "", true, $searchform, navmenu($course)); + + echo '
'; // forum-index wrapper start } if ($generalforums) { @@ -330,6 +334,8 @@ print_table($learningtable); } + echo '
'; // forum-index wrapper end + print_footer($course); ?> diff --git a/mod/forum/post.php b/mod/forum/post.php index 078e1ffede..7c4ae87b47 100644 --- a/mod/forum/post.php +++ b/mod/forum/post.php @@ -99,7 +99,7 @@ $message = ''; if ($discussion->id = forum_add_discussion($discussion,$message)) { - add_to_log($course->id, "forum", "add discussion", + add_to_log($course->id, "forum", "add discussion", "discuss.php?d=$discussion->id", "$discussion->id", $cm->id); $timemessage = 2; @@ -462,7 +462,7 @@ error("Could not find top parent of post $post->id"); } } else { - $toppost->subject = ($forum->type == "news") ? get_string("addanewtopic", "forum") : + $toppost->subject = ($forum->type == "news") ? get_string("addanewtopic", "forum") : get_string("addanewdiscussion", "forum"); } @@ -497,10 +497,13 @@ print_header("$course->shortname: $discussion->name: $toppost->subject", "$course->fullname", "id\">$course->shortname -> $navmiddle -> $navtail", $formstart, "", true, "", navmenu($course, $cm)); + + echo '
'; // forum-post wrapper start } else { print_header("$course->shortname: $discussion->name: $toppost->subject", "$course->fullname", "$navmiddle -> $navtail", "$formstart", "", true, "", navmenu($course, $cm)); + echo '
'; // forum-post wrapper start } if (!empty($parent)) { @@ -531,6 +534,8 @@ use_html_editor("message"); } + echo '
'; // forum-post wrapper end + print_footer($course); diff --git a/mod/forum/search.php b/mod/forum/search.php index 262ed7c7e7..cf1e0f740d 100644 --- a/mod/forum/search.php +++ b/mod/forum/search.php @@ -42,6 +42,8 @@ "id\">$strforums -> $strsearch", "search.search", "", "", " ", navmenu($course), true); + echo ''; // forum-search wrapper end + print_footer($course); exit; } @@ -82,6 +90,8 @@ id\">$strsearch -> \"$search\"", "search.search", "", "", $searchform, navmenu($course), true); + echo ''; // forum-search wrapper end + print_footer($course); ?> diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php index 67ad3df82d..674fa85798 100644 --- a/mod/forum/subscribers.php +++ b/mod/forum/subscribers.php @@ -5,7 +5,7 @@ require_variable($id); // forum optional_variable($group); // change of group - + optional_variable($edit); // Turn editing on and off if (! $forum = get_record("forum", "id", $id)) { @@ -29,7 +29,7 @@ unset($SESSION->fromdiscussion); add_to_log($course->id, "forum", "view subscribers", "subscribers.php?id=$forum->id", $forum->id, $cm->id); - + if (isset($_GET['edit'])) { if($edit == "on") { $USER->subscriptionsediting = true; @@ -43,12 +43,14 @@ $strsubscribers = get_string("subscribers", "forum"); $strforums = get_string("forums", "forum"); - $navigation = "id\">$strforums -> + $navigation = "id\">$strforums -> id\">$forum->name -> $strsubscribers"; - print_header_simple("$strsubscribers", "", "$navigation", + print_header_simple("$strsubscribers", "", "$navigation", "", "", true, forum_update_subscriptions_button($course->id, $id), true); + echo '
'; // forum-subscribers wrapper start + /// Check to see if groups are being used in this forum if ($groupmode = groupmode($course, $cm)) { // Groups are being used $currentgroup = setup_and_print_groups($course, $groupmode, "subscribers.php?id=$forum->id"); @@ -57,15 +59,15 @@ } if (empty($USER->subscriptionsediting)) { /// Display an overview of subscribers - + if (! $users = forum_subscribed_users($course, $forum, $currentgroup) ) { - + print_heading(get_string("nosubscribers", "forum")); - + } else { - + print_heading(get_string("subscribersto","forum", "'$forum->name'")); - + echo ''; foreach ($users as $user) { echo "
"; @@ -78,7 +80,9 @@ } echo "
"; } - + + echo '
'; // forum-subscribers wrapper end + print_footer($course); exit; } @@ -124,13 +128,13 @@ if (!$subscribers = forum_subscribed_users($course, $forum, $currentgroup)) { $subscribers = array(); } - + $subscriberarray = array(); foreach ($subscribers as $subscriber) { $subscriberarray[] = $subscriber->id; } $subscriberlist = implode(',', $subscriberarray); - + unset($subscriberarray); /// Get search results excluding any users already subscribed @@ -138,7 +142,7 @@ if (!empty($frm->searchtext) and $previoussearch) { $searchusers = search_users($course->id, $currentgroup, $frm->searchtext, 'firstname ASC, lastname ASC', $subscriberlist); } - + /// If no search results then get potential subscribers for this forum excluding users already subscribed if (empty($searchusers)) { if ($currentgroup) { @@ -161,6 +165,8 @@ print_simple_box_end(); + echo '
'; // forum-subscribers wrapper end + print_footer(); ?> diff --git a/mod/forum/view.php b/mod/forum/view.php index ecfb1b27de..772d055f91 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -52,7 +52,7 @@ if (!$buttontext) { $buttontext = forum_print_search_form($course, $search, true, "plain"); - } + } if ($CFG->forcelogin) { require_login(); @@ -60,7 +60,7 @@ if ($course->category) { require_login($course->id); - } + } $navigation = "id\">$strforums ->"; if ($forum->type == "teacher") { @@ -78,6 +78,8 @@ print_header_simple("$forum->name", "", "$navigation $forum->name", "", "", true, $buttontext, navmenu($course, $cm)); + echo '
'; // forum-view wrapper start + if (!$cm->visible and !isteacher($course->id)) { notice(get_string("activityiscurrentlyhidden")); } @@ -167,7 +169,7 @@ echo ''; if ($forum->rsstype == 1) { $tooltiptext = get_string("rsssubscriberssdiscussions","forum",$forum->name); - } else { + } else { $tooltiptext = get_string("rsssubscriberssposts","forum",$forum->name); } if (empty($USER->id)) { @@ -242,6 +244,7 @@ break; } + echo '
'; // forum-view wrapper end print_footer($course); -- 2.39.5