Index: openacs-4/packages/theme-selva/theme-selva.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/theme-selva.info,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/theme-selva/theme-selva.info 24 Feb 2006 11:20:22 -0000 1.14.2.1
+++ openacs-4/packages/theme-selva/theme-selva.info 10 Mar 2006 11:12:09 -0000 1.14.2.2
@@ -8,13 +8,13 @@
<singleton-p>f</singleton-p>
<auto-mount>theme-selva</auto-mount>
- <version name="0.7d3" url="http://openacs.org/repository/download/apm/theme-selva-0.7d3.apm">
+ <version name="0.7d4" url="http://openacs.org/repository/download/apm/theme-selva-0.7d4.apm">
<owner url="http:/www.weg.ee.usyd.edu.au">Rafael Calvo</owner>
<release-date>2005-09-28</release-date>
<vendor url="http://www.weg.usyd.edu.au"></vendor>
<maturity>0</maturity>
- <provides url="theme-selva" version="0.7d3"/>
+ <provides url="theme-selva" version="0.7d4"/>
<callbacks>
</callbacks>
Index: openacs-4/packages/theme-selva/sql/oracle/theme-selva-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/sql/oracle/theme-selva-create.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/theme-selva/sql/oracle/theme-selva-create.sql 3 Mar 2006 12:39:49 -0000 1.1.2.1
+++ openacs-4/packages/theme-selva/sql/oracle/theme-selva-create.sql 10 Mar 2006 11:12:09 -0000 1.1.2.2
@@ -1,24 +1,22 @@
-- packages/theme-selva/sql/oracle/theme-selva-create.sql
--- Setting default template to Selva
-UPDATE apm_parameter_values
- SET attr_value = '/packages/theme-selva/www/selva-master'
- WHERE parameter_id IN (SELECT parameter_id FROM apm_parameters WHERE parameter_name='DefaultMaster');
-
--- Adding selva as new theme
declare
v_theme_id portal_element_themes.theme_id%TYPE;
begin
+ -- Adding selva as new theme
v_theme_id := portal_element_theme.new (
name => 'selva',
description => 'Selva Theme',
filename => '../../theme-selva/www/themes/selva-theme',
resource_dir => '../../theme-selva/www/themes/selva-theme'
);
+
+ -- Adding Selva to site-templates
+ insert into dotlrn_site_templates
+ (site_template_id, pretty_name, site_master, portal_theme_id)
+ values
+ (acs_object_id_seq.nextval, 'Selva Theme', '/packages/theme-selva/www/selva-master', v_theme_id);
+
end;
/
show errors
-
--- Setting portals theme to Selva
-UPDATE portals
- SET theme_id = (SELECT theme_id FROM portal_element_themes WHERE name='selva');
\ No newline at end of file
Index: openacs-4/packages/theme-selva/sql/oracle/theme-selva-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/sql/oracle/theme-selva-drop.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/theme-selva/sql/oracle/theme-selva-drop.sql 3 Mar 2006 12:39:49 -0000 1.1.2.1
+++ openacs-4/packages/theme-selva/sql/oracle/theme-selva-drop.sql 10 Mar 2006 11:12:09 -0000 1.1.2.2
@@ -1,22 +1,58 @@
-- packages/theme-selva/sql/oracle/theme-selva-drop.sql
--- reverting parameters to default
-UPDATE apm_parameter_values
- SET attr_value = '/packages/dotlrn/www/dotlrn-master'
- WHERE parameter_id IN (SELECT parameter_id FROM apm_parameters WHERE parameter_name='DefaultMaster');
+declare
--- setting sloan theme for all portals
-UPDATE portals
- SET theme_id = (SELECT theme_id FROM portal_element_themes WHERE name LIKE '%sloan%');
+ selva_site_template_id dotlrn_site_templates.site_template_id%TYPE;
+ sloan_site_template_id dotlrn_site_templates.site_template_id%TYPE;
+ selva_theme_id portal_element_themes.theme_id%TYPE;
+ sloan_theme_id portal_element_themes.theme_id%TYPE;
--- removing selva theme
-declare
- v_theme_id portal_element_themes.theme_id%TYPE;
begin
- SELECT theme_id INTO v_theme_id FROM portal_element_themes WHERE name='selva';
- DELETE FROM portal_element_themes WHERE theme_id = v_theme_id;
- acs_object.del(v_theme_id);
+ -- reverting selva site-templates to sloan
+
+ select site_template_id into selva_site_template_id
+ from dotlrn_site_templates
+ where pretty_name = 'Selva Theme';
+
+ select site_template_id into sloan_site_template_id
+ from dotlrn_site_templates
+ where pretty_name = '#new-portal.sloan_theme_name#';
+
+ update apm_parameter_values
+ set attr_value = sloan_site_template_id
+ where parameter_id in ( select parameter_id
+ from apm_parameters
+ where (parameter_name = 'CommDefaultSiteTemplate_p' or parameter_name = 'UserDefaultSiteTemplate_p') and attr_value = selva_site_template_id);
+
+ -- reverting to sloan for user/comm
+
+ update dotlrn_communities_all
+ set site_template_id = sloan_site_template_id
+ where site_template_id = selva_site_template_id;
+
+ update dotlrn_user_profile_rels
+ set site_template_id = sloan_site_template_id
+ where site_template_id = selva_site_template_id;
+
+ -- removing selva site-template
+
+ delete from dotlrn_site_templates where site_template_id = selva_site_template_id;
+
+ -- removing the Selva theme
+
+ select theme_id into selva_theme_id
+ from portal_element_themes
+ where name = 'selva';
+
+ select theme_id into sloan_theme_id
+ from portal_element_themes
+ where name = '#new-portal.sloan_theme_name#';
+
+ update portals set theme_id = sloan_theme_id where theme_id = selva_theme_id;
+ delete from portal_element_themes WHERE theme_id = selva_theme_id;
+ acs_object.del(selva_theme_id);
+
end;
/
-show errors
+show errors;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-selva/sql/oracle/upgrade/upgrade-0.7d3-0.7d4.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/theme-selva/sql/postgresql/theme-selva-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/sql/postgresql/theme-selva-create.sql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/theme-selva/sql/postgresql/theme-selva-create.sql 18 Sep 2005 11:43:28 -0000 1.3
+++ openacs-4/packages/theme-selva/sql/postgresql/theme-selva-create.sql 10 Mar 2006 11:12:10 -0000 1.3.2.1
@@ -1,3 +1,32 @@
-UPDATE apm_parameter_values SET attr_value = '/packages/theme-selva/www/selva-master' WHERE parameter_id IN (SELECT parameter_id FROM apm_parameters WHERE parameter_name='DefaultMaster');
+-- Creating theme Selva
+
SELECT portal_element_theme__new ('selva','Selva Theme','../../theme-selva/www/themes/selva-theme','../../theme-selva/www/themes/selva-theme');
-UPDATE portals SET theme_id = (SELECT theme_id FROM portal_element_themes WHERE name='selva');
\ No newline at end of file
+
+-- Adding site templates
+
+create function inline_0()
+returns integer as '
+declare
+ v_site_template_id dotlrn_site_templates.site_template_id%TYPE;
+ v_theme_id portal_element_themes.theme_id%TYPE;
+begin
+ select theme_id into v_theme_id
+ from portal_element_themes
+ where name = ''selva'';
+
+ select acs_object_id_seq.nextval
+ into v_site_template_id
+ from dual;
+
+ insert into dotlrn_site_templates
+ (site_template_id, pretty_name, site_master, portal_theme_id )
+ values
+ (v_site_template_id, ''Selva Theme'',''/packages/theme-selva/www/selva-master'', v_theme_id);
+
+ return v_site_template_id;
+
+end;' language 'plpgsql';
+
+select inline_0();
+
+drop function inline_0();
Index: openacs-4/packages/theme-selva/sql/postgresql/theme-selva-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/sql/postgresql/theme-selva-drop.sql,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/theme-selva/sql/postgresql/theme-selva-drop.sql 3 Mar 2006 13:53:27 -0000 1.2.2.1
+++ openacs-4/packages/theme-selva/sql/postgresql/theme-selva-drop.sql 10 Mar 2006 11:12:10 -0000 1.2.2.2
@@ -1,21 +1,61 @@
-UPDATE apm_parameter_values SET attr_value = '/packages/dotlrn/www/dotlrn-master' WHERE parameter_id IN (SELECT parameter_id FROM apm_parameters WHERE parameter_name='DefaultMaster');
-UPDATE portals SET theme_id = (SELECT theme_id FROM portal_element_themes WHERE name LIKE '%sloan%');
-
-create function inline_0 ()
+create function inline_0()
returns integer as '
-declare
- theme portal_element_themes.theme_id%TYPE;
+declare
+ selva_site_template_id dotlrn_site_templates.site_template_id%TYPE;
+ sloan_site_template_id dotlrn_site_templates.site_template_id%TYPE;
+ selva_theme_id portal_element_themes.theme_id%TYPE;
+ sloan_theme_id portal_element_themes.theme_id%TYPE;
begin
- SELECT theme_id INTO theme FROM portal_element_themes WHERE name=''selva'';
- DELETE FROM portal_element_themes WHERE theme_id = theme;
- perform acs_object__delete(theme);
-return 0;
+ -- reverting selva site-templates to sloan
+ select site_template_id into selva_site_template_id
+ from dotlrn_site_templates
+ where pretty_name = ''Selva Theme'';
+
+ select site_template_id into sloan_site_template_id
+ from dotlrn_site_templates
+ where pretty_name = ''#new-portal.sloan_theme_name#'';
+
+ update apm_parameter_values
+ set attr_value = sloan_site_template_id
+ where parameter_id in ( select parameter_id
+ from apm_parameters
+ where (parameter_name = ''CommDefaultSiteTemplate_p'' or parameter_name = ''UserDefaultSiteTemplate_p'') and attr_value = selva_site_template_id);
+
+ -- reverting to sloan for user/comm
+
+ update dotlrn_communities_all
+ set site_template_id = sloan_site_template_id
+ where site_template_id = selva_site_template_id;
+
+ update dotlrn_user_profile_rels
+ set site_template_id = sloan_site_template_id
+ where site_template_id = selva_site_template_id;
+
+ -- removing selva site-template
+
+ delete from dotlrn_site_templates where site_template_id = selva_site_template_id;
+
+ -- removing the Selva theme
+
+ select theme_id into selva_theme_id
+ from portal_element_themes
+ where name = ''selva'';
+
+ select theme_id into sloan_theme_id
+ from portal_element_themes
+ where name = ''#new-portal.sloan_theme_name#'';
+
+ update portals set theme_id = sloan_theme_id where theme_id = selva_theme_id;
+ delete from portal_element_themes WHERE theme_id = selva_theme_id;
+ perform acs_object__delete(selva_theme_id);
+
+ return sloan_site_template_id;
+
end;' language 'plpgsql';
select inline_0();
drop function inline_0();
-
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-selva/sql/postgresql/upgrade/upgrade-0.7d3-0.7d4.sql'.
Fisheye: No comparison available. Pass `N' to diff?