Index: openacs-4/packages/acs-admin/www/users/merge.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/merge.adp	4 Jun 2006 00:45:20 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/merge.adp	30 Nov 2007 18:16:42 -0000	1.3
@@ -1,9 +1,7 @@
   <master>
     <property name="title">Merge account system</property>
     <property name="context">@context;noquote@</property>
-    <property name="header_stuff">
-      <link rel="stylesheet" type="text/css" href="/resources/acs-admin/um-more-info.css" media="all">
-    </property>
+
     <h2>User Account Merge</h2>
     
     This is the user acccount merge wizard. You selected these accounts to merge:
Index: openacs-4/packages/acs-admin/www/users/merge.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/users/merge.tcl	10 Jan 2007 21:22:00 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/merge.tcl	30 Nov 2007 18:16:42 -0000	1.5
@@ -85,3 +85,6 @@
     set user_id_two_items_html ""
 }
 
+template::head::add_css \
+    -href "/resources/acs-admin/um-more-info.css" \
+    -media all
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.adp	24 Feb 2005 22:10:51 -0000	1.12
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.adp	30 Nov 2007 18:16:42 -0000	1.13
@@ -1,25 +1,6 @@
 <master>
   <property name="title">@title;noquote@ (@package_key@)</property>
   <property name="context">@context;noquote@</property>
-  <property name="header_stuff">
-    <style type="text/css">
-.description h2 { 1.5em; }
-.fail {
-      font-weight: bold;
-      color: red;
-}
-.ok {
-      font-weight: bold;
-      color: green;
-}
-dt {
-      font-weight: bold
-}
-th {
-      background: #c0c0c0;
-}
-</style>
-</property>
 
   <div class="description">
     <dl>
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	24 Feb 2005 22:10:51 -0000	1.8
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	30 Nov 2007 18:16:42 -0000	1.9
@@ -107,5 +107,23 @@
 
 set quiet_url "[export_vars -base testcase -entire_form -exclude {quiet}]&quiet=1"
 set verbose_url "[export_vars -base testcase -entire_form -exclude {quiet}]&quiet=0"
+template::head::add_style \
+    -style "
+.description h2 { 1.5em; }
+.fail {
+      font-weight: bold;
+      color: red;
+}
+.ok {
+      font-weight: bold;
+      color: green;
+}
+dt {
+      font-weight: bold
+}
+th {
+      background: #c0c0c0;
+}
+"
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-subsite/www/register/index.adp	6 May 2007 06:58:40 -0000	1.19
+++ openacs-4/packages/acs-subsite/www/register/index.adp	30 Nov 2007 18:16:43 -0000	1.20
@@ -1,7 +1,6 @@
 <master>
   <property name="title">#acs-subsite.Log_In#</property>
   <property name="context">{#acs-subsite.Log_In#}</property>
-  <if @header_stuff@ not nil><property name="header_stuff">@header_stuff;noquote@</property></if>
 
 <include src="@login_template@" return_url="@return_url;noquote@" no_frame_p="1" authority_id="@authority_id@" username="@username;noquote@" email="@email;noquote@" &="__adp_properties">
 
Index: openacs-4/packages/acs-subsite/www/register/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/www/register/index.tcl	6 May 2007 06:58:40 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/register/index.tcl	30 Nov 2007 18:16:43 -0000	1.13
@@ -14,3 +14,4 @@
 if {$login_template eq ""} {
     set login_template "/packages/acs-subsite/lib/login"
 }
+
Index: openacs-4/packages/acs-templating/tcl/head-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/head-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/tcl/head-procs.tcl	6 Oct 2007 13:22:55 -0000	1.2
+++ openacs-4/packages/acs-templating/tcl/head-procs.tcl	30 Nov 2007 18:16:43 -0000	1.3
@@ -160,6 +160,35 @@
     ]
 }
 
+ad_proc -public template::head::add_style {
+    {-style:required}
+    {-title ""}
+    {-lang ""}
+    {-media ""}
+    {-type "text/css"}
+} {
+
+    Add an embedded css style declaration
+    
+    @author Dave Bauer (dave@thedesignexperience.org)
+    @creation-date 2007-11-30
+    
+    @param style CSS content to be included in the style tag
+    @param type    the type attribute of the link tag, eg. 'text/css'
+    @param media   the media attribute of the link tag describing which display
+                   media this link is relevant to.  This may be a comma 
+                   separated list of values, eg. 'screen,print,braille'
+    @param title   the title attribute of the link tag describing the target of
+                   this link 
+    @param lang    the lang attribute of the link tag specifying the language 
+                   of its attributes if they differ from the document language
+} {
+    variable ::template::head::styles
+
+    lappend styles(anonymous) $type $media $title $lang $style
+ 
+}
+
 ad_proc -public template::head::add_javascript {
     {-defer:boolean}
     {-src ""}