Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/www/default-master.adp	28 Aug 2003 09:49:50 -0000	1.14
+++ openacs-4/www/default-master.adp	12 Sep 2003 09:15:30 -0000	1.15
@@ -1,21 +1,24 @@
-<master src="blank-master">
+<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 @focus@ not nil><property name="focus">@focus;noquote@</property></if>
   <if @doc_type@ not nil><property name="focus">@doc_type;noquote@</property></if>
 
-<include src="login-status" />
+<div id="body">
+  <div id="subsite-name">
+    <if @title@ not nil>
+      <h1 class="subsite-page-title">@title@</h1>
+    </if>
+  </div>
+  <div id="navbar-body">
+    <div class="subsite-context-bar">
+      @context_bar;noquote@&nbsp;
+    </div>
+    <div id="subnavbar-body">
+      <slave>
+      <div style="clear: both;"></div>
+    </div>
+  </div>
+</div>
 
-<if @body_start_include@ not nil>
-<include src="@body_start_include@" />
-</if>
 
-<h1>@title;noquote@</h1>
-@context_bar;noquote@
-<hr />
-<slave>
-<if @curriculum_bar_p@ true>
-<include src="/packages/curriculum/lib/bar" />
-</if>
-<hr />
-<address><a href="mailto:@signatory@">@signatory@</a></address>
Index: openacs-4/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/Attic/index.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/www/index.adp	4 Sep 2003 07:50:34 -0000	1.17
+++ openacs-4/www/index.adp	12 Sep 2003 09:15:30 -0000	1.18
@@ -57,8 +57,8 @@
       packages with additional functionality.  Install these packages
       with the <a href="/acs-admin/apm/" title="OpenACS Package Manager on your server">Package Manager</a>.</li>
 
-      <li>Use the <a href="/admin/site-map/" title="The Site Map on
-      your server">Site Map</a> to <b>mount and configure packages</b>. </li>
+      <li>Use the <a href="/admin/site-map/" 
+      title="The Site Map on your server">Site Map</a> to <b>mount and configure packages</b>. </li>
       </ul>
 </ul> 
       
