From 2c5666df86032a41682b61b2e52701a1b1a4fa37 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 26 Nov 2007 04:12:15 +0000 Subject: [PATCH] - web: when showing team forums, give link back to forum index svn path=/trunk/boinc/; revision=14303 --- checkin_notes | 13 +++++++++++++ html/inc/forum.inc | 15 ++++++++++++--- html/user/forum_edit.php | 2 +- html/user/forum_forum.php | 1 + html/user/forum_reply.php | 2 +- html/user/forum_subscribe.php | 2 +- html/user/forum_thread.php | 4 ++-- 7 files changed, 31 insertions(+), 8 deletions(-) diff --git a/checkin_notes b/checkin_notes index cae17da55c..1e3cc5fd3f 100644 --- a/checkin_notes +++ b/checkin_notes @@ -11682,3 +11682,16 @@ David 25 Nov 2007 edit_forum_preferences_forum.php team_display.php user_search.php + +David 25 Nov 2007 + - web: when showing team forums, give link back to forum index + + html/ + inc/ + forum.inc + user/ + forum_edit.php + forum_forum.php + forum_reply.php + forum_subscribe.php + forum_thread.php diff --git a/html/inc/forum.inc b/html/inc/forum.inc index 026d677850..2b90e5e559 100644 --- a/html/inc/forum.inc +++ b/html/inc/forum.inc @@ -154,13 +154,22 @@ function show_forum_title($category, $forum, $thread, $link_thread=false) { } } -function show_team_forum_title($forum, $thread=null) { +function show_team_forum_title($forum, $thread=null, $link_thread=false) { $team = BoincTeam::lookup_id($forum->category); echo " - id>$team->name message board + Message boards : "; if ($thread) { - echo " : id>$thread->title"; + echo " + id>$team->name message board + "; + if ($link_thread) { + echo " : id>$thread->title"; + } else { + echo " : $thread->title"; + } + } else { + echo "$team->name message board"; } echo ""; } diff --git a/html/user/forum_edit.php b/html/user/forum_edit.php index 74e04681d6..cced91bcbf 100644 --- a/html/user/forum_edit.php +++ b/html/user/forum_edit.php @@ -75,7 +75,7 @@ case 0: show_forum_title($category, $forum, $thread); break; case 1: - show_team_forum_title($forum); + show_team_forum_title($forum, $thread); break; } diff --git a/html/user/forum_forum.php b/html/user/forum_forum.php index 3e86d14e42..233d69f15f 100644 --- a/html/user/forum_forum.php +++ b/html/user/forum_forum.php @@ -59,6 +59,7 @@ case 1: $team = BoincTeam::lookup_id($forum->category); page_head("Team message board for id>$team->name"); show_forum_header($user); + show_team_forum_title($forum); break; } diff --git a/html/user/forum_reply.php b/html/user/forum_reply.php index 4ddca696fa..a8bf20a908 100644 --- a/html/user/forum_reply.php +++ b/html/user/forum_reply.php @@ -65,7 +65,7 @@ case 0: show_forum_title($category, $forum, $thread); break; case 1: - show_team_forum_title($forum); + show_team_forum_title($forum, $thread); break; } echo "

"; diff --git a/html/user/forum_subscribe.php b/html/user/forum_subscribe.php index 5a8add3f3b..5c5b3ae9b3 100644 --- a/html/user/forum_subscribe.php +++ b/html/user/forum_subscribe.php @@ -18,7 +18,7 @@ function show_title($forum, $thread) { show_forum_title($category, $forum, $thread); break; case 1: - show_team_forum_title($forum); + show_team_forum_title($forum, $thread); break; } } diff --git a/html/user/forum_thread.php b/html/user/forum_thread.php index 0f2cd13729..c8595a6cbb 100644 --- a/html/user/forum_thread.php +++ b/html/user/forum_thread.php @@ -72,7 +72,7 @@ case 0: show_forum_title($category, $forum, $thread); break; case 1: - show_team_forum_title($forum); + show_team_forum_title($forum, $thread); break; } @@ -175,7 +175,7 @@ case 0: show_forum_title($category, $forum, $thread); break; case 1: - show_team_forum_title($forum); + show_team_forum_title($forum, $thread); break; }