Index: lams_build/conf/unix/lams/lams.xml
===================================================================
diff -u -rd2daae203e3abcbdd2c4d0c5fc60dc17eb81f00e -r06a2f477d985337243bd368cbd675d355e11bf0c
--- lams_build/conf/unix/lams/lams.xml (.../lams.xml) (revision d2daae203e3abcbdd2c4d0c5fc60dc17eb81f00e)
+++ lams_build/conf/unix/lams/lams.xml (.../lams.xml) (revision 06a2f477d985337243bd368cbd675d355e11bf0c)
@@ -41,5 +41,5 @@
admin
wildfire
default
- aqua
+ defaultHTML
\ No newline at end of file
Index: lams_build/conf/windows/lams/lams.xml
===================================================================
diff -u -rd2daae203e3abcbdd2c4d0c5fc60dc17eb81f00e -r06a2f477d985337243bd368cbd675d355e11bf0c
--- lams_build/conf/windows/lams/lams.xml (.../lams.xml) (revision d2daae203e3abcbdd2c4d0c5fc60dc17eb81f00e)
+++ lams_build/conf/windows/lams/lams.xml (.../lams.xml) (revision 06a2f477d985337243bd368cbd675d355e11bf0c)
@@ -41,5 +41,5 @@
admin
wildfire
default
- aqua
+ defaultHTML
\ No newline at end of file
Index: lams_common/db/sql/insert_users.sql
===================================================================
diff -u -r7d7b8f7f1cd8ecf626a061d9f6527c4bf7301dec -r06a2f477d985337243bd368cbd675d355e11bf0c
--- lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision 7d7b8f7f1cd8ecf626a061d9f6527c4bf7301dec)
+++ lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision 06a2f477d985337243bd368cbd675d355e11bf0c)
@@ -7,16 +7,9 @@
SET FOREIGN_KEY_CHECKS=0;
-- themes and styles
-INSERT INTO lams_css_style (style_id, theme_ve_id) VALUES (1,1);
-INSERT INTO lams_css_property (property_id, style_id, name, value, style_subset, type) VALUES (1, 1, "borderStyle", "outset", NULL, 1);
-INSERT INTO lams_css_property (property_id, style_id, name, value, style_subset, type) VALUES (2, 1, "color", "12452097", "_tf", 3);
-INSERT INTO lams_css_property (property_id, style_id, name, value, style_subset, type) VALUES (3, 1, "rollOverColor", "16711680", NULL, 2);
-
INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag) VALUES (1, "default", "Default Flash style", null, 1);
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag) VALUES (2, "ruby", "Incomplete style for Flash", null, 0);
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag) VALUES (3, "aqua", "JSP theme", null, 1);
+INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag) VALUES (2, "defaultHTML", "Default HTML style", null, 1);
-
insert into lams_workspace (workspace_id, name, default_fld_id) values(1,'ROOT',1);
insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(2,'Developers Playpen',2,22);
insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(3,'MATH111',3,23);
@@ -99,7 +92,7 @@
VALUES(1, 'sysadmin',SHA1('sysadmin'),'Mr','Fei','Yang',null,null,null,
'Sydney','NSW','Australia',null,null,null,null,'fyang@melcoe.mq.edu.au',
0,NOW(),1,null,
-1,1,3);
+1,1,2);
INSERT INTO lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,
city,state,country,day_phone,evening_phone,mobile_phone,fax,email,
@@ -108,7 +101,7 @@
VALUES(2, 'test',SHA1('test'),'Dr','Testing','LDAP',null,null,null,
'Sydney','NSW','Australia',null,null,null,null,'test@xx.xx.xx',
0,NOW(),3,null,
-3,1,3);
+3,1,2);
INSERT INTO lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,
city,state,country,day_phone,evening_phone,mobile_phone,fax,email,
@@ -117,7 +110,7 @@
VALUES(3, 'lamskh01',SHA1('dummy'),'Mr','Jacky','Fang',null,null,null,
'Sydney','NSW','Australia',null,null,null,null,'jfang@melcoe.mq.edu.au',
0,NOW(),2,null,
-1,1,3);
+1,1,2);
insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,
city,state,country,day_phone,evening_phone,mobile_phone,
@@ -128,7 +121,7 @@
(4,'mmm',SHA1('mmm'),'Ms','Mary','Morgan','99','First Ave',null,
'Parramatta','NSW','Australia','0295099999','0298939999','0499999999',
'0299999999','mmmmmmm@xx.os',
-0,'20041223',1,4,1,1,3);
+0,'20041223',1,4,1,1,2);
insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,
city,state,country,day_phone,evening_phone,mobile_phone,
@@ -139,7 +132,7 @@
(5,'test1',SHA1('test1'),'Dr','One','Test','1','Test Ave',null,
'Nowhere','NSW','Australia','0211111111','0211111112','0411111111',
'0211111113','test1@xx.os',
-0,'20041223',1,5,1,1,3);
+0,'20041223',1,5,1,1,2);
insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,
city,state,country,day_phone,evening_phone,mobile_phone,
@@ -150,7 +143,7 @@
(6,'test2',SHA1('test2'),'Dr','Two','Test','2','Test Ave',null,
'Nowhere','NSW','Australia','0211111111','0211111112','0411111111',
'0211111113','test2@xx.os',
-0,'20041223',1,6,1,1,3);
+0,'20041223',1,6,1,1,2);
insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,
city,state,country,day_phone,evening_phone,mobile_phone,
@@ -161,7 +154,7 @@
(7,'test3',SHA1('test3'),'Dr','Three','Test','3','Test Ave',null,
'Nowhere','NSW','Australia','0211111111','0211111112','0411111111',
'0211111113','test3@xx.os',
-0,'20041223',1,7,1,1,3);
+0,'20041223',1,7,1,1,2);
insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,
city,state,country,day_phone,evening_phone,mobile_phone,
@@ -172,7 +165,7 @@
(8,'test4',SHA1('test4'),'Dr','Four','Test','4','Test Ave',null,
'Nowhere','NSW','Australia','0211111111','0211111112','0411111111',
'0211111113','test4@xx.os',
-0,'20041223',1,8,1,1,3);
+0,'20041223',1,8,1,1,2);
--- sysadmin only belongs to root
INSERT INTO lams_user_organisation (user_organisation_id, organisation_id, user_id) VALUES (1, 1, 1);
Index: lams_common/db/sql/shaun/all.sql
===================================================================
diff -u -r4651f9860fe41e90fdda45bdeaf2a078ba1436dd -r06a2f477d985337243bd368cbd675d355e11bf0c
--- lams_common/db/sql/shaun/all.sql (.../all.sql) (revision 4651f9860fe41e90fdda45bdeaf2a078ba1436dd)
+++ lams_common/db/sql/shaun/all.sql (.../all.sql) (revision 06a2f477d985337243bd368cbd675d355e11bf0c)
@@ -7,7 +7,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (11,11);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(11,'bulgarian','bulgarian','Dr','Bulgarian','Test','11','Bulgarian Ave',null,'Sofia',null,'Bulgaria','0211111111','0211111112','0411111111','0211111113','bulgarian@xx.os',0,'20041223',1,11,1,3,14);
+values(11,'bulgarian','bulgarian','Dr','Bulgarian','Test','11','Bulgarian Ave',null,'Sofia',null,'Bulgaria','0211111111','0211111112','0411111111','0211111113','bulgarian@xx.os',0,'20041223',1,11,1,2,14);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -32,7 +32,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (12,12);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(12,'chinese','chinese','Dr','Chinese','Test','12','Chinese Ave',null,'Beijing',null,'China','0211111111','0211111112','0411111111','0211111113','chinese@xx.os',0,'20041223',1,12,1,3,5);
+values(12,'chinese','chinese','Dr','Chinese','Test','12','Chinese Ave',null,'Beijing',null,'China','0211111111','0211111112','0411111111','0211111113','chinese@xx.os',0,'20041223',1,12,1,2,5);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -58,7 +58,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (10,10);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(10,'french','french','Dr','French','Test','10','French Ave',null,'Paris',null,'France','0211111111','0211111112','0411111111','0211111113','french@xx.os',0,'20041223',1,10,1,3,6);
+values(10,'french','french','Dr','French','Test','10','French Ave',null,'Paris',null,'France','0211111111','0211111112','0411111111','0211111113','french@xx.os',0,'20041223',1,10,1,2,6);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -83,7 +83,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (13,13);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(13,'german','german','Dr','German','Test','13', 'German Ave',null,'Berlin',null,'Germany','0211111111','0211111112','0411111111','0211111113','german@xx.os',0,'20041223',1,13,1,3,4);
+values(13,'german','german','Dr','German','Test','13', 'German Ave',null,'Berlin',null,'Germany','0211111111','0211111112','0411111111','0211111113','german@xx.os',0,'20041223',1,13,1,2,4);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -108,7 +108,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (21,21);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(21,'hungarian','hungarian','Dr','Hungarian','Test','21', 'Hungarian Ave',null,'Bukarest',null,'Hungry','0211111111','0211111112','0411111111','0211111113','hungarian@xx.os',0,'20041223',1,21,1,3,13);
+values(21,'hungarian','hungarian','Dr','Hungarian','Test','21', 'Hungarian Ave',null,'Bukarest',null,'Hungry','0211111111','0211111112','0411111111','0211111113','hungarian@xx.os',0,'20041223',1,21,1,2,13);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -133,7 +133,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (16,16);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(16,'italian','italian','Dr','Italian','Test','16', 'Italian Ave',null,'Rome',null,'Italy','0211111111','0211111112','0411111111','0211111113','italian@xx.os',0,'20041223',1,16,1,3,7);
+values(16,'italian','italian','Dr','Italian','Test','16', 'Italian Ave',null,'Rome',null,'Italy','0211111111','0211111112','0411111111','0211111113','italian@xx.os',0,'20041223',1,16,1,2,7);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -159,7 +159,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (18,18);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(18,'korean','korean','Dr','Korean','Test','18', 'Korean Ave',null,'Seoul',null,'Korea','0211111111','0211111112','0411111111','0211111113','korean@xx.os',0,'20041223',1,18,1,3,10);
+values(18,'korean','korean','Dr','Korean','Test','18', 'Korean Ave',null,'Seoul',null,'Korea','0211111111','0211111112','0411111111','0211111113','korean@xx.os',0,'20041223',1,18,1,2,10);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -185,7 +185,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (20,20);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(20,'maori','maori','Dr','Maori','Test','20', 'Maori Ave',null,'Auckland',null,'New Zealand','0211111111','0211111112','0411111111','0211111113','maori@xx.os',0,'20041223',1,20,1,3,3);
+values(20,'maori','maori','Dr','Maori','Test','20', 'Maori Ave',null,'Auckland',null,'New Zealand','0211111111','0211111112','0411111111','0211111113','maori@xx.os',0,'20041223',1,20,1,2,3);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -210,7 +210,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (14,14);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(14,'norwegian','norwegian','Dr','Norwegian','Test','14', 'Norwegian Ave',null,'Oslo',null,'Norway','0211111111','0211111112','0411111111','0211111113','norwegian@xx.os',0,'20041223',1,14,1,3,8);
+values(14,'norwegian','norwegian','Dr','Norwegian','Test','14', 'Norwegian Ave',null,'Oslo',null,'Norway','0211111111','0211111112','0411111111','0211111113','norwegian@xx.os',0,'20041223',1,14,1,2,8);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -235,7 +235,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (17,17);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(17,'polish','polish','Dr','Polish','Test','17', 'Polish Ave',null,'Warsaw',null,'Poland','0211111111','0211111112','0411111111','0211111113','polish@xx.os',0,'20041223',1,17,1,3,11);
+values(17,'polish','polish','Dr','Polish','Test','17', 'Polish Ave',null,'Warsaw',null,'Poland','0211111111','0211111112','0411111111','0211111113','polish@xx.os',0,'20041223',1,17,1,2,11);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -261,7 +261,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (15,15);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(15,'portuguese','portuguese','Dr','Portuguese','Test','15', 'Portuguese Ave',null,'Brasilia',null,'Brazil','0211111111','0211111112','0411111111','0211111113','portuguese@xx.os',0,'20041223',1,15,1,3,12);
+values(15,'portuguese','portuguese','Dr','Portuguese','Test','15', 'Portuguese Ave',null,'Brasilia',null,'Brazil','0211111111','0211111112','0411111111','0211111113','portuguese@xx.os',0,'20041223',1,15,1,2,12);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -286,7 +286,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (19,19);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(19,'spanish','spanish','Dr','Spanish','Test','19', 'Spanish Ave',null,'Madrid',null,'Spain','0211111111','0211111112','0411111111','0211111113','spanish@xx.os',0,'20041223',1,19,1,3,2);
+values(19,'spanish','spanish','Dr','Spanish','Test','19', 'Spanish Ave',null,'Madrid',null,'Spain','0211111111','0211111112','0411111111','0211111113','spanish@xx.os',0,'20041223',1,19,1,2,2);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -312,7 +312,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (9,9);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(9,'swedish','swedish','Dr','Sweden','Test','9','Swedish Ave',null,'Stockholm',null,'Sweden','0211111111','0211111112','0411111111','0211111113','swedish@xx.os',0,'20041223',1,9,1,3,9);
+values(9,'swedish','swedish','Dr','Sweden','Test','9','Swedish Ave',null,'Stockholm',null,'Sweden','0211111111','0211111112','0411111111','0211111113','swedish@xx.os',0,'20041223',1,9,1,2,9);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -338,7 +338,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (24,24);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(24,'thai','thai','Dr','Thai','Test','24', 'Thai Ave',null,'Bangkok',null,'Thailand','0211111111','0211111112','0411111111','0211111113','thai@xx.os',0,'20041223',1,24,1,3,16);
+values(24,'thai','thai','Dr','Thai','Test','24', 'Thai Ave',null,'Bangkok',null,'Thailand','0211111111','0211111112','0411111111','0211111113','thai@xx.os',0,'20041223',1,24,1,2,16);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -364,7 +364,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (11,11);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(25,'greek','greek','Dr','Greek','Test','25','Greek Ave',null,'Athens',null,'Greece','0211111111','0211111112','0411111111','0211111113','greek@xx.os',0,'20041223',1,25,1,3,17);
+values(25,'greek','greek','Dr','Greek','Test','25','Greek Ave',null,'Athens',null,'Greece','0211111111','0211111112','0411111111','0211111113','greek@xx.os',0,'20041223',1,25,1,2,17);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -390,7 +390,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (11,11);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(26,'welsh','welsh','Dr','Welsh','Test','26','Welsh Ave',null,'Cardiff',null,'Wales','0211111111','0211111112','0411111111','0211111113','welsh@xx.os',0,'20041223',1,26,1,3,15);
+values(26,'welsh','welsh','Dr','Welsh','Test','26','Welsh Ave',null,'Cardiff',null,'Wales','0211111111','0211111112','0411111111','0211111113','welsh@xx.os',0,'20041223',1,26,1,2,15);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -412,7 +412,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (11,11);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(27,'dutch','dutch','Dr','Dutch','Test','26','Dutch Ave',null,'Amsterdam',null,'Netherlands','0211111111','0211111112','0411111111','0211111113','dutch@xx.os',0,'20041223',1,27,1,3,18);
+values(27,'dutch','dutch','Dr','Dutch','Test','26','Dutch Ave',null,'Amsterdam',null,'Netherlands','0211111111','0211111112','0411111111','0211111113','dutch@xx.os',0,'20041223',1,27,1,2,18);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -436,7 +436,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (11,11);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(28,'arabic','arabic','Dr','Arabic','Test','28','Arabic Ave',null,'Amman',null,'Jordan','0211111111','0211111112','0411111111','0211111113','arabic@xx.os',0,'20041223',1,28,1,3,19);
+values(28,'arabic','arabic','Dr','Arabic','Test','28','Arabic Ave',null,'Amman',null,'Jordan','0211111111','0211111112','0411111111','0211111113','arabic@xx.os',0,'20041223',1,28,1,2,19);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -459,7 +459,7 @@
--insert into lams_workspace_folder (workspace_id, workspace_folder_id) values (11,11);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
-values(29,'danish','danish','Dr','Danish','Test','29','Danish Ave',null,'Copenhagen',null,'Denmark','0211111111','0211111112','0411111111','0211111113','danish@xx.os',0,'20041223',1,29,1,3,20);
+values(29,'danish','danish','Dr','Danish','Test','29','Danish Ave',null,'Copenhagen',null,'Denmark','0211111111','0211111112','0411111111','0211111113','danish@xx.os',0,'20041223',1,29,1,2,20);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
@@ -483,7 +483,7 @@
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,
day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_id)
values(30,'russian','russian','Dr','Russian','Test','30','Russian Ave',null,'Moscow',null,'Russia',
-'0211111111','0211111112','0411111111','0211111113','russian@xx.os',0,'20041223',1,30,1,3,21);
+'0211111111','0211111112','0411111111','0211111113','russian@xx.os',0,'20041223',1,30,1,2,21);
-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
-- belongs to course Playpen, Class Everybody
Index: lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r06a2f477d985337243bd368cbd675d355e11bf0c
--- lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java (.../CSSThemeUtil.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java (.../CSSThemeUtil.java) (revision 06a2f477d985337243bd368cbd675d355e11bf0c)
@@ -50,6 +50,9 @@
{
CSSThemeBriefDTO theme = null;
+ String defaultTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
+ boolean userThemeIsDefault = false;
+
List themeList = new ArrayList();
HttpSession ss = SessionManager.getSession();
@@ -58,13 +61,22 @@
if ( user != null ) {
theme = user.getHtmlTheme();
- if (theme != null & theme.getName() != null)
- themeList.add(theme.getName());
+ if (theme != null ) {
+ String themeName = theme.getName();
+ if ( themeName != null) {
+ themeList.add(theme.getName());
+ if ( themeName.equals(defaultTheme) ) {
+ userThemeIsDefault = true;
+ }
+ }
+ }
}
}
- themeList.add("default");
+ if ( ! userThemeIsDefault ) {
+ themeList.add(defaultTheme);
+ }
return themeList;
}