Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/www/default-master.adp	8 Feb 2004 18:38:40 -0000	1.23
+++ openacs-4/www/default-master.adp	16 Feb 2004 14:47:41 -0000	1.24
@@ -1,44 +1,17 @@
 <master src="site-master">
   <property name="title">@title;noquote@</property>
   <if @header_stuff@ not nil><property name="header_stuff">@header_stuff;noquote@</property></if>
+  <if @context@ not nil><property name="context">@context;noquote@</property></if>
+  <if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if>
   <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
   <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
 
-<div id="body">
-  <div id="navbar-body">
-    <div id="context-bar">
-      <if @context_bar@ not nil>
-        <div id="breadcrumbs">@context_bar;noquote@</div>
-      </if>
-      <else>
-        <if @context:rowcount@ not nil>
-          <div id="breadcrumbs">
-            <ul>
-              <multiple name="context">
-                <if @context.url@ not nil>
-                  <li><a href="@context.url@">@context.label@</a> &#187;</li>
-                </if>
-                <else>
-                  <li>@context.label@</li>
-                </else>
-              </multiple>
-            </ul>
-          </div>
-        </if>
-      </else>
-      <div id="navlinks">@subnavbar_link;noquote@</div>
-      <div style="clear: both;"></div>
-    </div>
+<div id="page-body">
+  <if @title@ not nil>
+    <h1 class="page-title">@title;noquote@</h1>
+  </if>
 
-    <div id="subsite-name">
-      <if @title@ not nil>
-        <h1 class="subsite-page-title">@title;noquote@</h1>
-      </if>
-    </div>
-    <slave>
-    <div style="clear: both;"></div>
-
-  </div>
+  <slave>
+  <div style="clear: both;"></div>
 </div>
 
-
Index: openacs-4/www/default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/www/default-master.tcl	8 Feb 2004 18:38:40 -0000	1.18
+++ openacs-4/www/default-master.tcl	16 Feb 2004 14:47:41 -0000	1.19
@@ -10,59 +10,9 @@
 
 # fall back on defaults
 
-if { [template::util::is_nil subnavbar_link] } {
-    set subnavbar_link ""
-}
-
-
 if { [template::util::is_nil title] } {
     set title [ad_conn instance_name]
 }
 
-if { [template::util::is_nil signatory] } {
-    set signatory [ad_system_owner]
-}
 
-if { [info exists context] } {
-    set context_tmp $context
-    unset context
-} else {
-    set context_tmp {}
-}
-ad_context_bar_multirow -- $context_tmp
 
-
-# Attributes
-
-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"]
-}
-
-# Developer-support
-
-if { [llength [namespace eval :: info procs ds_link]] == 1 } {
-     set ds_link "[ds_link]"
-} else {
-    set ds_link ""
-}
-
-# Curriculum bar
-
-if { [apm_package_installed_p curriculum] } {
-    set curriculum_bar_p 1
-} else {
-    set curriculum_bar_p 0
-}
Index: openacs-4/www/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/www/site-master.adp	29 Jan 2004 15:08:13 -0000	1.15
+++ openacs-4/www/site-master.adp	16 Feb 2004 14:47:41 -0000	1.16
@@ -16,43 +16,48 @@
 
 <!-- Header -->
 
-<table cellspacing="0" cellpadding="0" width="100%" class="subsite-header" border="0">
-  <tr>
-    <td class="system-name">
-      <a href="@system_url@">@system_name@</a>
-    </td>
+<div id="site-header">
+  <div class="system-name">
+    <if @system_url@ not nil><a href="@system_url@">@system_name@</a></if>
+    <else>@system_name@</else>
+  </div>
 
-    <td align="center">
-      <if @untrusted_user_id@ ne 0>
-        #acs-subsite.Welcome_user#
-      </if>
-      <else>
-        #acs-subsite.Not_logged_in#
-      </else>
-    </td>
-
-    <td align="center" class="button-bar">
-      <a href="@whos_online_url@">@num_users_online@ <if @num_users_online@ eq 1>user</if><else>users</else> online</a>
-    </td>
-
-    <td align="right" style="padding-right: 8px;" class="button-bar">
+  <div class="action-list permanent-navigation">
+    <ul>
       <if @admin_url@ not nil>
-        <a href="@admin_url@" title="#acs-subsite.Site_wide_administration#">#acs-subsite.Admin#</a>
+        <li><a href="@admin_url@" title="#acs-subsite.Site_wide_administration#">#acs-subsite.Admin#</a></li>
       </if>
       <if @pvt_home_url@ not nil>
