Index: openacs-4/packages/cms/www/modules/sitemap/attributes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/attributes.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/sitemap/attributes.adp	22 May 2003 14:29:51 -0000	1.3
+++ openacs-4/packages/cms/www/modules/sitemap/attributes.adp	16 Nov 2004 22:32:50 -0000	1.4
@@ -1,72 +1,40 @@
 <master src="../../master">
-<property name="title">@page_title;noquote@</property>
-<h2>@page_title@</h2>
+<property name="title">@page_title@</property>
 
+<nobr><p class="h1">
+<include src="../../bookmark" mount_point="@mount_point@" id="@folder_id@">
+@page_title;noquote@ 
+</p>
+</nobr>
+<p/>
 
-
-<include src="../../table-header" title="Registered Content Types">
-<table cellspacing=0 cellpadding=4 border=0 width="100%">
-
-<if @content_types:rowcount@ eq 0>
-  <tr bgcolor="#99CCFF">
-    <td><em>There are no content types registered to this folder.</em></td>
-  </tr>
+<!-- MS: HACK -->
+<if @call_ancestors_p@>
+ <include src="ancestors" item_id=@folder_id@ mount_point=@mount_point@> : <a href="index?item_id=@folder_id@&mount_point=@mount_point@">@folder_name@</a>
 </if>
 <else>
-
-  <tr bgcolor="#99CCFF">
-    <th align=left>Content Type</th>
-    <th align=left>&nbsp</th>
-  </tr>
-
-  <multiple name=content_types>
-  <if @content_types.rownum@ odd><tr bgcolor="#FFFFFF"></if>
-  <else><tr bgcolor="#EEEEEE"></else>
-    <td>@content_types.pretty_name@</td>
-    <td>
-      <if @user_permissions.cm_write@ eq t>
-        <a href="type-unregister?folder_id=@folder_id@&type_key=@content_types.content_type@">Unregister this content type</a>
-      </if>
-      <else>&nbsp;</else>
-    </td>
-  </tr>
-  </multiple>
+ <font size="-1"><strong>Path:</strong>&nbsp;&nbsp;<a href="index?item_id=@folder_id@&mount_point=@mount_point@">@folder_name@</a></font>
 </else>
 
-</table>
+<p/>
 
-<if @user_permissions.cm_write@ eq t>
-  <include src="../../table-footer" footer="@register_marked_content_types;noquote@">
-</if>
-<else>
-  <include src="../../table-footer">
-</else>
+<div id=section>
+<div id=section-header>Content types registered to the folder</div>
+<p/>
+<listtemplate name="content_types"></listtemplate>
+</div>
 
-<p>
+<p/>
 
+<div id=section>
+<div id=section-header>Folder options for special types</div>
+<p/>
+<formtemplate id="special_types"></formtemplate>
+</div>
 
+<p/>
 
-<!-- FOLDER OPTIONS TABLE -->
-
-<table cellspacing=0 cellpadding=0 border=0 width="100%">
-<tr bgcolor="#FFFFFF"><td>
-  <table cellspacing=0 cellpadding=4 border=0 width="100%">
-  <tr bgcolor="#FFFFFF">
-    <th align=left>Folder Options</th>
-  </tr>
-  </table>
-</td></tr>
-<tr><td>
-  <formtemplate id="register_types" style="wizard"></formtemplate>
-</td></tr>
-</table>
-
-<p>
-
-
-
-
-
+<div id=section>
 <include src="../permissions/index" object_id="@folder_id;noquote@" 
   mount_point="@mount_point;noquote@" return_url="@return_url;noquote@" passthrough="@passthrough;noquote@">
-
+</div>