Index: openacs-4/packages/layout-manager/sql/oracle/elements-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/oracle/elements-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/sql/oracle/elements-create.sql 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/sql/oracle/elements-create.sql 3 Aug 2008 18:05:33 -0000 1.2 @@ -25,6 +25,12 @@ on delete cascade constraint l_elements_page_id_nn not null, + package_id integer + constraint l_elements_package_Id_fk + references apm_packages (package_id) + on delete cascade + constraint l_elements_package_Id_nn + not null, page_column integer constraint l_elements_column_nn not null, Index: openacs-4/packages/layout-manager/sql/oracle/includelets-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/oracle/includelets-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/sql/oracle/includelets-create.sql 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/sql/oracle/includelets-create.sql 3 Aug 2008 18:05:33 -0000 1.2 @@ -10,34 +10,33 @@ constraint l_includelets_name_pk primary key, title varchar(100) default null, + description varchar(1000), + template varchar(100) + constraint l_includelets_template_nn + not null, + dotlrn_compat_p char(1) + constraint layout_includelets_d_c_p_nn + not null + constraint layout_includelets_d_c_p_ck + check (dotlrn_compat_p in ('t', 'f')), + initializer varchar(100), + required_privilege varchar(20) default 'read', application varchar(100) constraint l_includelets_application_fk references apm_package_types (package_key) on delete cascade constraint l_includelets_app_nn not null, - owner varchar(100) - constraint l_includelets_owner_fk - references apm_package_types (package_key) - on delete cascade - constraint l_includelets_owner_nn - not null, - template varchar(100) - constraint l_includelets_template_nn - not null, - dotlrn_compat_p char(1) not null - constraint layout_includelets_d_c_p_ck - check (dotlrn_compat_p in ('t', 'f')), - constructor varchar(100), - destructor varchar(100), - description varchar(1000), - required_privilege varchar(20) default 'read' + internally_managed_p char(1) + constraint layout_includelets_i_m_p_nn + not null + constraint layout_includelets_i_m_p_ck + check (internally_managed_p in ('t', 'f')) ); -- indexes for referential integrity checking create index l_includelets_application_idx on layout_includelets(application); -create index l_includelets_owner_idx on layout_includelets(owner); comment on table layout_includelets is ' A layout includelet is the package of code that generates the content of a layout @@ -63,10 +62,6 @@ forums layout includelet works with the forums package. '; -comment on column layout_includelets.owner is ' - The package key of the package that implements this includelet. -'; - comment on column layout_includelets.template is ' The name of template that displays the layout includelet content. Note this is not a full path, layout templates go in the standard package template library directory. @@ -77,10 +72,14 @@ directly. '; -comment on column layout_includelets.constructor is ' - The name of an optional constructor to run after the default constructor. +comment on column layout_includelets.initializer is ' + The name of an optional initialization procedure to run after the default constructor. '; -comment on column layout_includelets.destructor is ' - The name of an optional constructor to run after the default destructor. +comment on column layout_includelets.internally_managed_p is ' + If true, external application/includelet managers (like layout-subsite-integration) should + ignore the existence of this includelet. While this was added explicitly to port the + rather quaint and eccentric xowiki portlet to the layout manager, which has its admin + portlet create layout elements via a dynamically generated form in a very non-.LRN + manner, it''s probably generally useful. '; Index: openacs-4/packages/layout-manager/sql/oracle/page-templates-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/oracle/page-templates-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/sql/oracle/page-templates-create.sql 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/sql/oracle/page-templates-create.sql 3 Aug 2008 18:05:33 -0000 1.2 @@ -28,5 +28,5 @@ '; comment on column layout_page_templates.template is ' - The path relative to layout/lib to the page template. + The path to the page template. '; Index: openacs-4/packages/layout-manager/sql/oracle/pageset-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/oracle/pageset-package-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/sql/oracle/pageset-package-create.sql 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/sql/oracle/pageset-package-create.sql 3 Aug 2008 18:05:33 -0000 1.2 @@ -6,7 +6,8 @@ p_package_id in apm_packages.package_id%TYPE, p_name in layout_pagesets.name%TYPE default 'Untitled', p_theme in layout_pagesets.theme%TYPE default null, - p_template_id in layout_pagesets.template_id%TYPE default null + p_template_id in layout_pagesets.template_id%TYPE default null, + p_context_id in acs_objects.context_id%TYPE ) return layout_pagesets.pageset_id%TYPE; procedure del ( @@ -34,7 +35,7 @@ v_pageset_id := acs_object.new( object_type => 'layout_pageset', - context_type => p_context_id + context_id => p_context_id ); insert into layout_pagesets Index: openacs-4/packages/layout-manager/sql/oracle/themes-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/oracle/themes-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/sql/oracle/themes-create.sql 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/sql/oracle/themes-create.sql 3 Aug 2008 18:05:33 -0000 1.2 @@ -17,5 +17,5 @@ '; comment on column layout_themes.template is ' - The path relative to the lib directory to the theme template + The path to the the theme template ';