Index: openacs-4/packages/forums/forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v diff -u -r1.9 -r1.10 --- openacs-4/packages/forums/forums.info 2 Jul 2002 02:00:01 -0000 1.9 +++ openacs-4/packages/forums/forums.info 30 Jul 2002 22:04:59 -0000 1.10 @@ -111,7 +111,9 @@ - + + + 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.11 -r1.12 --- openacs-4/packages/forums/www/forum-view.adp 11 Jul 2002 12:49:26 -0000 1.11 +++ openacs-4/packages/forums/www/forum-view.adp 30 Jul 2002 22:04:59 -0000 1.12 @@ -4,91 +4,83 @@
- - - +
- - - - - - - - - -
- [ - - - - Administer | - - - + + + [ + + Administer | + Manage/Moderate - + ] + - - ] -

-
- - - Search:  - -
- @notification_chunk@ -

+
+ + @notification_chunk@ + +
+ - [ Post a New Message ] + [ Post a New Message ]
- -
- - - - - - - - - - - - - - - - - - - - - - - - + +
SubjectAuthorRepliesLast Post
- - @messages.subject@ - - - (@messages.state@) - + + + + Search:  + @messages.user_name@@messages.n_messages@@messages.last_modified@
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SubjectAuthorRepliesLast Post
+ + + + @messages.subject@ + + + + + (@messages.state@) + + @messages.user_name@@messages.n_messages@@messages.last_modified@
No Messages
- - - - - - No Messages - - - - - -
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.4 -r1.5 --- openacs-4/packages/forums/www/forum-view.tcl 2 Jul 2002 02:00:01 -0000 1.4 +++ openacs-4/packages/forums/www/forum-view.tcl 30 Jul 2002 22:04:59 -0000 1.5 @@ -10,8 +10,14 @@ forum_id:integer,notnull } + forum::security::require_read_forum -forum_id $forum_id +# get the colors from the params +set table_border_color [parameter::get -parameter table_border_color] +set table_bgcolor [parameter::get -parameter table_bgcolor] +set table_other_bgcolor [parameter::get -parameter table_other_bgcolor] + set package_id [ad_conn package_id] set user_id [ad_verify_and_get_user_id] set admin_p [forum::security::can_admin_forum_p -forum_id $forum_id] @@ -33,8 +39,7 @@ element create search search_text \ -label Search \ -datatype text \ - -widget text \ - -html {size 60} + -widget text element create search forum_id \ -label ForumID \ Index: openacs-4/packages/forums/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/forums/www/index.adp 2 Jul 2002 02:00:01 -0000 1.9 +++ openacs-4/packages/forums/www/index.adp 30 Jul 2002 22:04:59 -0000 1.10 @@ -3,68 +3,76 @@ @context_bar@
- - - +
- -
- - [ New Forum ] - -  + + + [ New Forum ] + + +   +   - - - Search:  - + + + Search:  + +

