Index: openacs-4/packages/layout-manager/layout-manager.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/layout-manager.info,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/layout-manager.info 22 Jul 2008 07:31:01 -0000 1.1 +++ openacs-4/packages/layout-manager/layout-manager.info 30 Jul 2008 11:59:33 -0000 1.2 @@ -1,13 +1,13 @@ - + Layout Manager Layout Managers f - f + t - + Don Baccus Layout Manager 2008-07-15 @@ -24,17 +24,10 @@ - - - - - - - Index: openacs-4/packages/layout-manager/catalog/layout-manager.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/catalog/layout-manager.en_US.ISO-8859-1.xml,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/catalog/layout-manager.en_US.ISO-8859-1.xml 22 Jul 2008 07:31:01 -0000 1.1 +++ openacs-4/packages/layout-manager/catalog/layout-manager.en_US.ISO-8859-1.xml 30 Jul 2008 11:59:33 -0000 1.2 @@ -1,10 +1,6 @@ - Portal Plain - Portal Tabbed - Portal Nested Tabbed - One columns Two columns Three columns Index: openacs-4/packages/layout-manager/lib/column-configure.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/column-configure.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/column-configure.adp 22 Jul 2008 07:31:01 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/column-configure.adp 30 Jul 2008 11:59:33 -0000 1.2 @@ -1,43 +1,43 @@ -
-
-
-

@elements.title;noquote@

-
-
- - remove portlet - +
+
+
+

@elements.title;noquote@

+
+
+ + remove portlet + - - - move up - - + + + move up + + - - - move down - - + + + move down + + - - - move right - - + + + move right + + - - - move left - - -
-
-
-

-

Edit Properties
-

-

-
+ + + move left + + +
+
+
+

+

Edit Properties
+

+

