Index: openacs-4/packages/forums/forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v diff -u -r1.25.2.17 -r1.25.2.18 --- openacs-4/packages/forums/forums.info 25 Jul 2005 19:42:04 -0000 1.25.2.17 +++ openacs-4/packages/forums/forums.info 29 Sep 2005 15:43:05 -0000 1.25.2.18 @@ -7,27 +7,29 @@ f f - + OpenACS Online discussion forums. - 2003-11-10 + 2005-09-23 OpenACS This online discussion board software is the successor of the original bboard package. The biggest improvement is a scalable datamodel. Forums supports threaded and flat view, moderation, a stand alone search function as well as integration with the OpenACS search package and integration with the notifications package for email alerts. It also supports reply via email. - - + - + + + - + + Index: openacs-4/packages/forums/tcl/forums-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-procs.xql,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/packages/forums/tcl/forums-procs.xql 24 Jun 2002 21:40:16 -0000 1.4 +++ openacs-4/packages/forums/tcl/forums-procs.xql 29 Sep 2005 15:43:05 -0000 1.4.8.1 @@ -17,7 +17,8 @@ select forum_id, name, posting_policy, - presentation_type + presentation_type, + charter from forums_forums where package_id = :package_id order by name Index: openacs-4/packages/forums/tcl/messages-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v diff -u -r1.24.2.5 -r1.24.2.6 --- openacs-4/packages/forums/tcl/messages-procs.tcl 23 Dec 2004 02:12:54 -0000 1.24.2.5 +++ openacs-4/packages/forums/tcl/messages-procs.tcl 29 Sep 2005 15:43:05 -0000 1.24.2.6 @@ -84,8 +84,10 @@ set message_text [ad_html_text_convert -from $message(format) -to text/plain -- $message(content)] set message_html [ad_html_text_convert -from $message(format) -to text/html -- $message(content)] + set header_message [parameter::get -parameter "HeaderNotificationMessage" -default ""] set html_version "" + append html_version "$header_message
\n" append html_version "Forum: $message(forum_name)
\n" append html_version "Thread: $message(root_subject)
\n" append html_version "Author: $message(user_name)
\n" @@ -109,6 +111,7 @@ set html_version $html_version set text_version "" + append text_version "$header_message" append text_version " Forum: $message(forum_name) Thread: $message(root_message_id) Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/charter.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/charter.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/www/forum-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v diff -u -r1.25.2.2 -r1.25.2.3 --- openacs-4/packages/forums/www/forum-view.adp 8 Apr 2005 18:41:57 -0000 1.25.2.2 +++ openacs-4/packages/forums/www/forum-view.adp 29 Sep 2005 15:43:06 -0000 1.25.2.3 @@ -7,13 +7,24 @@ @notification_chunk;noquote@ + - +
#forums.Search#  +
+ + + + + + #forums.Charter# + + + Index: openacs-4/packages/forums/www/forum-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v diff -u -r1.22.2.3 -r1.22.2.4 --- openacs-4/packages/forums/www/forum-view.tcl 8 Apr 2005 18:41:57 -0000 1.22.2.3 +++ openacs-4/packages/forums/www/forum-view.tcl 29 Sep 2005 15:43:06 -0000 1.22.2.4 @@ -12,6 +12,9 @@ page:optional } +# Get the parameter to display house rules +set display_charter_p [parameter::get -parameter "DisplayCharterP" -default 1] +set charter_url [export_vars -base "charter" -url {forum_id}] # Get forum data forum::get -forum_id $forum_id -array forum