Index: openacs-4/packages/forums/lib/forums/forums-history-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-history-chunk.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/forums/lib/forums/forums-history-chunk.adp 4 Mar 2007 23:15:34 -0000 1.2 +++ openacs-4/packages/forums/lib/forums/forums-history-chunk.adp 23 Dec 2007 14:50:14 -0000 1.3 @@ -3,11 +3,9 @@

-
- + - #forums.No_Postings# +

#forums.No_Postings#

 -
Index: openacs-4/packages/forums/lib/message/messages-table.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/messages-table.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/forums/lib/message/messages-table.adp 15 May 2007 20:14:39 -0000 1.3 +++ openacs-4/packages/forums/lib/message/messages-table.adp 23 Dec 2007 14:50:15 -0000 1.4 @@ -1,36 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#forums.Subject##forums.Author##forums.Posting_Date#
- @messages.subject@ - @messages.screen_name@@messages.user_name@@messages.posting_date@
- #forums.No_Messages# -
+ \ No newline at end of file Index: openacs-4/packages/forums/lib/message/messages-table.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/messages-table.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/forums/lib/message/messages-table.tcl 15 May 2007 20:14:39 -0000 1.2 +++ openacs-4/packages/forums/lib/message/messages-table.tcl 23 Dec 2007 14:50:15 -0000 1.3 @@ -8,12 +8,26 @@ } -# 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 useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] +template::list::create -name results -multirow messages -no_data "#forums.No_Messages#" -elements { + subject { + label "#forums.Subject#" + display_template { + @messages.subject@ + } + } + author { + label "#forums.Author#" + display_template { + @messages.author@ + } + } + posting_date_pretty { + label "#forums.Posting_Date#" + } +} + if {[exists_and_not_null alt_template]} { ad_return_template $alt_template } Index: openacs-4/packages/forums/lib/message/row.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.adp,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/forums/lib/message/row.adp 20 Dec 2007 17:29:30 -0000 1.14 +++ openacs-4/packages/forums/lib/message/row.adp 23 Dec 2007 14:50:15 -0000 1.15 @@ -1,5 +1,5 @@ -
-
+
+
    Index: openacs-4/packages/forums/lib/message/thread-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/forums/lib/message/thread-chunk.tcl 21 Dec 2007 11:57:31 -0000 1.8 +++ openacs-4/packages/forums/lib/message/thread-chunk.tcl 23 Dec 2007 14:50:15 -0000 1.9 @@ -54,14 +54,14 @@ set message_id_list [db_list select_message_ordering {}] set direct_url_base [export_vars -base [ad_conn url] { { message_id $message(root_message_id) } }] -set message(direct_url) "$direct_url_base\#$message(message_id)" +set message(direct_url) "$direct_url_base\#msg_$message(message_id)" set message(number) [expr [lsearch $message_id_list $message(message_id)] + 1] set message(parent_number) {} set message(parent_direct_url) "" if { [exists_and_not_null message(parent_id)] } { set message(parent_number) [expr [lsearch $message_id_list $message(parent_id)] + 1] - set message(parent_direct_url) "$direct_url_base\#$message(parent_id)" + set message(parent_direct_url) "$direct_url_base\#msg_$message(parent_id)" set message(parent_root_url) [export_vars -base [ad_conn url] { { message_id $message(parent_id) } }] } @@ -92,10 +92,10 @@ set tree_level [min [expr {$tree_level - $message(tree_level)}] 10] set posting_date_ansi [lc_time_system_to_conn $posting_date_ansi] set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] - set direct_url "$direct_url_base\#$message_id" + set direct_url "$direct_url_base\#msg_$message_id" set number [expr [lsearch $message_id_list $message_id] + 1] set parent_number [expr [lsearch $message_id_list $parent_id] + 1] - set parent_direct_url "$direct_url_base\#$parent_id" + set parent_direct_url "$direct_url_base\#msg_$parent_id" set parent_root_url [export_vars -base [ad_conn url] {{message_id $parent_id}}] set reply_p [expr [string equal $open_p "t"] || [string equal $user_id [ad_conn user_id]]] Index: openacs-4/packages/forums/lib/search/search-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-chunk.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/forums/lib/search/search-chunk.adp 15 Dec 2006 22:45:33 -0000 1.3 +++ openacs-4/packages/forums/lib/search/search-chunk.adp 23 Dec 2007 14:50:15 -0000 1.4 @@ -1,15 +1,16 @@ - - - - -
    - - - -
    +
    + +
    +
    + +
    +     +
    -
    - - +
    + +
    Index: openacs-4/packages/forums/lib/search/search-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-chunk.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/forums/lib/search/search-chunk.tcl 15 May 2007 20:14:40 -0000 1.4 +++ openacs-4/packages/forums/lib/search/search-chunk.tcl 23 Dec 2007 14:50:15 -0000 1.5 @@ -28,18 +28,15 @@ if { [parameter::get -parameter UseIntermediaForSearchP -default 0] } { append query "_intermedia" } - - if { $useScreenNameP == 1 } { - db_multirow -extend { screen_name } messages $query {} { - set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] - set screen_name [db_string select_screen_name {select screen_name from users where user_id = :user_id}] - } - } else { - db_multirow messages $query {} { - set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] - } - } - + + db_multirow -extend { author posting_date_pretty} messages $query {} { + set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] + if { $useScreenNameP } { + set author [db_string select_screen_name {select screen_name from users where user_id = :user_id}] + } else { + set author $user_name + } + } } else { set messages:rowcount 0 } Index: openacs-4/packages/forums/lib/search/search-form.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-form.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/forums/lib/search/search-form.adp 23 Dec 2007 14:50:15 -0000 1.1 @@ -0,0 +1,10 @@ +
    + +
    +
    + +
    +     +
    Index: openacs-4/packages/forums/lib/search/search-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-form.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/forums/lib/search/search-form.tcl 23 Dec 2007 14:50:15 -0000 1.1 @@ -0,0 +1,14 @@ +# packages/forums/lib/search/search-form.tcl +# +# Form for search box +# +# @author Emmanuelle Raffenne (eraffenne@gmail.com) +# @creation-date 2007-12-23 +# @cvs-id $Id: search-form.tcl,v 1.1 2007/12/23 14:50:15 emmar Exp $ + +form create search -action search +forums::form::search search + +if { [form is_request search] && [info exists forum_id] } { + element set_properties search forum_id -value $forum_id +} Index: openacs-4/packages/forums/lib/user/post-history-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/user/post-history-chunk.adp,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/forums/lib/user/post-history-chunk.adp 15 May 2007 20:14:40 -0000 1.4 +++ openacs-4/packages/forums/lib/user/post-history-chunk.adp 23 Dec 2007 14:50:15 -0000 1.5 @@ -1,52 +1,17 @@ +
    +

    #forums.Posting_history_for# @screen_name@ - - <% - if {![permission::permission_p -object_id [acs_magic_object security_context_root] -privilege admin]} { - adp_puts [acs_community_member_link -user_id $user_id] - } else { - adp_puts [acs_community_member_admin_link -user_id $user_id] - } - %> - + @user_link;noquote@

    -

    -

    -@dimensional_chunk;noquote@ -
    -

    - -
    - - +
    @dimensional_chunk;noquote@
    -     - - - - #forums.No_Postings# - - - -
    -

    #forums.Summary_Posting_history_for#

    +

    #forums.Summary_Posting_history_for#

    + -

    - - - - - - - #forums.No_Postings# - - - - - -
    +
    Index: openacs-4/packages/forums/lib/user/post-history-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/user/post-history-chunk.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/forums/lib/user/post-history-chunk.tcl 15 May 2007 20:14:40 -0000 1.4 +++ openacs-4/packages/forums/lib/user/post-history-chunk.tcl 23 Dec 2007 14:50:15 -0000 1.5 @@ -12,14 +12,10 @@ set package_id [ad_conn package_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] - # provide screen_name functionality -set screen_name [db_string select_screen_name { select screen_name from users where user_id = :user_id}] set useScreenNameP [parameter::get -parameter "UseScreenNameP" -default 0] +set screen_name [db_string select_screen_name { select screen_name from users where user_id = :user_id}] +set user_link [acs_community_member_link -user_id $user_id] # choosing the view set dimensional_list " @@ -35,52 +31,54 @@ if {[string equal $view forum]} { set query select_messages_by_forum template::list::create \ - -html {width 50%} \ - -name messages \ - -multirow messages \ - -key message_id \ - -elements { - forum_name { - label "\#forums.Forum\#" - hide_p t - html {align left} - display_template {@messages.forum_name@} - } - subject { - label "\#forums.Subject\#" - html {align left} - display_template {@messages.subject@} - } - posting_date_pretty { - label "\#forums.Posted\#" - html {align right} - } - } -groupby { - label "\#forums.Forum\#" - values { "\#forums.Forum\#" {{groupby forum_name} {orderby forum_name,desc}}} - } + -html {style "width: 50%; text-align: center; margin: auto"} \ + -name messages \ + -multirow messages \ + -no_data "#forums.No_Postings#" \ + -key message_id \ + -elements { + forum_name { + label "\#forums.Forum\#" + hide_p t + html {align left} + display_template {@messages.forum_name@} + } + subject { + label "\#forums.Subject\#" + html {align left} + display_template {@messages.subject@} + } + posting_date_pretty { + label "\#forums.Posted\#" + html {align right} + } + } -groupby { + label "\#forums.Forum\#" + values { "\#forums.Forum\#" {{groupby forum_name} {orderby forum_name,desc}}} + } } else { template::list::create \ - -html {width 50%} \ - -name messages \ - -multirow messages \ - -key message_id \ - -elements { - forum_name { - label "\#forums.Forum\#" - html {align left} - display_template {@messages.forum_name@} - } - subject { - label "\#forums.Subject\#" - html {align left} - display_template {@messages.subject@} - } - posting_date_pretty { - label "\#forums.Posted\#" - html {align right} - } - } + -html {style "width: 50%; text-align: center; margin: auto"} \ + -name messages \ + -multirow messages \ + -no_data "#forums.No_Postings#" \ + -key message_id \ + -elements { + forum_name { + label "\#forums.Forum\#" + html {align left} + display_template {@messages.forum_name@} + } + subject { + label "\#forums.Subject\#" + html {align left} + display_template {@messages.subject@} + } + posting_date_pretty { + label "\#forums.Posted\#" + html {align right} + } + } } @@ -91,22 +89,24 @@ template::list::create \ -name posts \ + -html {style "width: 50%; text-align: center; margin: auto"} \ -multirow posts \ + -no_data "#forums.No_Postings#" \ -key message_id \ -elements { - name { - label "\#forums.Forum\#" - html {align left} - display_template {@posts.name@} - } - num_msg { - label "\#forums.Number_of_Posts\#" - html {align left} - } - posting_date_pretty { - label "\#forums.Posted\#" - html {align right} - } + name { + label "\#forums.Forum\#" + html {align left} + display_template {@posts.name@} + } + num_msg { + label "\#forums.Number_of_Posts\#" + html {align left} + } + posting_date_pretty { + label "\#forums.Posted\#" + html {align right} + } } # select number of post from this user @@ -117,5 +117,5 @@ set dimensional_chunk [ad_dimensional $dimensional_list] if {[exists_and_not_null alt_template]} { - ad_return_template $alt_template + ad_return_template $alt_template } Index: openacs-4/packages/forums/www/forum-view-statistic.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view-statistic.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/forums/www/forum-view-statistic.adp 8 Apr 2005 08:28:08 -0000 1.1 +++ openacs-4/packages/forums/www/forum-view-statistic.adp 23 Dec 2007 14:50:15 -0000 1.2 @@ -2,8 +2,5 @@ #forums.Forums_hist_lt# @name;noquote@ @context;noquote@ -
    - -
    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 -N -r1.36 -r1.37 --- openacs-4/packages/forums/www/forum-view.adp 21 Dec 2007 11:57:32 -0000 1.36 +++ openacs-4/packages/forums/www/forum-view.adp 23 Dec 2007 14:50:15 -0000 1.37 @@ -5,17 +5,7 @@

    @page_title;noquote@

    -
    - -
    -
    - -
    -     -
    +

    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 -N -r1.28 -r1.29 --- openacs-4/packages/forums/www/forum-view.tcl 22 May 2007 09:42:09 -0000 1.28 +++ openacs-4/packages/forums/www/forum-view.tcl 23 Dec 2007 14:50:15 -0000 1.29 @@ -46,16 +46,9 @@ set moderate_url [export_vars -base "moderate/forum" { forum_id }] set post_url [export_vars -base "message-post" { forum_id }] -# Create a search form and action when used +# Show search box? set searchbox_p [parameter::get -parameter ForumsSearchBoxP -default 1] -if {$searchbox_p} { - form create search -action search - forums::form::search search - if {[form is_request search]} { - element set_properties search forum_id -value $forum_id - } -} # Need to quote forum(name) since it is noquoted on display as part of an # HTML fragment. set notification_chunk [notification::display::request_widget \ Index: openacs-4/packages/forums/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.adp,v diff -u -N -r1.24 -r1.25 --- openacs-4/packages/forums/www/index.adp 15 Dec 2006 22:45:34 -0000 1.24 +++ openacs-4/packages/forums/www/index.adp 23 Dec 2007 14:50:15 -0000 1.25 @@ -3,14 +3,7 @@ @context;noquote@ -

    - - - - -
    + Index: openacs-4/packages/forums/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/forums/www/index.tcl 1 Mar 2005 00:01:37 -0000 1.12 +++ openacs-4/packages/forums/www/index.tcl 23 Dec 2007 14:50:15 -0000 1.13 @@ -13,10 +13,4 @@ set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] set searchbox_p [parameter::get -parameter ForumsSearchBoxP -package_id $package_id -default 1] -# Create a search form and action when used -if {$searchbox_p} { - form create search -action search - forums::form::search search -} - set context {} 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 -N -r1.35 -r1.36 --- openacs-4/packages/forums/www/message-view.adp 21 Dec 2007 11:57:32 -0000 1.35 +++ openacs-4/packages/forums/www/message-view.adp 23 Dec 2007 14:50:15 -0000 1.36 @@ -6,17 +6,9 @@

    @page_title;noquote@

    -
    - -
    -
    - -
    -     -
    +     +
    #forums.display_as# #forums.collapse# #forums.expand# 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 -N -r1.40 -r1.41 --- openacs-4/packages/forums/www/message-view.tcl 21 Dec 2007 11:57:32 -0000 1.40 +++ openacs-4/packages/forums/www/message-view.tcl 23 Dec 2007 14:50:15 -0000 1.41 @@ -56,18 +56,9 @@ # ############################################ -# Create a search form and action when used +# Show search box? set searchbox_p [parameter::get -parameter ForumsSearchBoxP -default 1] -if {$searchbox_p} { - form create search -action search - forums::form::search search - if {[form is_request search]} { - element set_properties search forum_id -value $message(forum_id) - } -} - - # If this is a top-level thread, we allow subscriptions here if { [empty_string_p $message(parent_id)] } { set notification_chunk [notification::display::request_widget \ Index: openacs-4/packages/forums/www/search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.adp,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/forums/www/search.adp 17 Dec 2003 15:45:30 -0000 1.7 +++ openacs-4/packages/forums/www/search.adp 23 Dec 2007 14:50:15 -0000 1.8 @@ -2,8 +2,5 @@ @page_title;noquote@ @context;noquote@ -
    - -
    Index: openacs-4/packages/forums/www/user-history.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/user-history.adp,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/forums/www/user-history.adp 4 Mar 2007 23:06:09 -0000 1.12 +++ openacs-4/packages/forums/www/user-history.adp 23 Dec 2007 14:50:15 -0000 1.13 @@ -2,8 +2,4 @@ #forums.Forums_Posting_hist_lt# @user.full_name;noquote@ @context;noquote@ -
    - - -