Index: openacs-4/www/default-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v diff -u -r1.6 -r1.7 --- openacs-4/www/default-master.adp 14 Jan 2003 00:26:06 -0000 1.6 +++ openacs-4/www/default-master.adp 21 Apr 2003 09:50:29 -0000 1.7 @@ -1,21 +1,28 @@ - +@doc_type@ - -@title@ -@header_stuff@ - - @attribute.key@="@attribute.value@"> - - - -

@title@

-@context_bar@ -
- + + @title@ + @header_stuff@ + -
-
@signatory@
-@ds_link@ - + @attribute.key@="@attribute.value@"> + + + + + +

@title@

+ +
+ @context_bar@ +
+
+ + + +
+
@signatory@
+ @ds_link@ + + Index: openacs-4/www/default-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/www/default-master.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/www/default-master.tcl 8 Apr 2003 06:42:02 -0000 1.7 +++ openacs-4/www/default-master.tcl 21 Apr 2003 09:50:29 -0000 1.8 @@ -11,6 +11,10 @@ # fall back on defaults for title, signatory and header_stuff if [template::util::is_nil title] { set title [ad_conn instance_name] } +if [template::util::is_nil doc_type] { + set doc_type {} +} if [template::util::is_nil signatory] { set signatory [ad_system_owner] } if ![template::util::is_nil context] { set context_bar [eval ad_context_bar $context]} if [template::util::is_nil context_bar] { set context_bar [ad_context_bar]} @@ -24,10 +28,10 @@ # 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"] +#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"