Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/www/default-master.adp	25 Mar 2004 10:03:46 -0000	1.25
+++ openacs-4/www/default-master.adp	14 May 2007 20:30:29 -0000	1.26
@@ -1,15 +1,120 @@
 <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>
-  <if @displayed_object_id@ not nil><property name="displayed_object_id">@displayed_object_id;noquote@</property></if>
-<div id="page-body">
-  <if @title@ not nil>
-    <h1 class="page-title">@title;noquote@</h1>
-  </if>
-  <slave>
-  <div style="clear: both;"></div>
-</div>
+<if @meta:rowcount@ not nil><property name="&meta">meta</property></if>
+<if @link:rowcount@ not nil><property name="&link">link</property></if>
+<if @script:rowcount@ not nil><property name="&script">script</property></if>
+<if @doc@ defined><property name="&doc">doc</property></if>
+<if @body@ defined><property name="&body">body</property></if>
+<if @head@ not nil><property name="head">@head;noquote@</property></if>
+<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
+<property name="skip_link">#content-wrapper</property>
+
+<div id="wrapper">
+
+  <div id="header">
+    <div class="block-marker">Begin header</div>
+    <div id="system-name">
+      <if @system_url@ not nil><a href="@system_url@">@system_name@</a></if>
+      <else>@system_name@</else>
+    </div>
+    <div id="header-navigation">
+      <ul class="compact">
+        <li>
+          <if @untrusted_user_id@ ne 0>#acs-subsite.Welcome_user#</if>
+          <else>#acs-subsite.Not_logged_in#</else> | 
+        </li>
+        <li><a href="@whos_online_url@" title="#acs-subsite.view_all_online_members#">@num_users_online@ <if @num_users_online@ eq 1>#acs-subsite.Member#</if><else>#acs-subsite.Members#</else> #acs-subsite.Online#</a> |</li>
+        <if @pvt_home_url@ not nil>
+          <li><a href="@pvt_home_url@" title="#acs-subsite.Change_pass_email_por#">@pvt_home_name@</a> |</li>
+        </if>
+        <if @login_url@ not nil>
+          <li><a href="@login_url@" title="#acs-subsite.Log_in_to_system#">#acs-subsite.Log_In#</a></li>
+        </if>
+        <if @logout_url@ not nil>
+          <li><a href="@logout_url@" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a></li>
+        </if>
+      </ul>
+    </div>
+    <div id="breadcrumbs">
+      <if @context_bar@ not nil>
+        @context_bar;noquote@
+      </if>
+      <else>
+        <if @context:rowcount@ not nil>
+        <ul class="compact">
+          <multiple name="context">
+          <if @context.url@ not nil>
+            <li><a href="@context.url@">@context.label@</a> :</li>
+          </if>
+          <else>
+            <li>@context.label@</li>
+          </else>
+          </multiple>
+        </ul>
+        </if>
+      </else>
+    </div>
+  </div> <!-- /header -->
+
+  <div id="content-wrapper">
+    <div class="block-marker">Begin main content</div>
+    <div id="inner-wrapper">
+        
+      <if @user_messages:rowcount@ gt 0>
+      <div id="alert-message">
+        <multiple name="user_messages">
+        <div class="alert">
+          <strong>@user_messages.message;noquote@</strong>
+        </div>
+        </multiple>
+      </div>
+      </if>
+            
+      <list name="navigation_groups">
+      <div id="@navigation_groups:item@-navigation">
+        <div class="block-marker">Begin @navigation_groups:item@ navigation</div>
+        <ul>
+          <multiple name="navigation">
+          <if @navigation.group@ eq @navigation_groups:item@>
+            <li<if @navigation.id@ not nil> id="@navigation.id"</if>><a href="@navigation.href@"<if @navigation.target@ not nil> target="@navigation.target;noquote@"</if><if @navigation.class@ not nil> class="@navigation.class;noquote@"</if><if @navigation.title@ not nil> title="@navigation.title;noquote@"</if><if @navigation.lang@ not nil> lang="@navigation.lang;noquote@"</if><if @navigation.accesskey@ not nil> accesskey="@navigation.accesskey;noquote@"</if><if @navigation.tabindex@ not nil> tabindex="@navigation.tabindex;noquote@"</if>>@navigation.label@</a></li>
+          </if>
+          </multiple>
+        </ul>
+      </div>
+      </list>
+
+      <div id="main">
+        <div id="main-content">
+          <div class="main-content-padding">
+            <h1>@title;noquote@</h1>
+            <slave />
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </div> <!-- /content-wrapper -->
+
+  <comment>
+    TODO: remove this and add a more systematic / package independent way 
+    TODO  of getting this content here
+  </comment>
+  <if @curriculum_bar_p@ true><include src="/packages/curriculum/lib/bar" /></if>
+
+  <div id="footer">
+    <div class="block-marker">Begin footer</div>
+    <div id="footer-links">
+      <ul class="compact">
+      <if @num_of_locales@ gt 1>
+        <li><a href="@change_locale_url@">#acs-subsite.Change_locale_label#</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> <!-- /footer -->
+
+</div> <!-- /wrapper -->
+