Index: openacs-4/packages/sloan-bboard/tcl/bboard-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/tcl/bboard-procs.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/tcl/bboard-procs.tcl 23 Feb 2002 16:23:51 -0000 1.2 +++ openacs-4/packages/sloan-bboard/tcl/bboard-procs.tcl 24 Feb 2002 22:19:39 -0000 1.3 @@ -901,7 +901,7 @@ } # FIXME: fix this when we have real user preference tracking - return "summary" + return "full" } ad_proc -public bboard_alert_from_address { Index: openacs-4/packages/sloan-bboard/www/message-entry.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-entry.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/sloan-bboard/www/message-entry.adp 15 Feb 2002 21:27:07 -0000 1.1 +++ openacs-4/packages/sloan-bboard/www/message-entry.adp 24 Feb 2002 22:19:40 -0000 1.2 @@ -14,7 +14,7 @@ In Reply To: -
Index: openacs-4/packages/sloan-bboard/www/message-preview.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-preview.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/sloan-bboard/www/message-preview.adp 15 Feb 2002 21:27:07 -0000 1.1 +++ openacs-4/packages/sloan-bboard/www/message-preview.adp 24 Feb 2002 22:19:40 -0000 1.2 @@ -4,7 +4,7 @@
@form_vars@ -
Index: openacs-4/packages/sloan-bboard/www/message.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message.adp 23 Feb 2002 16:23:52 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message.adp 24 Feb 2002 22:19:40 -0000 1.3 @@ -18,51 +18,37 @@ - + +

+Response to @reply_to_message.title@ +

Message:

+ forum_id="@forum_id@" user_id="@message.user_id@" reply_p="f">

Replies:

-<% set prev_depth 0 %> -<% -if {$replies(thread_depth) > $prev_depth} { - template::adp_puts "
" -} -if {$replies(thread_depth) < $prev_depth} { - for {set i $prev_depth} {$i > $replies(thread_depth)} {incr i -1} { - template::adp_puts "
" - } -} -set prev_depth $replies(thread_depth) -%> + forum_id="@forum_id@" user_id=@replies.user_id@ reply_p=@replies_p@ + thread_depth=@replies.thread_depth@> -<% -# We have to close the blockquotes (ben) -for {set i $prev_depth} {$i > 0} {incr i -1} { - template::adp_puts "
" -} -%>
- +
Index: openacs-4/packages/sloan-bboard/www/message.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message.tcl 23 Feb 2002 16:23:52 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message.tcl 24 Feb 2002 22:19:40 -0000 1.3 @@ -50,6 +50,21 @@ and person_id = sender } -column_array message +if {![empty_string_p $message(reply_to)]} { + set reply_to $message(reply_to) + + db_1row reply_message_info { + select message_id, reply_to, title, + to_char(sent_date, 'Month DD, YYYY HH:Mi am') as pretty_date, sender as user_id, + mime_type, content, first_names||' '||last_name as full_name, + acs_permission.permission_p(message_id, :user_id, + 'bboard_write_message') as write_p + from acs_messages_all m, persons p + where message_id = :reply_to + and person_id = sender + } -column_array reply_to_message +} + set context_bar [list [list "forum?[export_url_vars forum_id]" $forum_name] \ "One Message"] @@ -79,9 +94,15 @@ # Should we allow replies to replies? if {$forum_type == "thread"} { - set replies_p 1 + set replies_p t + set reply_to_message_id $message(message_id) } else { - set replies_p 0 + set replies_p f + if {[empty_string_p $message(reply_to)]} { + set reply_to_message_id $message(message_id) + } else { + set reply_to_message_id $message(reply_to) + } } ad_return_template Index: openacs-4/packages/sloan-bboard/www/simple-message-full.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/simple-message-full.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/sloan-bboard/www/simple-message-full.adp 23 Feb 2002 16:23:52 -0000 1.1 +++ openacs-4/packages/sloan-bboard/www/simple-message-full.adp 24 Feb 2002 22:19:40 -0000 1.2 @@ -2,6 +2,24 @@ # This should, in the future, use a row variable rather than many # single values, but row variables are not yet supported. %> +<% + # The first table is just for thread spacing purposes + # (ben) +%> + + + + + + +
+<% +if {[info exists thread_depth]} { + for {set i 0} {$i < $thread_depth} {incr i} { + template::adp_puts "          " + } +} +%> + + @@ -73,3 +91,7 @@
+ +
Index: openacs-4/packages/sloan-bboard/www/simple-message-summary.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/simple-message-summary.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/simple-message-summary.adp 23 Feb 2002 16:23:52 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/simple-message-summary.adp 24 Feb 2002 22:19:40 -0000 1.3 @@ -2,4 +2,9 @@ # This should, in the future, use a row variable rather than many # single values, but row variables are not yet supported. %> +<% +for {set i 0} {$i < $thread_depth} {incr i} { + template::adp_puts "          " +} +%> @title@ by @author@ on @date@