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.10 -r1.10.2.1
--- openacs-4/packages/forums/www/message-email.adp 8 Aug 2006 21:26:53 -0000 1.10
+++ openacs-4/packages/forums/www/message-email.adp 23 May 2007 19:13:33 -0000 1.10.2.1
@@ -9,6 +9,8 @@
<link rel="alternate stylesheet" type="text/css" media="all" title="expand" href="/resources/forums/expand.css" />
</property>
+ <if @link:rowcount@ not nil><property name="&link">link</property></if>
+
<p>#forums.lt_Email_a_copy_of_the_f#</p>
<div id="forum-thread">
Index: openacs-4/packages/forums/www/message-email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.tcl,v
diff -u -r1.13 -r1.13.6.1
--- openacs-4/packages/forums/www/message-email.tcl 15 Mar 2005 20:06:45 -0000 1.13
+++ openacs-4/packages/forums/www/message-email.tcl 23 May 2007 19:13:33 -0000 1.13.6.1
@@ -53,4 +53,48 @@
lappend context [list "./message-view?message_id=$message(message_id)" "$message(subject)"]
lappend context [_ forums.Email_to_a_friend]
+if {![template::multirow exists link]} {
+ template::multirow create link rel type href title lang media
+}
+
+template::multirow append link \
+ stylesheet \
+ text/css \
+ /resources/forums/forums.css \
+ "" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/flat.css \
+ "flat" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/flat-collapse.css \
+ "flat-collapse" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/collapse.css \
+ "collapse" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/expand.css \
+ "expand" \
+ [ad_conn language] \
+ all
+
ad_return_template
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.15 -r1.15.2.1
--- openacs-4/packages/forums/www/message-post-confirm.adp 8 Aug 2006 21:26:53 -0000 1.15
+++ openacs-4/packages/forums/www/message-post-confirm.adp 23 May 2007 19:13:33 -0000 1.15.2.1
@@ -9,6 +9,8 @@
<link rel="alternate stylesheet" type="text/css" media="all" title="expand" href="/resources/forums/expand.css" />
</property>
+ <if @link:rowcount@ not nil><property name="&link">link</property></if>
+
<include src="/packages/forums/lib/message/post" forum_id="@forum_id@"
&parent_message="parent_message"
anonymous_allowed_p="@anonymous_allowed_p@"
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.11 -r1.11.2.1
--- openacs-4/packages/forums/www/message-post.adp 8 Aug 2006 21:26:53 -0000 1.11
+++ openacs-4/packages/forums/www/message-post.adp 23 May 2007 19:13:33 -0000 1.11.2.1
@@ -10,6 +10,8 @@
<link rel="alternate stylesheet" type="text/css" media="all" title="expand" href="/resources/forums/expand.css" />
</property>
+ <if @link:rowcount@ not nil><property name="&link">link</property></if>
+
<include src="/packages/forums/lib/message/post" forum_id="@forum_id@"
&parent_message="parent_message"
anonymous_allowed_p="@anonymous_allowed_p@"
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.34 -r1.34.6.1
--- openacs-4/packages/forums/www/message-post.tcl 15 Mar 2005 20:06:45 -0000 1.34
+++ openacs-4/packages/forums/www/message-post.tcl 23 May 2007 19:13:33 -0000 1.34.6.1
@@ -66,6 +66,50 @@
# Template variables
#
+if {![template::multirow exists link]} {
+ template::multirow create link rel type href title lang media
+}
+
+template::multirow append link \
+ stylesheet \
+ text/css \
+ /resources/forums/forums.css \
+ "" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/flat.css \
+ "flat" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/flat-collapse.css \
+ "flat-collapse" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/collapse.css \
+ "collapse" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/expand.css \
+ "expand" \
+ [ad_conn language] \
+ all
+
if {![string equal [template::form::get_button message] "preview"]} {
set context [list [list "./forum-view?forum_id=$forum_id" [ad_quotehtml $forum(name)]]]
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.30.2.2 -r1.30.2.3
--- openacs-4/packages/forums/www/message-view.adp 10 Apr 2007 06:12:58 -0000 1.30.2.2
+++ openacs-4/packages/forums/www/message-view.adp 23 May 2007 19:13:33 -0000 1.30.2.3
@@ -12,8 +12,13 @@
<link rel="alternate stylesheet" type="text/css" media="all" title="expand" href="/resources/forums/expand.css" />
<link rel="alternate stylesheet" type="text/css" media="all" title="print" href="/resources/forums/print.css" />
<script type="text/javascript" src="/resources/forums/forums.js"></script>
- @dynamic_script;noquote@
+ <script type="text/javascript" src="/resources/forums/dynamic-comments.js"></script>
+ <script type="text/javascript">@dynamic_script;noquote@</script>
</property>
+
+<if @link:rowcount@ not nil><property name="&link">link</property></if>
+<if @script:rowcount@ not nil><property name="&script">script</property></if>
+
<h1>@page_title;noquote@</h1>
<iframe width="0" height="0" border="0" style="width:0; height:0; border:0;" id="dynamic" name="dynamic" src="about:blank" title=""></iframe>
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.34.2.1 -r1.34.2.2
--- openacs-4/packages/forums/www/message-view.tcl 10 Apr 2007 06:12:58 -0000 1.34.2.1
+++ openacs-4/packages/forums/www/message-view.tcl 23 May 2007 19:13:33 -0000 1.34.2.2
@@ -95,8 +95,6 @@
set thread_url [export_vars -base forum-view { { forum_id $message(forum_id) } }]
set dynamic_script "
- <script type=\"text/javascript\" src=\"/resources/forums/dynamic-comments.js\"></script>
- <script type=\"text/javascript\">
<!--
collapse_symbol = '<img src=\"/resources/forums/Collapse16.gif\" width=\"16\" height=\"16\" ALT=\"collapse message\" border=\"0\" title=\"collapse message\">';
expand_symbol = '<img src=\"/resources/forums/Expand16.gif\" width=\"16\" height=\"16\" ALT=\"expand message\" border=\"0\" title=\"expand message\">';
@@ -105,11 +103,83 @@
rootdir = 'messages-get';
sid = '$message(root_message_id)';
//-->
- </script>
"
if {$forum(presentation_type) eq "flat"} {
set display_mode flat
}
-set page_title "#forums.Thread_title#"
\ No newline at end of file
+# stylesheets
+if {![template::multirow exists link]} {
+ template::multirow create link rel type href title lang media
+}
+
+template::multirow append link \
+ stylesheet \
+ text/css \
+ /resources/forums/forums.css \
+ "" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ stylesheet \
+ text/css \
+ /resources/forums/print.css \
+ "" \
+ [ad_conn language] \
+ print
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/flat.css \
+ "flat" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/flat-collapse.css \
+ "flat-collapse" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/collapse.css \
+ "collapse" \
+ [ad_conn language] \
+ all
+
+template::multirow append link \
+ "alternate stylesheet" \
+ text/css \
+ /resources/forums/expand.css \
+ "expand" \
+ [ad_conn language] \
+ all
+
+# js scripts
+if {![template::multirow exists script]} {
+ template::multirow create script type src charset defer content
+}
+
+template::multirow append script \
+ "text/javascript" \
+ "/resources/forums/forums.js"
+
+template::multirow append script \
+ "text/javascript" \
+ "/resources/forums/dynamic-comments.js"
+
+template::multirow append script \
+ "text/javascript" \
+ "" \
+ "" \
+ "" \
+ $dynamic_script
+
+set page_title "#forums.Thread_title#"
Index: openacs-4/packages/forums/www/moderate/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.adp,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/forums/www/moderate/message-delete.adp 8 Aug 2006 21:26:53 -0000 1.10
+++ openacs-4/packages/forums/www/moderate/message-delete.adp 23 May 2007 19:13:33 -0000 1.10.2.1
@@ -4,14 +4,10 @@
<property name="header_stuff">
<link rel="stylesheet" type="text/css" media="all" href="/resources/forums/forums.css" />
<script language="JavaScript" type="text/javascript" src="/resources/forums/forums.js"></script>
- <script type="text/javascript"><!--
- collapse_symbol = '<img src="/resources/forums/Collapse16.gif" width="16" height="16" ALT="-" border="0" title="collapse message">';
- expand_symbol = '<img src="/resources/forums/Expand16.gif" width="16" height="16" ALT="+" border="0" title="expand message">';
- loading_symbol = '<img src="/resources/forums/dyn_wait.gif" width="12" height="16" ALT="x" border="0">';
- loading_message = '<i>Loading...</i>';
- rootdir = 'messages-get';
- sid = '5999';
- //-->
- </script></property>
+ <script type="text/javascript">@dynamic_script;noquote@</script>
+ </property>
+<if @link:rowcount@ not nil><property name="&link">link</property></if>
+<if @script:rowcount@ not nil><property name="&script">script</property></if>
+
<include src="/packages/forums/lib/message/delete" &message="message" confirm_p="@confirm_p@" return_url="@return_url@" />
Index: openacs-4/packages/forums/www/moderate/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.tcl,v
diff -u -r1.10 -r1.10.10.1
--- openacs-4/packages/forums/www/moderate/message-delete.tcl 17 Dec 2003 15:45:31 -0000 1.10
+++ openacs-4/packages/forums/www/moderate/message-delete.tcl 23 May 2007 19:13:33 -0000 1.10.10.1
@@ -18,4 +18,43 @@
# Select the stuff
forum::message::get -message_id $message_id -array message
+set dynamic_script "
+ <!--
+ collapse_symbol = '<img src=\"/resources/forums/Collapse16.gif\" width=\"16\" height=\"16\" ALT=\"collapse message\" border=\"0\" title=\"collapse message\">';
+ expand_symbol = '<img src=\"/resources/forums/Expand16.gif\" width=\"16\" height=\"16\" ALT=\"expand message\" border=\"0\" title=\"expand message\">';
+ loading_symbol = '<img src=\"/resources/forums/dyn_wait.gif\" width=\"12\" height=\"16\" ALT=\"x\" border=\"0\">';
+ loading_message = '<i>Loading...</i>';
+ rootdir = 'messages-get';
+ sid = '$message(root_message_id)';
+ //-->
+"
+# stylesheets
+if {![template::multirow exists link]} {
+ template::multirow create link rel type href title lang media
+}
+
+template::multirow append link \
+ stylesheet \
+ text/css \
+ /resources/forums/forums.css \
+ "" \
+ [ad_conn language] \
+ all
+
+# js scripts
+if {![template::multirow exists script]} {
+ template::multirow create script type src charset defer content
+}
+
+template::multirow append script \
+ "text/javascript" \
+ "/resources/forums/forums.js"
+
+template::multirow append script \
+ "text/javascript" \
+ "" \
+ "" \
+ "" \
+ $dynamic_script
+
ad_return_template