Index: openacs-4/packages/cms/www/modules/types/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/index.adp,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/cms/www/modules/types/index.adp 13 Apr 2005 21:32:34 -0000 1.6 +++ openacs-4/packages/cms/www/modules/types/index.adp 16 May 2005 17:38:19 -0000 1.7 @@ -1,106 +1,10 @@ @page_title;noquote@ - - - + -

- -@page_title;noquote@ -

- -

+ - - Inheritance:   - - Basic item - - - - - @content_type_tree.pretty_name;noquote@ - - - - - @content_type_tree.pretty_name;noquote@ - - - : - - - - - - - -

-
Index: openacs-4/packages/cms/www/modules/types/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/index.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/cms/www/modules/types/index.tcl 9 May 2005 22:44:49 -0000 1.8 +++ openacs-4/packages/cms/www/modules/types/index.tcl 16 May 2005 17:38:19 -0000 1.9 @@ -3,46 +3,33 @@ # @author Michael Steigman (michael@steigman.net) # @creation-date October 2004 # } { -# {id "content_revision"} -# {mount_pount "types"} -# {parent_id ""} -# {type_props_tab "attributes"} +# {content_type:optional "content_revision"} +# {parent_type ""} +# {mount_point:optional "types"} +# {type_props_tab:optional "attributes"} # } -# query for attributes of this subclass of content_revision and display them +#query for attributes of this subclass of content_revision and display them request create -request set_param id -datatype keyword -value content_revision -request set_param parent_id -datatype keyword -optional +request set_param content_type -datatype keyword -value content_revision +request set_param parent_type -datatype keyword -optional request set_param mount_point -datatype keyword -value types -request set_param type_props_tab -datatype keyword -value attributes -request set_param refresh_tree -datatype keyword -optional -value t +request set_param type_props_tab -datatype keyword -optional -value attributes -set package_url [ad_conn package_url] -set package_id [ad_conn package_id] - -# Tree hack -if { [string equal $id content_revision] } { - set refresh_id "" -} else { - set refresh_id $id -} - -set content_type $id set root_id [cm::modules::templates::getRootFolderID [ad_conn package_id]] -set module_id [db_string get_module_id ""] - set user_id [auth::require_login] +set module_id [cm::modules::get_module_id -module_name types -package_id [ad_conn package_id]] permission::require_permission -party_id $user_id \ -object_id $module_id -privilege read set can_edit_widgets_p [permission::permission_p -party_id $user_id \ -object_id $module_id -privilege write] - # get the content type pretty name set object_type_pretty [db_string get_object_type ""] +set page_title "Content Type - $object_type_pretty" if { [string equal $object_type_pretty ""] } { # error - invalid content_type @@ -58,7 +45,7 @@ -multirow type_templates \ -has_checkboxes \ -no_data "There are no templates registered to this content type." \ - -actions [list "Register marked templates to this content type" [export_vars -base register-templates {content_type}] "Register marked templates to this content type"] \ + -actions [list "Register marked templates to this content type" [export_vars -base register-templates {content_type type_props_tab}] "Register marked templates to this content type"] \ -elements { name { label "Template Name" @@ -89,9 +76,4 @@ set set_default_url [export_vars -base set-default-template {template_id context content_type}] } -set page_title "Content Type - $object_type_pretty" -# for the permissions include -set return_url [ns_conn url] -set passthrough [content::assemble_passthrough return_url mount_point id] - Index: openacs-4/packages/cms/www/modules/types/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/index.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/www/modules/types/index.xql 9 May 2005 22:44:49 -0000 1.2 +++ openacs-4/packages/cms/www/modules/types/index.xql 16 May 2005 17:38:19 -0000 1.3 @@ -1,15 +1,6 @@ - - - - select module_id from cm_modules where key = 'types' and package_id = :package_id - - - - - Index: openacs-4/packages/cms/www/modules/types/register-templates.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/register-templates.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/www/modules/types/register-templates.adp 22 May 2003 14:32:35 -0000 1.2 +++ openacs-4/packages/cms/www/modules/types/register-templates.adp 16 May 2005 17:38:19 -0000 1.3 @@ -1,17 +1,26 @@ @page_title;noquote@ -

@page_title@

+ - - This is an invalid content type.

- - - - There are no templates in the clipboard. - - - - - -

+ + +