Index: openacs-4/www/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/www/site-master.adp	12 Sep 2003 09:15:30 -0000	1.1
@@ -0,0 +1,65 @@
+<master src="/www/blank-master">
+  <if @title@ not nil>
+    <property name="title">@title;noquote@</property>
+  </if>
+  <if @signatory@ not nil>
+    <property name="signatory">@signatory;noquote@</property>
+  </if>
+  <if @focus@ not nil>
+    <property name="focus">@focus;noquote@</property>
+  </if>
+  <if @context_bar@ not nil>
+    <property name="context_bar">@context_bar;noquote@</property>
+  </if>
+  <if @context@ not nil>
+    <property name="context">@context;noquote@</property>
+  </if>
+  <property name="header_stuff">
+    @header_stuff;noquote@
+    <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
+  </property>
+
+
+<!-- Header -->
+
+<table cellspacing="0" cellpadding="0" width="100%" class="subsite-header" border="0">
+  <tr class="subsite-header">
+    <td class="system-name" width="34%">
+      <a href="@system_url@" class="system-name">@system_name@</a>
+    </td>
+
+    <td align="center" class="subsite-header" width="33%">
+      <if @user_id@ ne 0>
+        Welcome, @user_name@
+      </if>
+      <else>
+        Not logged in
+      </else>
+    </td>
+
+    <td align="right" class="subsite-header" style="padding-right: 8px;" width="33%">
+      <if @sw_admin_url@ not nil>
+        &nbsp;
+        <span class="button-header"><a href="@sw_admin_url@" title="Site-wide administration" class="button">Admin</a></span>
+      </if>
+      <if @pvt_home_url@ not nil>
+        &nbsp;
+        <span class="button-header"><a href="@pvt_home_url@" title="Change password, email, portrait" class="button">@pvt_home_name@</a></span>
+      </if>
+      <if @logout_url@ not nil>
+        &nbsp;
+        <span class="button-header"><a href="@logout_url@?return_url=@subsite_url@" title="Logout from @system_name@" class="button">Logout</a></span>
+      </if>
+      <if @login_url@ not nil>
+        &nbsp;
+        <span class="button-header"><a href="@login_url@" title="Log in to @system_name@" class="button">Log in</a></span>
+      </if>
+    </td>
+  </tr>
+</table>
+
+<slave>
+
+<if @curriculum_bar_p@ true>
+<include src="/packages/curriculum/lib/bar" />
+</if>
Index: openacs-4/www/site-master.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/Attic/site-master.css,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/www/site-master.css	12 Sep 2003 09:15:30 -0000	1.1
@@ -0,0 +1,283 @@
+table.subsite-header {
+  background-color: #016799; 
+  color: white;
+  font-family: tahoma, verdana;
+  font-size: 85%;
+}
+tr.subsite-header {
+
+}
+td.subsite-header {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
+
+td.system-name {
+  font-size: 180%;
+  font-weight: bold;
+  padding-left: 8px;
+}
+a.system-name {
+  color: white;
+  text-decoration: none;
+}
+a.system-name:hover {
+  color: white;
+  text-decoration: none;
+}
+
+span.button-header { 
+  border-width: 1px; 
+  border-style: solid; 
+  text-align: center; 
+  border-color: #999999; 
+  background-color: #107AAE;
+  padding: 1px;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+span.button { 
+  border-width: 1px;
+  border-style: solid;
+  text-align: center;
+  border-color: #999999;
+  background-color: #107AAE;
+  padding: 1px;
+  padding-left: 4px;
+  padding-right: 4px;
+  font-size: 90%;
+}
+a.button:link { 
+  color: white;
+  text-decoration: none;
+}
+a.button:visited { 
+  color: white;
+  text-decoration: none;
+}
+a.button:hover { 
+  color: #cccccc;
+  text-decoration: none;
+}
+
+#body  { 
+  font-family: tahoma, arial, helvetica, sans-serif;
+  padding-left: 8px;
+  padding-right: 4px;
+  padding-top: 4px;
+  padding-bottom: 2px;
+}
+
+#subsite-name { 
+  font-weight: bold; 
+  font-size: 150%;
+  font-family: verdana; 
+}
+a.subsite-name {
+  color: black;
+  text-decoration: none;
+}
+a.subsite-name:hover {
+  color: black;
+  text-decoration: none;
+}
+
+#navbar { 
+  padding-top: 12px; 
+  font-size: 85%;
+}
+#navbar-body { 
+  border-top: 1px solid #016799;
+  border-bottom: 1px solid #016799;
+  background-color: #dddddd;
+  clear: both;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  padding-left: 12px;
+  padding-right: 12px;
+}
+div.navbar-selected { 
+  background-color: #016799; 
+  color: white; 
+  float: left; 
+  padding-left: 6px; 
+  padding-right: 6px; 
+  padding-top: 2px; 
+  padding-bottom: 2px;
+}
+div.navbar-unselected { 
+  float: left; 
+  padding-left: 6px; 
+  padding-right: 6px; 
+  padding-top: 2px; 
+  padding-bottom: 2px; 
+}
+a.navbar-selected {
+  color: white;
+  text-decoration: none;
+}
+a.navbar-selected:hover {
+  color: white;
+  text-decoration: underline;
+}
+
+
+#subnavbar { 
+  padding-top: 12px; 
+  font-size: 85%;
+}
+#subnavbar-body { 
+  border-top: 1px solid #016799;
+  border-bottom: 1px solid #016799;
+  background-color: white;
+  clear: both;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  padding-left: 12px;
+  padding-right: 12px;
+}
+div.subnavbar-selected { 
+  background-color: #016799; 
+  color: white; 
+  float: left; 
+  padding-left: 8px; 
+  padding-right: 8px; 
+  padding-top: 2px; 
+  padding-bottom: 2px;
+}
+div.subnavbar-unselected { 
+  float: left; 
+  padding-left: 8px; 
+  padding-right: 8px; 
+  padding-top: 2px; 
+  padding-bottom: 2px; 
+}
+a.subnavbar-selected {
+  color: white;
+  text-decoration: none;
+}
+a.subnavbar-selected:hover {
+  color: white;
+  text-decoration: underline;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+table.subsite-body {
+  width: 100%;
+  height: 100%;
+}
+td.subsite-body {
+  padding: 8px;
+  font-family: tahoma, verdana;
+  height: 100%;
+}
+
+td.subsite-subsections {
+  font-family: tahoma, verdana;
+  background-color: #e6e6e6;
+  width: 150px;
+  height: 100%;
+}
+div.subsite-subsection-header {
+  background-color: #aeb599;
+  padding-left: 40px;
+  padding-right: 4px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+}
+div.subsite-subsection {
+  padding-left: 4px;
+  padding-right: 4px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  border-bottom: solid 1px #aaaaaa;
+}
+a.subsite-subsection {
+  color: black;
+  text-decoration: none;
+}
+a.subsite-subsection:hover {
+  color: gray;
+  text-decoration: none;
+}
+
+td.subsite-section {
+  background-color: #879266;
+  color: white;
+  text-align: center;
+  font-weight: bold;
+  text-transform: uppercase;
+  font-family: tahoma, verdana;
+  font-size: 75%;
+}
+td.subsite-section-selected {
+  background-color: #879299;
+  color: white;
+  text-align: center;
+  font-weight: bold;
+  text-transform: uppercase;
+  font-family: tahoma, verdana;
+  font-size: 75%;
+}
+
+a.subsite-section {
+  color: white;
+  text-decoration: none;
+}
+a.subsite-section:hover {
+  color: #cccccc;
+  text-decoration: underline;
+}
+
+
+div.subsite-context-bar {
+  font-size: 75%;
+  margin-bottom: 6px;
+}
+
+h1 {
+  font-size: 125%;
+  margin-top: 0px;
+  margin-bottom: 12px;
+}
+h2 {
+  font-size: 115%;
+  margin-top: 0px;
+  margin-bottom: 12px;
+}
+h3 {
+  font-size: 110%;
+  margin-top: 0px;
+  margin-bottom: 12px;
+}
+h4 {
+  font-size: 105%;
+  margin-top: 0px;
+  margin-bottom: 12px;
+}
+
+
+span.form-configuration-help-text { 
+  font-family:verdana, arial, sans-serif; 
+  font-size:10px; 
+  line-height:13px;
+  text-align:justify;
+}
+span.form-configuration-label { 
+  font-family:trebuchet MS, trebuchet, verdana, arial, sans-serif; 
+  font-size: 11px; 
+  line-height:15px;
+}
+
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/www/site-master.tcl	12 Sep 2003 09:15:30 -0000	1.1
@@ -0,0 +1,73 @@
+# Expects properties:
+#   title
+#   focus
+#   header_stuff
+#   section
+
+if { ![info exists section] } {
+    set section {}
+}
+
+if { ![info exists header_stuff] } {
+    set header_stuff {}
+}
+
+# This will set 'sections' and 'subsections' multirows
+subsite::define_pageflow -section $section
+subsite::get_section_info -array section_info
+
+# Find the subsite we belong to
+set subsite_url [site_node_closest_ancestor_package_url]
+array set subsite_sitenode [site_node::get -url $subsite_url]
+set subsite_node_id $subsite_sitenode(node_id)
+set subsite_name $subsite_sitenode(instance_name)
+
+# Where to find the stylesheet
+set css_url "${subsite_url}group-master.css"
+
+# Get system name
+set system_name [ad_system_name]
+set system_url [ad_url]
+
+# Get user information
+set user_id [ad_conn user_id]
+if { $user_id != 0 } {
+    set user_name [person::name -person_id $user_id]
+    set pvt_home_url [ad_pvt_home]
+    set pvt_home_name [ad_pvt_home_name]
+    set logout_url [ad_get_logout_url]
+} else {
+    set login_url [ad_get_login_url -return]
+}
+
+# Site-wide admin link
+set swadmin_url {}
+if { $user_id != 0 } {
+    array set swadmin_node [site_node::get -url /acs-admin]
+    set swadmin_object_id $swadmin_node(object_id)
+    set sw_admin_p [permission::permission_p -party_id $user_id -object_id $swadmin_object_id -privilege admin]
+    if { $sw_admin_p } {
+        set sw_admin_url "/acs-admin"
+    }
+}
+
+
+# Context bar
+if { [template::util::is_nil no_context_p] } {
+    if { ![template::util::is_nil context] } {
+        set context_bar [eval ad_context_bar -from_node $subsite_node_id $context]
+    }
+    if [template::util::is_nil context_bar] { 
+        set context_bar [ad_context_bar -from_node $subsite_node_id]
+    }
+} else {
+    set context_bar {}
+}
+
+# Curriculum bar
+
+if { [apm_package_installed_p curriculum] } {
+    set curriculum_bar_p 1
+} else {
+    set curriculum_bar_p 0
+}