+
Index: openacs-4/packages/layout-manager/lib/edit-element.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/edit-element.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/layout-manager/lib/edit-element.adp 30 Jul 2008 11:59:33 -0000 1.1 @@ -0,0 +1,4 @@ + + Edit Element + @context@ + Index: openacs-4/packages/layout-manager/lib/edit-element.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/edit-element.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/layout-manager/lib/edit-element.tcl 30 Jul 2008 11:59:33 -0000 1.1 @@ -0,0 +1,38 @@ +ad_page_contract { + + Edit the theme and title of an includelet. + + @author Don Baccus (dhogaza@pacifier.com) + @creation-date + @cvs-id $Id: edit-element.tcl,v 1.1 2008/07/30 11:59:33 donb Exp $ +} { + pageset_id:integer,notnull + element_id:integer,notnull + return_url:notnull +} + +permission::require_permission -object_id $pageset_id -privilege write + +set context [list "Edit Element"] + +set themes [concat [list [list "" ""]] [db_list_of_lists select_themes {}]] + +ad_form -export {pageset_id element_id return_url} -form { + {title:text,optional {label "Title"}} + {theme:text(select),optional + {label "Theme"} + {options $themes}} +} -on_request { + set title [layout::element::get_column_value -element_id $element_id -column title] + set theme [layout::element::get_column_value -element_id $element_id -column theme] +} -on_submit { + + layout::element::set_column_value -element_id $element_id -column title -value $title + layout::element::set_column_value -element_id $element_id -column theme -value $theme + layout::element::flush -element_id $element_id + + ad_returnredirect $return_url + ad_script_abort + +} +ad_return_template Index: openacs-4/packages/layout-manager/lib/edit-element.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/edit-element.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/layout-manager/lib/edit-element.xql 30 Jul 2008 11:59:33 -0000 1.1 @@ -0,0 +1,13 @@ + + + + + + + select description, name + from layout_themes + order by description + + + + Index: openacs-4/packages/layout-manager/lib/page-configure.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/page-configure.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/page-configure.adp 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/page-configure.adp 30 Jul 2008 11:59:33 -0000 1.2 @@ -81,19 +81,19 @@ - - - - - - -
- -
- + + + + + + +
+ +
+ Index: openacs-4/packages/layout-manager/lib/pageset-configure-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/pageset-configure-2.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/layout-manager/lib/pageset-configure-2.tcl 30 Jul 2008 11:59:33 -0000 1.1 @@ -0,0 +1,127 @@ +ad_page_contract { + Do the actual moving/removing of the elements, or redirect to add. + + @author Don Baccus + @creation-date 2/26/2004 + @cvs_id $Id: pageset-configure-2.tcl,v 1.1 2008/07/30 11:59:33 donb Exp $ +} { + pageset_id:integer,notnull + page_id:integer,optional + element_id:integer,optional + theme:optional + page_theme:optional + page_template:optional + name:notnull,optional + op:notnull + return_url:notnull + {anchor ""} +} + +permission::require_permission -object_id $pageset_id -privilege write + +switch $op { + + move_up { + layout::element::move \ + -page_id $page_id \ + -element_id $element_id \ + -direction up + } + + move_down { + layout::element::move \ + -page_id $page_id \ + -element_id $element_id \ + -direction down + } + + move_left { + layout::element::move \ + -page_id $page_id \ + -element_id $element_id \ + -direction left + } + + move_right { + layout::element::move \ + -page_id $page_id \ + -element_id $element_id \ + -direction right + } + + show_here { + db_transaction { + layout::element::move_to_page \ + -page_id $page_id \ + -element_id $element_id \ + -page_column 1 + layout::element::set_column_value \ + -element_id $element_id \ + -column state \ + -value full + } + } + + move_to_page { + layout::element::move_to_page \ + -page_id $page_id \ + -element_id $element_id \ + -page_column 1 + } + + hide { + layout::element::set_column_value \ + -element_id $element_id \ + -column state \ + -value hidden + } + + change_theme { + layout::pageset::set_column_value \ + -pageset_id $pageset_id \ + -column theme \ + -value $theme + } + + change_page_theme { + layout::page::set_column_value \ + -page_id $page_id \ + -column theme \ + -value $page_theme + } + + add_page { + layout::page::new -pageset_id $pageset_id -name $name + } + + remove_page { + layout::page::delete -page_id $page_id + } + + change_page_template { + layout::page::set_column_value \ + -page_id $page_id \ + -column page_template \ + -value $page_template + } + + rename_page { + layout::page::set_column_value -page_id $page_id -column name -value $name + } + + default { + ad_return_complaint 1 "\"$op\" is not a valid operator for portal configuration" + } +} + +# Flush the world. + +layout::pageset::flush -pageset_id $pageset_id +if { [exists_and_not_null page_id] } { + layout::page::flush -page_id $page_id +} +if { [exists_and_not_null element_id] } { + layout::element::flush -element_id $element_id +} + +ad_returnredirect $return_url Index: openacs-4/packages/layout-manager/lib/page-templates/simple.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/page-templates/simple.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/page-templates/simple.tcl 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/page-templates/simple.tcl 30 Jul 2008 11:59:33 -0000 1.2 @@ -10,7 +10,9 @@ element_list:onevalue } -set column_count [layout::page_template::get_column_value -name $page(page_template) -column columns] +set column_count [layout::page_template::get_column_value \ + -name $page(page_template) \ + -column columns] # The page(element_list) array only contains data for elements actually placed on # the page. We initialize the array elements of the regions array to the empty list Index: openacs-4/packages/layout-manager/lib/page-templates/simple1.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/page-templates/simple1.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/page-templates/simple1.adp 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/page-templates/simple1.adp 30 Jul 2008 11:59:33 -0000 1.2 @@ -4,7 +4,6 @@
Index: openacs-4/packages/layout-manager/lib/page-templates/simple2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/page-templates/simple2.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/page-templates/simple2.adp 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/page-templates/simple2.adp 30 Jul 2008 11:59:33 -0000 1.2 @@ -4,7 +4,6 @@
@@ -15,7 +14,6 @@
Index: openacs-4/packages/layout-manager/lib/page-templates/simple3.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/page-templates/simple3.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/page-templates/simple3.adp 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/page-templates/simple3.adp 30 Jul 2008 11:59:33 -0000 1.2 @@ -3,7 +3,6 @@
@@ -14,7 +13,6 @@
@@ -26,7 +24,6 @@
Index: openacs-4/packages/layout-manager/lib/render/render-element.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/render/render-element.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/render/render-element.tcl 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/render/render-element.tcl 30 Jul 2008 11:59:33 -0000 1.2 @@ -8,8 +8,6 @@ } -array set element [layout::element::get_render_data \ - -element_id $element_id \ - -edit_p $edit_p] +array set element [layout::element::get_render_data -element_id $element_id] set config $element(config) Index: openacs-4/packages/layout-manager/lib/render/render-page.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/render/render-page.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/render/render-page.adp 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/render/render-page.adp 30 Jul 2008 11:59:33 -0000 1.2 @@ -1,3 +1,3 @@ - + Index: openacs-4/packages/layout-manager/lib/render/render-pageset.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/render/render-pageset.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/render/render-pageset.adp 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/render/render-pageset.adp 30 Jul 2008 11:59:33 -0000 1.2 @@ -1 +1 @@ - + Index: openacs-4/packages/layout-manager/lib/render/render-pageset.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/lib/render/render-pageset.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/lib/render/render-pageset.tcl 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/lib/render/render-pageset.tcl 30 Jul 2008 11:59:33 -0000 1.2 @@ -1,5 +1,2 @@ -array set pageset [layout::pageset::get_render_data \ - -pageset_id $pageset_id \ - -page_num $page_num] - +array set pageset [layout::pageset::get_render_data -pageset_id $pageset_id -page_num $page_num] ad_return_template Index: openacs-4/packages/layout-manager/sql/postgresql/includelets-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/postgresql/includelets-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/sql/postgresql/includelets-create.sql 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/sql/postgresql/includelets-create.sql 30 Jul 2008 11:59:33 -0000 1.2 @@ -10,27 +10,26 @@ constraint l_includelets_name_pk primary key, title text default null, + description text, template text constraint l_includelets_template_nn not null, dotlrn_compat_p boolean constraint l_includelets_d_c_p_nn not null, - constructor text, - destructor text, - description text, + initializer text, required_privilege text default 'read', - datasource text - constraint l_includelets_ds_fk - references layout_datasources(name) + application text + constraint l_includelets_app_fk + references apm_package_types(package_key) on delete cascade - constraint l_includelets_ds_nn + constraint l_includelets_pp_nn not null ); -- indexes for referential integrity checking -create index l_includelets_datasource_idx on layout_includelets(datasource); +create index l_includelets_application_idx on layout_includelets(application); comment on table layout_includelets is ' A layout includelet is the package of code that generates the content of a layout @@ -51,25 +50,20 @@ user portlet and one admin portlet. '; -comment on column layout_includelets.datasource is ' - The package key of the datasource that this includelet works with. For instance the - forums layout includelet works with the forums package. +comment on column layout_includelets.application is ' + The package key of the application that this includelet works with. For instance the + forums includelet works with the forums package. '; 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. + The name of template that displays the layout includelet content. '; comment on column layout_includelets.dotlrn_compat_p is ' If true, pass the includelet params in an array named "cf", rather than pass them 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. -'; Index: openacs-4/packages/layout-manager/sql/postgresql/layout-manager-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/postgresql/layout-manager-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/sql/postgresql/layout-manager-create.sql 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/sql/postgresql/layout-manager-create.sql 30 Jul 2008 11:59:33 -0000 1.2 @@ -7,7 +7,6 @@ create sequence layout_seq; -\i datasources-create.sql \i includelets-create.sql \i page-templates-create.sql \i themes-create.sql Index: openacs-4/packages/layout-manager/sql/postgresql/layout-manager-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/postgresql/layout-manager-drop.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/sql/postgresql/layout-manager-drop.sql 22 Jul 2008 07:31:02 -0000 1.1 +++ openacs-4/packages/layout-manager/sql/postgresql/layout-manager-drop.sql 30 Jul 2008 11:59:33 -0000 1.2 @@ -8,6 +8,5 @@ \i themes-drop.sql \i page-templates-drop.sql \i includelets-drop.sql -\i datasources-drop.sql drop sequence layout_seq; Index: openacs-4/packages/layout-manager/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/tcl/apm-callback-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/tcl/apm-callback-procs.tcl 22 Jul 2008 07:31:03 -0000 1.1 +++ openacs-4/packages/layout-manager/tcl/apm-callback-procs.tcl 30 Jul 2008 11:59:33 -0000 1.2 @@ -28,7 +28,6 @@ layout::page_template::new \ -name 3_column\ -columns 3 \ - -description "Three columns" \ -description #layout-manager.simple_3column_layout_description# \ -template /packages/layout-manager/lib/page-templates/simple @@ -55,34 +54,5 @@ -name blank \ -description "No Graphics" \ -template /packages/layout-manager/lib/themes/blank - - # Now define a couple of datasource apps and includelets - - layout::datasource::new \ - -name layout_manager_includelets \ - -description "Layout Manager Includelets" \ - -package_key layout-manager \ - -constructor layout::datasource::constructor::closest_ancestor - - layout::includelet::new \ - -name layout_manager_admin_includelet \ - -description "Layout Manager Administration" \ - -title "Layout Manager Administration" \ - -datasource layout_manager_includelets \ - -template /packages/layout-manager/lib/layout-manager-admin-includelet \ - -required_privilege admin - - layout::datasource::new \ - -name subsite_includelets \ - -description "Subsite Includelets" \ - -package_key acs-subsite \ - -constructor layout::datasource::constructor::closest_ancestor - - layout::includelet::new \ - -name subsites_includelet \ - -description "Display Subsites" \ - -title "Subsites" \ - -datasource subsite_includelets \ - -template /packages/acs-subsite/lib/subsites } } Index: openacs-4/packages/layout-manager/tcl/element-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/tcl/element-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/tcl/element-procs.tcl 22 Jul 2008 07:31:03 -0000 1.1 +++ openacs-4/packages/layout-manager/tcl/element-procs.tcl 30 Jul 2008 11:59:33 -0000 1.2 @@ -34,7 +34,7 @@ @param includelet_name The layout manager includelet name @param name The name of the element @param parameters Optional args to set in array get format - @param initialize If set, call the layout manager's default constructor + @param initialize If set, call the layout manager's default initializer @param theme Override page and pageset theme if set @return The element_id of the new portlet @@ -70,8 +70,8 @@ -element_id $element_id \ -parameters $parameters - if { $initialize_p && $includelet(constructor) ne "" } { - $includelet(constructor) $element_id + if { $initialize_p && $includelet(initializer) ne "" } { + $includelet(initializer) $element_id } layout::page::flush -page_id $page_id @@ -326,13 +326,11 @@ ad_proc -private layout::element::get_render_data { -element_id:required - {-edit_p 0} } { Return all the good stuff a render template needs to render an element. @element_id The element in question @decorate_p If true decorate the element with the layout manager theme. - @edit_p If true the render template should show the shade and hide widgets } { Index: openacs-4/packages/layout-manager/tcl/includelet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/tcl/includelet-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/tcl/includelet-procs.tcl 22 Jul 2008 07:31:03 -0000 1.1 +++ openacs-4/packages/layout-manager/tcl/includelet-procs.tcl 30 Jul 2008 11:59:33 -0000 1.2 @@ -13,12 +13,11 @@ ad_proc layout::includelet::new { -name:required -title:required - -datasource:required + -application:required -template:required -description {-dotlrn_compat_p f} - {-constructor ""} - {-destructor ""} + {-initializer ""} {-required_privilege read} } { Create a new layout manager includelet. Index: openacs-4/packages/layout-manager/tcl/includelet-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/tcl/includelet-procs.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/layout-manager/tcl/includelet-procs.xql 22 Jul 2008 07:31:03 -0000 1.1 +++ openacs-4/packages/layout-manager/tcl/includelet-procs.xql 30 Jul 2008 11:59:33 -0000 1.2 @@ -5,11 +5,11 @@ insert into layout_includelets - (name, title, datasource, template, constructor, destructor, required_privilege, + (name, title, application, template, initializer, required_privilege, description, dotlrn_compat_p) values - (:name, :title, :datasource, :template, :constructor, :destructor, - :required_privilege, :description, :dotlrn_compat_p) + (:name, :title, :application, :template, :initializer, :required_privilege, + :description, :dotlrn_compat_p)