+ +
+
@page_title@
+

+ + This is an invalid content type. + + + + There are no templates in the clipboard. + + + + + +

+ +
Index: openacs-4/packages/cms/www/modules/types/register-templates.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/register-templates.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/cms/www/modules/types/register-templates.tcl 20 Aug 2002 04:18:00 -0000 1.4 +++ openacs-4/packages/cms/www/modules/types/register-templates.tcl 16 May 2005 17:38:19 -0000 1.5 @@ -3,6 +3,7 @@ request create request set_param content_type -datatype keyword +request set_param type_props_tab -datatype text -optional -value attributes # get the content type pretty name Index: openacs-4/packages/cms/www/modules/types/relation-register.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/www/modules/types/relation-register.adp 22 May 2003 14:32:35 -0000 1.2 +++ openacs-4/packages/cms/www/modules/types/relation-register.adp 16 May 2005 17:38:19 -0000 1.3 @@ -1,5 +1,16 @@ -Register a @rel_type_pretty;noquote@ Relation Type to @pretty_name;noquote@ +@page_title;noquote@ -

Register a @rel_type_pretty@ Relation Type to @pretty_name@

- + + + + +
+ +
+
@page_title@
+

+ +

+ +
Index: openacs-4/packages/cms/www/modules/types/relation-register.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/cms/www/modules/types/relation-register.tcl 13 Apr 2005 20:15:19 -0000 1.6 +++ openacs-4/packages/cms/www/modules/types/relation-register.tcl 16 May 2005 17:38:19 -0000 1.7 @@ -1,11 +1,10 @@ request create request set_param rel_type -datatype keyword -request set_param content_type -datatype keyword -value content_revision +request set_param content_type -datatype text -value content_revision +request set_param type_props_tab -datatype text -optional -value attributes - -set module_id [db_string get_module_id ""] permission::require_permission -party_id [auth::require_login] \ - -object_id $module_id -privilege write + -object_id [cm::modules::get_module_id -module_name types -package_id [ad_conn package_id]] -privilege write form create relation -elements { rel_type -datatype keyword -widget hidden -param @@ -25,9 +24,10 @@ } set pretty_name [db_string get_pretty_name ""] - set target_types [db_list_of_lists get_target_types ""] +set page_title "Register a $rel_type_pretty Relation Type to $pretty_name" + element create relation target_type \ -datatype keyword \ -widget select \ Index: openacs-4/packages/cms/www/modules/types/relation-register.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/types/relation-register.xql 25 May 2001 23:49:05 -0000 1.1 +++ openacs-4/packages/cms/www/modules/types/relation-register.xql 16 May 2005 17:38:19 -0000 1.2 @@ -1,15 +1,6 @@ - - - - select module_id from cm_modules where key = 'types' - - - - - Index: openacs-4/packages/cms/www/modules/types/relation-unregister.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-unregister.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/cms/www/modules/types/relation-unregister.tcl 13 Apr 2005 20:15:19 -0000 1.6 +++ openacs-4/packages/cms/www/modules/types/relation-unregister.tcl 16 May 2005 17:38:19 -0000 1.7 @@ -8,9 +8,8 @@ request set_param target_type -datatype keyword request set_param relation_tag -datatype text -value "" -set module_id [db_string get_module_id ""] permission::require_permission -party_id [auth::require_login] \ - -object_id $module_id -privilege write + -object_id [cm::modules::get_module_id -module_name types -package_id [ad_conn package_id]] -privilege write if { [string equal $rel_type child_rel] } { Index: openacs-4/packages/cms/www/modules/types/relation-unregister.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/Attic/relation-unregister.xql,v diff -u -N --- openacs-4/packages/cms/www/modules/types/relation-unregister.xql 25 May 2001 23:49:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ - - - - - - - select module_id from cm_modules where key = 'types' - - - - - - Index: openacs-4/packages/cms/www/modules/types/relations.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relations.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/types/relations.adp 16 Nov 2004 22:32:52 -0000 1.3 +++ openacs-4/packages/cms/www/modules/types/relations.adp 16 May 2005 17:38:19 -0000 1.4 @@ -1,4 +1,3 @@ -

Registered Item Relation Types

Index: openacs-4/packages/cms/www/modules/types/relations.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relations.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/cms/www/modules/types/relations.tcl 9 May 2005 22:44:49 -0000 1.6 +++ openacs-4/packages/cms/www/modules/types/relations.tcl 16 May 2005 17:38:19 -0000 1.7 @@ -4,6 +4,7 @@ request create request set_param content_type -datatype integer -value content_revision +request set_param type_props_tab -datatype text -optional -value attributes permission::require_permission -party_id [auth::require_login] \ -object_id [cm::modules::get_module_id -module_name types -package_id [ad_conn package_id]] -privilege read @@ -13,7 +14,7 @@ -multirow rel_types \ -has_checkboxes \ -no_data "There are no item relation types registered to this content type." \ - -actions [list "Register a new item relation type" [export_vars -base relation-register?rel_type=item_rel {content_type}] "Register a new item relation type"] \ + -actions [list "Register a new item relation type" [export_vars -base relation-register?rel_type=item_rel {content_type type_props_tab}] "Register a new item relation type"] \ -elements { pretty_name { label "Related Object Type" @@ -43,7 +44,7 @@ -multirow child_types \ -has_checkboxes \ -no_data "There are no child relation types registered to this content type." \ - -actions [list "Register a new child relation type" [export_vars -base relation-register?rel_type=child_rel {content_type}] "Register a new child relation type"] \ + -actions [list "Register a new child relation type" [export_vars -base relation-register?rel_type=child_rel {content_type type_props_tab}] "Register a new child relation type"] \ -elements { pretty_name { label "Child Type" Index: openacs-4/packages/cms/www/modules/types/subtypes.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/subtypes.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/types/subtypes.adp 16 Nov 2004 22:32:52 -0000 1.1 +++ openacs-4/packages/cms/www/modules/types/subtypes.adp 16 May 2005 17:38:19 -0000 1.2 @@ -2,7 +2,7 @@

Subtypes of @object_type_pretty@
    -
  • +
  • @subtypes.pretty_name@
    • Index: openacs-4/packages/cms/www/modules/types/types-header.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/types-header.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/types/types-header.adp 16 May 2005 17:38:19 -0000 1.1 @@ -0,0 +1,10 @@ +

    + +@page_title;noquote@ +

    +     +

    + + + +

    \ No newline at end of file Index: openacs-4/packages/cms/www/modules/types/types-header.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/types-header.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/types/types-header.tcl 16 May 2005 17:38:19 -0000 1.1 @@ -0,0 +1,9 @@ +request create +request set_param content_type -datatype keyword -value content_revision +request set_param parent_type -datatype keyword -optional +request set_param mount_point -datatype keyword -value types +request set_param type_props_tab -datatype keyword -optional -value attributes + +# get the content type pretty name +set object_type_pretty [db_string get_object_type ""] +set page_title "Content Type - $object_type_pretty" \ No newline at end of file Index: openacs-4/packages/cms/www/modules/types/types-header.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/types-header.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/types/types-header.xql 16 May 2005 17:38:19 -0000 1.1 @@ -0,0 +1,18 @@ + + + + + + + select + pretty_name + from + acs_object_types + where + object_type = :content_type + + + + + + Index: openacs-4/packages/cms/www/modules/types/types-inheritance-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/types-inheritance-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/types/types-inheritance-oracle.xql 16 May 2005 17:38:19 -0000 1.1 @@ -0,0 +1,27 @@ + + + + oracle8.1.6 + + + + + select + decode (supertype, 'acs_object', '', supertype) as parent_type, + decode (object_type, 'content_revision', '', object_type) as object_type, + pretty_name + from + acs_object_types + where + object_type ^= 'acs_object' + connect by + object_type = prior supertype + start with + object_type = :content_type + order by + rownum desc + + + + + \ No newline at end of file Index: openacs-4/packages/cms/www/modules/types/types-inheritance-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/types-inheritance-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/types/types-inheritance-postgresql.xql 16 May 2005 17:38:19 -0000 1.1 @@ -0,0 +1,25 @@ + + + + postgresql7.1 + + + + + select + case when ot2.supertype = 'acs_object' then '' else ot2.supertype end as parent_type, + case when ot2.object_type = 'content_revision' then '' else ot2.object_type end as object_type, + ot2.pretty_name + from + (select * from acs_object_types where object_type = :content_type) ot1, + acs_object_types ot2 + where + ot2.object_type != 'acs_object' + and + ot1.tree_sortkey between ot2.tree_sortkey and tree_right(ot2.tree_sortkey) + order by ot2.tree_sortkey asc + + + + + \ No newline at end of file Index: openacs-4/packages/cms/www/modules/types/types-inheritance.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/types-inheritance.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/types/types-inheritance.adp 16 May 2005 17:38:19 -0000 1.1 @@ -0,0 +1,22 @@ + + + Inheritance:   + + Basic item + + + + + @content_type_tree.pretty_name;noquote@ + + + + + @content_type_tree.pretty_name;noquote@ + + + : + + + + \ No newline at end of file Index: openacs-4/packages/cms/www/modules/types/types-inheritance.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/types-inheritance.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/types/types-inheritance.tcl 16 May 2005 17:38:19 -0000 1.1 @@ -0,0 +1,5 @@ +request create +request set_param content_type -datatype text -value content_revision + +# get all the content types that this content type inherits from +db_multirow content_type_tree get_content_type "" \ No newline at end of file Index: openacs-4/packages/cms/www/modules/types/types-tabs.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/types-tabs.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/types/types-tabs.adp 16 May 2005 17:38:19 -0000 1.1 @@ -0,0 +1,62 @@ +

    \ No newline at end of file Index: openacs-4/packages/cms/www/modules/types/types-tabs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/types-tabs.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cms/www/modules/types/types-tabs.tcl 16 May 2005 17:38:19 -0000 1.1 @@ -0,0 +1,7 @@ +request create +request set_param content_type -datatype keyword -value content_revision +request set_param parent_type -datatype keyword -optional +request set_param mount_point -datatype keyword -value types +request set_param type_props_tab -datatype keyword -optional -value attributes + +set package_url [ad_conn package_url] Index: openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl 13 Apr 2005 20:15:19 -0000 1.4 +++ openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl 16 May 2005 17:38:19 -0000 1.5 @@ -9,9 +9,8 @@ db_transaction { - set module_id [db_string get_module_id ""] permission::require_permission -party_id [auth::require_login] \ - -object_id $module_id -privilege write + -object_id [cm::modules::get_module_id -module_name types -package_id [ad_conn package_id]] -privilege write db_exec_plsql unregister_mime_type {} Index: openacs-4/packages/cms/www/modules/types/unregister-mime-type.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/Attic/unregister-mime-type.xql,v diff -u -N --- openacs-4/packages/cms/www/modules/types/unregister-mime-type.xql 25 May 2001 23:49:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ - - - - - - - select module_id from cm_modules where key = 'types' - - - - - - Index: openacs-4/packages/cms/www/modules/types/widget-register.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/www/modules/types/widget-register.adp 22 May 2003 14:32:35 -0000 1.2 +++ openacs-4/packages/cms/www/modules/types/widget-register.adp 16 May 2005 17:38:19 -0000 1.3 @@ -1,19 +1,29 @@ Form Widget Wizard -

    Form Widget Wizard

    - + - - @wizard.rownum@. @wizard.label@ - - - @wizard.rownum@. @wizard.label@ - + - § - +
    -
    - +
    +
    Form Widget Wizard
    +

    + + + @wizard.rownum@. @wizard.label@ + + + @wizard.rownum@. @wizard.label@ + + § + + +

    + +
    + +
    + Index: openacs-4/packages/cms/www/modules/types/widget-register.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/cms/www/modules/types/widget-register.tcl 9 May 2005 23:27:04 -0000 1.7 +++ openacs-4/packages/cms/www/modules/types/widget-register.tcl 16 May 2005 17:38:19 -0000 1.8 @@ -22,6 +22,6 @@ 2 -label "Edit Widget Params" -url "widget-register-2" 3 -label "Preview Widget" -url "widget-register-3" } -wizard set_finish_url [export_vars -base index { { id $content_type } }] +wizard set_finish_url [export_vars -base index { { content_type $content_type } }] wizard get_current_step Index: openacs-4/packages/cms/www/modules/types/widget-unregister.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-unregister.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/cms/www/modules/types/widget-unregister.tcl 9 May 2005 23:27:04 -0000 1.5 +++ openacs-4/packages/cms/www/modules/types/widget-unregister.tcl 16 May 2005 17:38:19 -0000 1.6 @@ -11,4 +11,4 @@ } -template::forward index?id=$content_type +template::forward index?content_type=$content_type