- +
- - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + +
Forum Name Threads Last Post
- - @forums.name@ - -
@forums.charter@
-
@forums.n_threads@@forums.last_modified@
- No Forums -
+ + + + @forums.name@ + + + + +
@forums.charter@ +
+
+ @forums.n_threads@ + + + @forums.last_modified@ + +
+ No Forums +
Index: openacs-4/packages/forums/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/forums/www/index.tcl 2 Jul 2002 02:00:01 -0000 1.3 +++ openacs-4/packages/forums/www/index.tcl 30 Jul 2002 22:04:59 -0000 1.4 @@ -12,13 +12,17 @@ set user_id [ad_verify_and_get_user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] +# get the colors from the params +set table_border_color [parameter::get -parameter table_border_color] +set table_bgcolor [parameter::get -parameter table_bgcolor] +set table_other_bgcolor [parameter::get -parameter table_other_bgcolor] + form create search -action search element create search search_text \ -label Search \ -datatype text \ - -widget text \ - -html {size 60} + -widget text element create search forum_id \ -label ForumID \ Index: openacs-4/packages/forums/www/message-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-chunk.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/forums/www/message-chunk.adp 16 Jul 2002 15:17:28 -0000 1.8 +++ openacs-4/packages/forums/www/message-chunk.adp 30 Jul 2002 22:04:59 -0000 1.9 @@ -1,43 +1,68 @@ - - - - - - -
- @message.subject@ -
- @message.user_name@ - @message.posting_date@ - - - [ - reply - | email + + + + + + + @message.subject@ + + + @message.subject@ + + + + + @message.user_name@ + @message.posting_date@ + + + + +
+ [ reply + | email + ] + +
+ [ edit + | delete + + + + | approve + + + | reject + + ] -
- -
- - [ - edit - | delete - - - | approve - - - | reject - - - ] - -
- - - -
@message.content@
- + +
+ + + + + + + + + + + + + + + +
+ <%= [ad_text_to_html -- "$message(content)"] %> +
+
+ + @message.content@ + + + + - + Index: openacs-4/packages/forums/www/message-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-chunk.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/forums/www/message-chunk.tcl 5 Jun 2002 19:25:37 -0000 1.2 +++ openacs-4/packages/forums/www/message-chunk.tcl 30 Jul 2002 22:04:59 -0000 1.3 @@ -2,7 +2,10 @@ a message chunk to be included in a table listing of messages + _so that has to be wrapped in a _ + @author yon (yon@openforce.net) + @author arjun (arjun@openforce.net) @creation-date 2002-06-02 @version $Id$ @@ -11,6 +14,12 @@ if {![array exists message]} { ad_return_complaint 1 "Need to provide a message to display." } -if {![exists_and_not_null bgcolor]} { set bgcolor "#ffffff" } + +if {![exists_and_not_null bgcolor]} { + set table_bgcolor [parameter::get -parameter table_bgcolor] +} else { + set table_bgcolor $bgcolor +} + if {![exists_and_not_null moderate_p]} { set moderate_p 0 } if {![exists_and_not_null forum_moderated_p]} {set forum_moderated_p 0} Index: openacs-4/packages/forums/www/message-email.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/forums/www/message-email.adp 3 Jun 2002 04:39:05 -0000 1.2 +++ openacs-4/packages/forums/www/message-email.adp 30 Jul 2002 22:04:59 -0000 1.3 @@ -4,6 +4,8 @@

Email a copy of the following message:

- +
+ +
Index: openacs-4/packages/forums/www/message-post-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post-confirm.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/forums/www/message-post-confirm.adp 2 Jul 2002 19:42:19 -0000 1.4 +++ openacs-4/packages/forums/www/message-post-confirm.adp 30 Jul 2002 22:04:59 -0000 1.5 @@ -4,8 +4,14 @@

Please confirm the following post:

- +<% set table_border_color [parameter::get -parameter table_border_color] %> +
+ + +
+
+
@exported_vars@ Index: openacs-4/packages/forums/www/message-post.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/forums/www/message-post.adp 3 Jun 2002 04:39:05 -0000 1.2 +++ openacs-4/packages/forums/www/message-post.adp 30 Jul 2002 22:04:59 -0000 1.3 @@ -3,7 +3,9 @@ @context_bar@ - + + +

Index: openacs-4/packages/forums/www/message-post.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/forums/www/message-post.tcl 26 Jul 2002 01:04:35 -0000 1.8 +++ openacs-4/packages/forums/www/message-post.tcl 30 Jul 2002 22:04:59 -0000 1.9 @@ -19,6 +19,10 @@ set user_id [ad_verify_and_get_user_id] +# get the colors from the params +set table_border_color [parameter::get -parameter table_border_color] +set table_bgcolor [parameter::get -parameter table_bgcolor] + form create message element create message message_id \ @@ -87,6 +91,7 @@ forum::get -forum_id $forum_id -array forum set confirm_p 1 + set content [string trimright $content] set exported_vars [export_form_vars message_id forum_id parent_id subject content html_p confirm_p] set message(html_p) $html_p Index: openacs-4/packages/forums/www/message-view-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view-oracle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/forums/www/message-view-oracle.xql 2 Jul 2002 19:42:19 -0000 1.3 +++ openacs-4/packages/forums/www/message-view-oracle.xql 30 Jul 2002 22:04:59 -0000 1.4 @@ -8,6 +8,7 @@ 0 as n_attachments, subject, content, + html_p, person.name(user_id) as user_name, to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date, tree.tree_level(tree_sortkey) as tree_level, @@ -26,6 +27,7 @@ (select count(*) from attachments where object_id = message_id) as n_attachments, subject, content, + html_p, person.name(user_id) as user_name, to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date, tree.tree_level(tree_sortkey) as tree_level, Index: openacs-4/packages/forums/www/message-view-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/forums/www/message-view-postgresql.xql 2 Jul 2002 19:42:19 -0000 1.4 +++ openacs-4/packages/forums/www/message-view-postgresql.xql 30 Jul 2002 22:04:59 -0000 1.5 @@ -9,6 +9,7 @@ 0 as n_attachments, subject, content, + html_p, person__name(user_id) as user_name, to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date, tree_level(tree_sortkey) as tree_level, @@ -27,6 +28,7 @@ (select count(*) from attachments where object_id = message_id) as n_attachments, subject, content, + html_p, person__name(user_id) as user_name, to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date, tree_level(tree_sortkey) as tree_level, Index: openacs-4/packages/forums/www/message-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/forums/www/message-view.adp 11 Jul 2002 12:49:26 -0000 1.7 +++ openacs-4/packages/forums/www/message-view.adp 30 Jul 2002 22:04:59 -0000 1.8 @@ -2,57 +2,71 @@ Forum @forum.name@: @message.subject@ @context_bar@ +
+
- - - - + +
- @notification_chunk@ - - [ - Post a New Message - ] - - - + + + + - -
+ @notification_chunk@ +
+ + + [ Post a New Message. ] + + +
+ Search:  - -
+
+
-
+
- - -
+ + +
-
- +
- - -<% set width [expr 100 - $responses(tree_level) * 3] %> - - + + + <% set width [expr 100 - $responses(tree_level) * 3] %> + + - - + +
- - - - - - - +
+ + + + + +
Index: openacs-4/packages/forums/www/message-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/forums/www/message-view.tcl 2 Jul 2002 19:42:19 -0000 1.7 +++ openacs-4/packages/forums/www/message-view.tcl 30 Jul 2002 22:04:59 -0000 1.8 @@ -12,6 +12,11 @@ forum::security::require_read_message -message_id $message_id +# get the colors from the params +set table_border_color [parameter::get -parameter table_border_color] +set table_bgcolor [parameter::get -parameter table_bgcolor] +set table_other_bgcolor [parameter::get -parameter table_other_bgcolor] + # Check if the user has admin on the message set moderate_p [forum::security::can_moderate_message_p -message_id $message_id] if {!${moderate_p}} { @@ -28,8 +33,7 @@ element create search search_text \ -label Search \ -datatype text \ - -widget text \ - -html {size 60} + -widget text element create search forum_id \ -label ForumID \ @@ -94,7 +98,6 @@ -pretty_name $message(subject) \ -url [ad_conn url]?message_id=$message_id \ ] - append notification_chunk "

" } else { set notification_chunk "" }