Index: openacs.org-dev/www/templates/general-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/general-master.tcl,v
diff -u -r1.5 -r1.6
--- openacs.org-dev/www/templates/general-master.tcl	28 Sep 2002 21:17:48 -0000	1.5
+++ openacs.org-dev/www/templates/general-master.tcl	28 Sep 2002 21:22:19 -0000	1.6
@@ -37,6 +37,41 @@
 set etp_link [etp::get_etp_link]
 regsub "^<a" $etp_link "<a class=\"top\"" etp_link
 
+# stuff that is in the stock default-master
 
+template::multirow create attribute key value
 
+# Pull out the package_id of the subsite closest to our current node
+set pkg_id [site_node_closest_ancestor_package "acs-subsite"]
 
+template::multirow append \
+    attribute bgcolor [ad_parameter -package_id $pkg_id bgcolor   dummy "white"]
+template::multirow append \
+    attribute text    [ad_parameter -package_id $pkg_id textcolor dummy "black"]
+
+if { [info exists prefer_text_only_p]
+     && $prefer_text_only_p == "f"
+&& [ad_graphics_site_available_p] } {
+  template::multirow append attribute background \
+    [ad_parameter -package_id $pkg_id background dummy "/graphics/bg.gif"]
+}
+
+if { ![template::util::is_nil focus] } {
+    # Handle elements wohse name contains a dot
+    regexp {^([^.]*)\.(.*)$} $focus match form_name element_name
+    
+    template::multirow append \
+            attribute onload "javascript:document.forms\['${form_name}'\].elements\['${element_name}'\].focus()"
+}
+
+
+# Developer-support
+
+if { [llength [namespace eval :: info procs ds_link]] == 1 } {
+     set ds_link "[ds_link]"
+} else {
+    set ds_link ""
+}
+
+
+