Index: openacs-4/packages/acs-object-management/www/admin/dtype-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/Attic/dtype-add.adp,v
diff -u -N
--- openacs-4/packages/acs-object-management/www/admin/dtype-add.adp	28 Jul 2009 23:35:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
-
-<formtemplate id="dtype-add"></formtemplate>
Index: openacs-4/packages/acs-object-management/www/admin/dtype-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/Attic/dtype-add.tcl,v
diff -u -N
--- openacs-4/packages/acs-object-management/www/admin/dtype-add.tcl	14 Aug 2009 22:15:42 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-ad_page_contract {
-
-    @author Vinod Kurup (vinod@kurup.com)
-    @author Don Baccus (dhogaza@pacifier.com)
-    @creation-date 2009-07-20
-
-    Modified from dynamic types.
-}
-
-set page_title [_ acs-object-management.create_type]
-set context [list $page_title]
-
-ad_form -name dtype-add -form {
-    {object_type:keyword
-      {label {[_ acs-object-management.object_type]}}
-      {html {size 30 maxlength 100}}
-    }
-    {supertype:keyword
-      {label {[_ acs-object-management.supertype]}}
-      {html {size 30 maxlength 100}}
-    }
-    {pretty_name:text
-      {label {[_ acs-object-management.pretty_name]}}
-      {html {size 30 maxlength 100}}
-    }
-    {pretty_plural:text
-      {label {[_ acs-object-management.pretty_plural]}}
-      {html {size 30 maxlength 100}}
-    }
-} -on_request {
-    set supertype acs_object
-} -on_submit {
-    object_type::new \
-        -object_type $object_type \
-        -supertype $supertype \
-        -pretty_name $pretty_name \
-        -pretty_plural $pretty_plural \
-        -create_table_p t
-} -after_submit {
-    ad_returnredirect ./
-    ad_script_abort
-}
-
Index: openacs-4/packages/acs-object-management/www/admin/dtype-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/Attic/dtype-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-object-management/www/admin/dtype-postgresql.xql	28 Jul 2009 23:35:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-
-  <fullquery name="get_inherited_attributes">
-    <querytext>
-      select a.attribute_id, a.attribute_name, a.pretty_name, a.pretty_plural,
-        a.datatype, a.object_type as attribute_object_type
-      from acs_attributes a, acs_object_types t
-      where t.object_type in (select ot1.object_type
-                              from acs_object_types ot1, acs_object_types ot2
-                              where ot2.tree_sortkey between 
-                                tree_left(ot1.tree_sortkey) and tree_right(ot1.tree_sortkey)
-                                and ot2.object_type = :object_type)
-        and a.object_type = t.object_type
-      order by t.tree_sortkey desc, a.sort_order asc;
-    </querytext>
-  </fullquery>
-
-</queryset>
Index: openacs-4/packages/acs-object-management/www/admin/dtype.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/Attic/dtype.adp,v
diff -u -N
--- openacs-4/packages/acs-object-management/www/admin/dtype.adp	14 Aug 2009 22:15:42 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-<master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
-
-<h1>#acs-object-management.object_type#: @type_info.pretty_name@</h1>
-<listtemplate name="attributes"></listtemplate>
-<br>
-<listtemplate name="inherited_attributes"></listtemplate>
-<br>
-<listtemplate name="views"></listtemplate>
-
Index: openacs-4/packages/acs-object-management/www/admin/dtype.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/Attic/dtype.tcl,v
diff -u -N
--- openacs-4/packages/acs-object-management/www/admin/dtype.tcl	14 Aug 2009 22:15:42 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,120 +0,0 @@
-ad_page_contract {
-
-    @author Timo Hentschel (timo@timohentschel.de)
-    @creation-date 2005-05-02
-    @cvs-id $Id: dtype.tcl,v 1.3 2009/08/14 22:15:42 donb Exp $
-
-} {
-    object_type:notnull,sql_identifier
-}
-
-object_type::get -object_type $object_type -array type_info
-
-set page_title $type_info(pretty_name)
-set context [list [list . "Dynamic Types"] $page_title]
-
-list::create \
-    -name attributes \
-    -caption [_ acs-object-management.attributes] \
-    -multirow attributes \
-    -key attribute_id \
-    -pass_properties {
-        object_type
-    } -actions [list "[_ acs-object-management.add_attribute]" [export_vars -base attribute {object_type}] "[_ acs-object-management.add_attribute]"] \
-    -elements {
-        pretty_name {
-            label "[_ acs-object-management.pretty_name]"
-            link_url_eval $attribute_url
-        }
-        attribute_name {
-            label "[_ acs-object-management.attribute]"
-        }
-        datatype {
-            label "[_ acs-object-management.datatype]"
-        }
-        action {
-            label "[_ acs-object-management.Action]"
-            display_template "
-                <a href=\"@attributes.delete_url@\">
-                  [_ acs-object-management.delete]
-                </a>"
-        }
-    } -filters {
-        object_type {}
-    }
-
-db_multirow -cache_pool acs_metadata -cache_key t::${object_type}::get_attributes \
-    -extend { attribute_url delete_url } attributes get_attributes {} {
-    set attribute_url [export_vars -base attribute {attribute_id object_type}]
-    set delete_url [export_vars -base attribute-delete {object_type attribute_name}]
-}
-
-list::create \
-    -name inherited_attributes \
-    -caption [_ acs-object-management.inherited_attributes] \
-    -multirow inherited_attributes \
-    -key attribute_id \
-    -elements {
-        pretty_name {
-            label "[_ acs-object-management.pretty_name]"
-        }
-        attribute_name {
-            label "[_ acs-object-management.attribute]"
-        }
-        attribute_object_type {
-            label "[_ acs-object-management.object_type]"
-        }
-        datatype {
-            label "[_ acs-object-management.datatype]"
-        }
-    } -filters {
-        object_type {}
-    }
-
-db_multirow -cache_pool acs_metadata -cache_key t::${object_type}::get_inherited_attributes \
-    inherited_attributes get_inherited_attributes {}
-
-list::create \
-    -name views \
-    -caption [_ acs-object-management.views] \
-    -multirow views \
-    -key object_view \
-    -actions [list "[_ acs-object-management.add_view]" [export_vars -base view-add {object_type}] "[_ acs-object-management.add_view]"] \
-    -elements {
-        pretty_name {
-            label "[_ acs-object-management.pretty_name]"
-            display_template "
-              <if @views.root_view_p@ eq \"t\">
-                @views.pretty_name@
-              </if>
-              <else>
-                <a href=\"@views.view_url@\">
-                  @views.pretty_name@
-                </a>
-              </else>" 
-        }
-        object_view {
-            label "[_ acs-object-management.view]"
-        }
-        actions {
-            label "[_ acs-object-management.Action]"
-            display_template "
-              <if @views.root_view_p@ eq \"f\">
-                <a href=\"@views.delete_url@\">
-                  [_ acs-object-management.delete]
-                </a>
-              </if>"
-        }
-    } -filters {
-        object_type {}
-    }
-
-db_multirow -cache_pool acs_metadata -cache_key t::${object_type}::get_views \
-    -extend { view_url delete_url } views get_views {} {
-    set delete_url [export_vars -base view-delete {object_type  object_view}]
-    set view_url [export_vars -base view {object_view}]
-}
-
-set add_form_url [export_vars -base form-ae {object_type}]
-set return_url [ad_return_url]
-ad_return_template
Index: openacs-4/packages/acs-object-management/www/admin/dtype.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/Attic/dtype.xql,v
diff -u -N
--- openacs-4/packages/acs-object-management/www/admin/dtype.xql	28 Jul 2009 23:35:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-
-  <fullquery name="get_attributes">
-    <querytext>
-      select a.attribute_id, a.attribute_name, a.pretty_name, a.pretty_plural,
-        a.datatype
-      from acs_attributes a
-      where a.object_type = :object_type
-      order by a.sort_order asc;
-    </querytext>
-  </fullquery>
-
-  <fullquery name="get_views">
-    <querytext>
-      select object_view, pretty_name, root_view_p
-      from acs_object_views
-      where object_type = :object_type
-    </querytext>
-  </fullquery>
-
-</queryset>
Index: openacs-4/packages/acs-object-management/www/admin/form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/form.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-object-management/www/admin/form.adp	27 Nov 2009 00:38:50 -0000	1.1
+++ openacs-4/packages/acs-object-management/www/admin/form.adp	29 Nov 2009 18:46:15 -0000	1.2
@@ -5,4 +5,4 @@
 <h1>Form for: @view_info.pretty_name@</h1>
 <listtemplate name="form_elements"></listtemplate>
 <p>
-<a href="@form_preview_url@">Preview Form</a>
+<a href="@form_preview_url@" class="button">Preview Form</a>