-        <a href="@pvt_home_url@" title="#acs-subsite.Change_pass_email_por#">@pvt_home_name@</a>
+        <li><a href="@pvt_home_url@" title="#acs-subsite.Change_pass_email_por#">@pvt_home_name@</a></li>
       </if>
       <if @login_url@ not nil>
-        <a href="@login_url@" title="#acs-subsite.Log_in_to_system#">#acs-subsite.Log_In#</a>
+        <li><a href="@login_url@" title="#acs-subsite.Log_in_to_system#">#acs-subsite.Log_In#</a></li>
       </if>
       <if @logout_url@ not nil>
-        <a href="@logout_url@" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
+        <li><a href="@logout_url@" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a></li>
       </if>
-    </td>
-  </tr>
-</table>
+    </ul>
+  </div>
+
+  <div class="action-list users-online">
+    <ul>
+      <li><a href="@whos_online_url@">@num_users_online@ <if @num_users_online@ eq 1>user</if><else>users</else> online</a></li>
+    </ul>
+  </div>
+
+  <div class="user-greeting">
+    <if @untrusted_user_id@ ne 0>
+      #acs-subsite.Welcome_user#
+    </if>
+    <else>
+      #acs-subsite.Not_logged_in#
+    </else>
+  </div>
+
+</div>
+
 <if @user_messages:rowcount@ gt 0>
-  <div id="general-message">
+  <div id="user-message">
     <ul>
       <multiple name="user_messages">
         <li>@user_messages.message;noquote@</li>
@@ -61,18 +66,47 @@
   </div>
 </if>
 
+<div id="context-bar">
+  <if @context_bar@ not nil>
+    <div id="breadcrumbs">@context_bar;noquote@</div>
+  </if>
+  <else>
+    <if @context:rowcount@ not nil>
+      <div id="breadcrumbs">
+        <ul>
+          <multiple name="context">
+            <if @context.url@ not nil>
+              <li><a href="@context.url@">@context.label@</a> &#187;</li>
+            </if>
+            <else>
+              <li>@context.label@</li>
+            </else>
+          </multiple>
+        </ul>
+      </div>
+    </if>
+  </else>
+  <div id="navlinks">@subnavbar_link;noquote@</div>
+  <div style="clear: both;"></div>
+</div>
 
 <slave>
 
-<if @num_of_locales@ gt 1>
-    <p><a href="@change_locale_url@">Change Locale</a>
-</if>
-<else>
-  <if @locale_admin_url@ not nil>
-    <a href="@locale_admin_url@">Install Locales</a>
-  </if>
-</else>
+<div id="site-footer">
+  <div class="action-list">
+    <ul>
+      <if @num_of_locales@ gt 1>
+        <li><a href="@change_locale_url@">Change locale</a></li>
+      </if>
+      <else>
+        <if @locale_admin_url@ not nil>
+          <li><a href="@locale_admin_url@">Install locales</a></li>
+        </if>
+      </else>
+    </ul>
+  </div>
+</div>
 
 <if @curriculum_bar_p@ true>
-<p><include src="/packages/curriculum/lib/bar" />
+  <p><include src="/packages/curriculum/lib/bar" />
 </if>
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/www/site-master.tcl	29 Jan 2004 15:07:48 -0000	1.15
+++ openacs-4/www/site-master.tcl	16 Feb 2004 14:47:41 -0000	1.16
@@ -12,6 +12,10 @@
     set header_stuff {}
 }
 
+if { [template::util::is_nil subnavbar_link] } {
+    set subnavbar_link ""
+}
+
 # This will set 'sections' and 'subsections' multirows
 subsite::define_pageflow -section $section
 subsite::get_section_info -array section_info
@@ -28,6 +32,9 @@
 # Get system name
 set system_name [ad_system_name]
 set system_url [ad_url]
+if { [string equal [ad_conn url] "/"] } {
+    set system_url ""
+}
 
 # Get user information
 set sw_admin_p 0
@@ -67,6 +74,14 @@
     set login_url [ad_get_login_url -return]
 }
 
+# Context bar
+if { [info exists context] } {
+    set context_tmp $context
+    unset context
+} else {
+    set context_tmp {}
+}
+ad_context_bar_multirow -- $context_tmp
 
 
 # change locale
@@ -76,16 +91,16 @@
         "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]"
 }
 
-
-
 # Curriculum bar
 set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $subsite_node_id]]
 
 
+# Who's Online
 set num_users_online [lc_numeric [whos_online::num_users]]
 
 set whos_online_url "[subsite::get_element -element url]shared/whos-online"
 
+
 #----------------------------------------------------------------------
 # Display user messages
 #----------------------------------------------------------------------