Index: openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.adp	4 Jun 2005 18:48:23 -0000	1.1.2.1
@@ -0,0 +1,12 @@
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
+
+<ul class="action-links">
+ <li><a href="index">View Hierarchical Index</a></li>
+</ul>
+<p>
+
+<multiple name="alpha_object_types">
+ <a href="one?object_type=@alpha_object_types.object_type@">@alpha_object_types.pretty_name@</a><br>
+</multiple>
Index: openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.tcl,v
diff -u -N -r1.3 -r1.3.12.1
--- openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.tcl	6 Sep 2002 22:19:32 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.tcl	4 Jun 2005 18:48:23 -0000	1.3.12.1
@@ -8,38 +8,6 @@
 
 } {}
 
-set title "Alphabetical Index"
-
-set page "
-[ad_admin_header $title]
-<h2>$title</h2>
-[ad_context_bar [list "./index" "Object Type Administration"] $title]
-<hr>
-<ul>"
-
-set body ""
-db_foreach object_type_in_alphabetical_order {
-    select object_type,
-           pretty_name
-      from acs_object_types
-     order by lower(pretty_name)
-} {
-
-    append body "\n    <a href=\"./one?[export_url_vars object_type]\">$pretty_name</a><br>"
-
-}
-
-append page "
- <table border=0 cellspacing=0 cellpadding=0 width=90%>
-  <tr>
-   <td valign=top>$body
-   </td>
-   <td valign=top align=right><a href=\"./index\">Hierarchical Index</a></td>
-  </tr>
- </table>"
-
-append page "
-</ul>
-[ad_admin_footer]"
-
-ns_return 200 text/html $page
\ No newline at end of file
+set page_title "Object Type Alphabetical Index"
+set context [list "Object Type Alphabetical Index"]
+db_multirow alpha_object_types object_type_in_alphabetical_order {}
Index: openacs-4/packages/acs-subsite/www/admin/object-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/index.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/admin/object-types/index.adp	4 Jun 2005 18:48:23 -0000	1.1.2.1
@@ -0,0 +1,10 @@
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
+
+<ul class="action-links">
+ <li><a href="alphabetical-index">View Alphabetical Index</a></li>
+</ul>
+<p>
+
+@object_type_hierarchy;noquote@
Index: openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl,v
diff -u -N -r1.4 -r1.4.12.1
--- openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl	6 Sep 2002 22:19:32 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl	4 Jun 2005 18:48:23 -0000	1.4.12.1
@@ -8,26 +8,7 @@
 
 } {}
 
-set title "OpenACS Object Type Administration"
+set page_title "Object Type Hierarchical Index"
+set context [list "Object Type Hierarchical Index"]
 
-set page "
-[ad_admin_header $title]
-<h2>$title</h2>
-[ad_context_bar $title]
-<hr>
-<ul>"
-
-append page "
- <table border=0 cellspacing=0 cellpadding=0 width=90%>
-  <tr>
-   <td valign=top>[acs_object_type_hierarchy]
-   </td>
-   <td valign=top align=right><a href=\"./alphabetical-index\">Alphabetical Index</a></td>
-  </tr>
- </table>"
-
-append page "
-</ul>
-[ad_admin_footer]"
-
-ns_return 200 text/html $page
+set object_type_hierarchy [acs_object_type_hierarchy]