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.11 -r1.12
--- openacs-4/packages/forums/www/message-email.adp	7 Oct 2007 22:37:01 -0000	1.11
+++ openacs-4/packages/forums/www/message-email.adp	13 Dec 2007 14:22:54 -0000	1.12
@@ -1,16 +1,7 @@
 <master>
   <property name="title">#forums.Email_Message# @message.forum_name;noquote@ - @message.subject;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <property name="header_stuff">
-    <link rel="stylesheet" type="text/css" media="all" href="/resources/forums/forums.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="flat" href="/resources/forums/flat.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="flat-collapse" href="/resources/forums/flat-collapse.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="collapse" href="/resources/forums/collapse.css">
-    <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.14 -r1.15
--- openacs-4/packages/forums/www/message-email.tcl	7 Oct 2007 22:37:01 -0000	1.14
+++ openacs-4/packages/forums/www/message-email.tcl	13 Dec 2007 14:22:54 -0000	1.15
@@ -53,48 +53,11 @@
 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
-}
+set lang [ad_conn language]
+template::head::add_css -href /resources/forums/forums.css -media all -lang $lang
+template::head::add_css -alternate -href /resources/forums/flat.css -media all -lang $lang -title "flat"
+template::head::add_css -alternate -href /resources/forums/flat-collapse.css -media all -lang $lang -title "flat-collapse"
+template::head::add_css -alternate -href /resources/forums/collapse.css -media all -lang $lang -title "collapse"
+template::head::add_css -alternate -href /resources/forums/expand.css -media all -lang $lang -title "expand"
 
-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.16 -r1.17
--- openacs-4/packages/forums/www/message-post-confirm.adp	7 Oct 2007 22:37:01 -0000	1.16
+++ openacs-4/packages/forums/www/message-post-confirm.adp	13 Dec 2007 14:22:54 -0000	1.17
@@ -1,16 +1,7 @@
 <master>
 <property name="title">#forums.Confirm_Post_to_Forum# @forum.name;noquote@</property>
 <property name="context">@context;noquote@</property>
-  <property name="header_stuff">
-    <link rel="stylesheet" type="text/css" media="all" href="/resources/forums/forums.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="flat" href="/resources/forums/flat.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="flat-collapse" href="/resources/forums/flat-collapse.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="collapse" href="/resources/forums/collapse.css">
-    <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.12 -r1.13
--- openacs-4/packages/forums/www/message-post.adp	7 Oct 2007 22:37:01 -0000	1.12
+++ openacs-4/packages/forums/www/message-post.adp	13 Dec 2007 14:22:54 -0000	1.13
@@ -2,16 +2,7 @@
 <property name="title">#forums.Post_to_Forum# @forum.name;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="focus">message.subject</property>
-  <property name="header_stuff">
-    <link rel="stylesheet" type="text/css" media="all" href="/resources/forums/forums.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="flat" href="/resources/forums/flat.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="flat-collapse" href="/resources/forums/flat-collapse.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="collapse" href="/resources/forums/collapse.css">
-    <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.35 -r1.36
--- openacs-4/packages/forums/www/message-post.tcl	7 Oct 2007 22:37:01 -0000	1.35
+++ openacs-4/packages/forums/www/message-post.tcl	13 Dec 2007 14:22:54 -0000	1.36
@@ -66,50 +66,13 @@
 # Template variables
 #
 
-if {![template::multirow exists link]} {
-    template::multirow create link rel type href title lang media
-}
+set lang [ad_conn language]
+template::head::add_css -href /resources/forums/forums.css -media all -lang $lang
+template::head::add_css -alternate -href /resources/forums/flat.css -media all -lang $lang -title "flat"
+template::head::add_css -alternate -href /resources/forums/flat-collapse.css -media all -lang $lang -title "flat-collapse"
+template::head::add_css -alternate -href /resources/forums/collapse.css -media all -lang $lang -title "collapse"
+template::head::add_css -alternate -href /resources/forums/expand.css -media all -lang $lang -title "expand"
 
-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.33 -r1.34
--- openacs-4/packages/forums/www/message-view.adp	7 Oct 2007 22:37:01 -0000	1.33
+++ openacs-4/packages/forums/www/message-view.adp	13 Dec 2007 14:22:54 -0000	1.34
@@ -3,22 +3,6 @@
   <property name="context">@context;noquote@</property>
   <property name="displayed_object_id">@message_id@</property>
 
-  <property name="header_stuff">
-    <link rel="stylesheet" type="text/css" media="all" href="/resources/forums/forums.css">
-    <link rel="stylesheet" type="text/css" media="print" href="/resources/forums/print.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="flat" href="/resources/forums/flat.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="flat-collapse" href="/resources/forums/flat-collapse.css">
-    <link rel="alternate stylesheet" type="text/css" media="all" title="collapse" href="/resources/forums/collapse.css">
-    <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>
-    <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.38 -r1.39
--- openacs-4/packages/forums/www/message-view.tcl	7 Oct 2007 22:37:01 -0000	1.38
+++ openacs-4/packages/forums/www/message-view.tcl	13 Dec 2007 14:22:54 -0000	1.39
@@ -116,76 +116,17 @@
 }
 
 # 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
-
+set lang [ad_conn language]
+template::head::add_css -href /resources/forums/forums.css -media all -lang $lang
+template::head::add_css -alternate -href /resources/forums/flat.css -media all -lang $lang -title "flat"
+template::head::add_css -alternate -href /resources/forums/flat-collapse.css -media all -lang $lang -title "flat-collapse"
+template::head::add_css -alternate -href /resources/forums/collapse.css -media all -lang $lang -title "collapse"
+template::head::add_css -alternate -href /resources/forums/expand.css -media all -lang $lang -title "expand"
+template::head::add_css -alternate -href /resources/forums/print.css -media print -lang $lang
+ 
 # js scripts
-if {![template::multirow exists script]} {
-    template::multirow create script type src charset defer content
-}
+template::head::add_script -type "text/javascript" -src "/resources/forums/forums.js"
+template::head::add_script -type "text/javascript" -src "/resources/forums/dynamic-comments.js"
+template::head::add_script -type "text/javascript" -script $dynamic_script
 
-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.11 -r1.12
--- openacs-4/packages/forums/www/moderate/message-delete.adp	7 Oct 2007 22:37:01 -0000	1.11
+++ openacs-4/packages/forums/www/moderate/message-delete.adp	13 Dec 2007 14:22:55 -0000	1.12
@@ -1,13 +1,5 @@
 <master>
   <property name="title">#forums.Confirm_Delete# @message.subject;noquote@</property>
   <property name="context">#forums.delete#</property>
-  <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">@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.11 -r1.12
--- openacs-4/packages/forums/www/moderate/message-delete.tcl	7 Oct 2007 22:37:01 -0000	1.11
+++ openacs-4/packages/forums/www/moderate/message-delete.tcl	13 Dec 2007 14:22:55 -0000	1.12
@@ -29,32 +29,11 @@
   //-->
 "
 # stylesheets
-if {![template::multirow exists link]} {
-    template::multirow create link rel type href title lang media
-}
+set lang [ad_conn language]
+template::head::add_css -href /resources/forums/forums.css -media all -lang $lang
 
-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::head::add_script -type "text/javascript" -src "/resources/forums/forums.js"
+template::head::add_script -type "text/javascript" -script $dynamic_script
 
-template::multirow append script \
-    "text/javascript" \
-    "/resources/forums/forums.js"
-
-template::multirow append script \
-    "text/javascript" \
-    "" \
-    "" \
-    "" \
-    $dynamic_script
-
 ad_return_template