You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2012/08/09 23:45:34 UTC
svn commit: r1371499 [2/3] - in /rave/branches/model-split: ./
rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/
rave-components/rave-core/src/test/resources/
rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/ r...
Modified: rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql Thu Aug 9 21:45:33 2012
@@ -69,7 +69,7 @@ INSERT INTO RAVE_PORTAL_SEQUENCES(seq_na
INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@page_user_seq, 1);
-- ***********************************************************************************
- -- start page layout data, required to make the portal work ---
+ -- start page layout data, required to make the portal work --
set @one_col_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_layout_seq);
insert into page_layout (entity_id, code, number_of_regions, render_sequence, user_selectable)
values (@one_col_id, 'columns_1', 1, 0, true);
@@ -115,77 +115,77 @@ insert into page_layout (entity_id, code
values (@person_profile_layout_id, 'person_profile', 1, 8, false);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_layout_seq;
---- end page layout data ----
+-- end page layout data ---
-- ***********************************************************************************
- --- start user data ---
+ -- start user data --
set @user_id_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name)
-values (@user_id_1, 'canonical', '$2a$10$TkEgze5kLy9nRlfd8PT1zunh6P1ND8WPjLojFjAMNgZMu1D9D1n4.', FALSE, FALSE, TRUE,'canonical@example.com', @three_col_id, 'User', 'Canonical User', 'User', 'Canonical');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name, status)
+values (@user_id_1, 'canonical', '$2a$10$TkEgze5kLy9nRlfd8PT1zunh6P1ND8WPjLojFjAMNgZMu1D9D1n4.', FALSE, FALSE, TRUE,'canonical@example.com', @three_col_id, 'User', 'Canonical User', 'User', 'Canonical', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_2 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name)
-values (@user_id_2, 'john.doe', '$2a$10$8Dir7boy3UyVqy6erfj6WuQXUTf.ejTldPSsVIty7.pPT3Krkly26', FALSE, FALSE, TRUE,'john.doe@example.com', @three_col_id, 'User', 'John Doe', 'Doe', 'John');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name, status)
+values (@user_id_2, 'john.doe', '$2a$10$8Dir7boy3UyVqy6erfj6WuQXUTf.ejTldPSsVIty7.pPT3Krkly26', FALSE, FALSE, TRUE,'john.doe@example.com', @three_col_id, 'User', 'John Doe', 'Doe', 'John', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_3 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name)
-values (@user_id_3, 'jane.doe', '$2a$10$YP9cjZEA.gG/ng2YwTBIyucMpuiQ7Fvz0K8rOt14rIBhVwlOrh1tu', FALSE, FALSE, TRUE,'jane.doe@example.net', @three_col_id, 'User', 'Jane Doe', 'Doe', 'Jane');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name, status)
+values (@user_id_3, 'jane.doe', '$2a$10$YP9cjZEA.gG/ng2YwTBIyucMpuiQ7Fvz0K8rOt14rIBhVwlOrh1tu', FALSE, FALSE, TRUE,'jane.doe@example.net', @three_col_id, 'User', 'Jane Doe', 'Doe', 'Jane', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_4 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name)
-values (@user_id_4, 'george.doe', '$2a$10$0bcOUkQgAwE/qmdc1NcUveNzx/IYIcOUu4ydyT8DEicTCxGJF/vcW', FALSE, FALSE, TRUE,'george.doe@example.org', @three_col_id, 'User', 'George Doe', 'Doe', 'George');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name, status)
+values (@user_id_4, 'george.doe', '$2a$10$0bcOUkQgAwE/qmdc1NcUveNzx/IYIcOUu4ydyT8DEicTCxGJF/vcW', FALSE, FALSE, TRUE,'george.doe@example.org', @three_col_id, 'User', 'George Doe', 'Doe', 'George', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_5 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name)
-values (@user_id_5,'mario.rossi', '$2a$10$HZ6WHAKQCs8waLooL98l6.fLzwh3D8u/V0.UebIjojawfXJhX1DQ2', FALSE, FALSE, TRUE,'mario.rossi@example.com', @three_col_id, 'User', 'Mario Rossi', 'Rossi', 'Mario');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name, status)
+values (@user_id_5,'mario.rossi', '$2a$10$HZ6WHAKQCs8waLooL98l6.fLzwh3D8u/V0.UebIjojawfXJhX1DQ2', FALSE, FALSE, TRUE,'mario.rossi@example.com', @three_col_id, 'User', 'Mario Rossi', 'Rossi', 'Mario', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_6 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name)
-values (@user_id_6, 'maija.m', '$2a$10$3feYdjrW40hkqP4/xupKP.YMgdYmDsZZus./vK4FbBs9QZG2.FuNC', FALSE, FALSE, TRUE,'maijam@example.com', @three_col_id, 'User', 'Maija M', 'M', 'Maija');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, display_name, family_name, given_name, status)
+values (@user_id_6, 'maija.m', '$2a$10$3feYdjrW40hkqP4/xupKP.YMgdYmDsZZus./vK4FbBs9QZG2.FuNC', FALSE, FALSE, TRUE,'maijam@example.com', @three_col_id, 'User', 'Maija M', 'M', 'Maija', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_7 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_7, 'one.col', '$2a$10$5VqE2YEqT75pCVjKqjP2b.gNGly9fsTVUOMQR/JEjkHSbqvA3A6IO', FALSE, FALSE, TRUE,'one.col@example.com', @three_col_id, 'User', 'Column', 'One');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_7, 'one.col', '$2a$10$5VqE2YEqT75pCVjKqjP2b.gNGly9fsTVUOMQR/JEjkHSbqvA3A6IO', FALSE, FALSE, TRUE,'one.col@example.com', @three_col_id, 'User', 'Column', 'One', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_8 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_8, 'twown.col', '$2a$10$Inpufv82TRUGYoPuXhYXVuMCKHkhLz44W6FijxW2e9n3T1hgyxcVq', FALSE, FALSE, TRUE,'twown.col@example.com', @three_col_id, 'User', 'Column', 'Two');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_8, 'twown.col', '$2a$10$Inpufv82TRUGYoPuXhYXVuMCKHkhLz44W6FijxW2e9n3T1hgyxcVq', FALSE, FALSE, TRUE,'twown.col@example.com', @three_col_id, 'User', 'Column', 'Two', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_9 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_9, 'three.col', '$2a$10$ImRXq4gFC9teBstOBdQrZeEwBkCAJ0S6.CwI9/9r7fxWKTZ30pgVC', FALSE, FALSE, TRUE,'three.col@example.com', @three_col_id, 'User', 'Column', 'Three');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_9, 'three.col', '$2a$10$ImRXq4gFC9teBstOBdQrZeEwBkCAJ0S6.CwI9/9r7fxWKTZ30pgVC', FALSE, FALSE, TRUE,'three.col@example.com', @three_col_id, 'User', 'Column', 'Three', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_10 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_10, 'threewn.col', '$2a$10$LLYTJoK6MCBpeDBbmdt7tu1LNt7Eenqe1IpMlfem8xVjzynn.HpxW', FALSE, FALSE, TRUE,'threewn.col@example.com', @three_col_id, 'User', 'ColumnWide', 'Three');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_10, 'threewn.col', '$2a$10$LLYTJoK6MCBpeDBbmdt7tu1LNt7Eenqe1IpMlfem8xVjzynn.HpxW', FALSE, FALSE, TRUE,'threewn.col@example.com', @three_col_id, 'User', 'ColumnWide', 'Three', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_11 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_11, 'four.col', '$2a$10$tZgWcaG2EJPLtseZ339n7uTu3GZn31h3iTr20orwgbbRAI15uoIFK', FALSE, FALSE, TRUE,'four.col@example.com', @three_col_id, 'User', 'Column', 'Four');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_11, 'four.col', '$2a$10$tZgWcaG2EJPLtseZ339n7uTu3GZn31h3iTr20orwgbbRAI15uoIFK', FALSE, FALSE, TRUE,'four.col@example.com', @three_col_id, 'User', 'Column', 'Four', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_12 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_12, 'fourwn.col', '$2a$10$4kPYhgowurWqXGVDigxOxOVj/M.rqLRwqbn0kT/OD4pISL6pDG/c2', FALSE, FALSE, TRUE,'fourwn.col@example.com', @three_col_id, 'User', 'ColumnWide', 'Four');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_12, 'fourwn.col', '$2a$10$4kPYhgowurWqXGVDigxOxOVj/M.rqLRwqbn0kT/OD4pISL6pDG/c2', FALSE, FALSE, TRUE,'fourwn.col@example.com', @three_col_id, 'User', 'ColumnWide', 'Four', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
-- duplicate user id!!
set @user_id_13 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_13, 'http://rave2011.myopenid.com/', '$2a$10$dML97.rnOn4.iSlEEdju8OCB2NckuKw0Ki5yMVzzMmWQsWMvym3qC', FALSE, FALSE, TRUE,'rave2011_openid@example.org', @three_col_id, 'User', 'OpenId', 'Rave');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_13, 'http://rave2011.myopenid.com/', '$2a$10$dML97.rnOn4.iSlEEdju8OCB2NckuKw0Ki5yMVzzMmWQsWMvym3qC', FALSE, FALSE, TRUE,'rave2011_openid@example.org', @three_col_id, 'User', 'OpenId', 'Rave', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
---- end user data ---
+-- end user data --
-- user association data --
set @next_person_association = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @person_association_seq);
@@ -246,7 +246,7 @@ INSERT INTO group_members(group_id, pers
VALUES (@group_id_2, @user_id_2);
-- end group members data --
---- gadget data ---
+-- gadget data --
-- wikipedia widget
set @wikipedia_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @widget_seq);
insert into widget (entity_id, title, url, type, description, author, widget_status, title_url, author_email, owner_id)
@@ -283,12 +283,6 @@ insert into widget (entity_id, title, ur
values(@another_hamster_widget_id, 'Herbie Hamster Virtual Pet', 'http://hosting.gmodules.com/ig/gadgets/file/109548057311228444554/hamster.xml', 'OpenSocial', 'A cute little hamster for you to feed and look after. Watch him follow your cursor around. Click on the more tab to treat him to a strawberry. Click him then put him on the wheel and watch him play! ***NEW: make Herbie hamster your very own!', 'Naj', 'PUBLISHED', 'http://sites.google.com/site/najartsist/pets-1/herbiet.png', 'http://sites.google.com/site/najartsist/herbie-hamster/herbie.png', @user_id_1);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @widget_seq;
--- slideshare widget
-set @gifts_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @widget_seq);
-insert into widget (entity_id, title, url, type, widget_status, owner_id)
-values(@gifts_widget_id, 'Gifts', 'http://opensocial-resources.googlecode.com/svn/samples/tutorial/tags/api-0.8/gifts_1_friends.xml', 'OpenSocial', 'PUBLISHED', @user_id_1);
-UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @widget_seq;
-
-- demo widgets from rave-demos
-- CTSS resource google map
set @ctss_resources_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @widget_seq);
@@ -423,7 +417,7 @@ values(@friends_widget_id, 'Friends', 'h
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @widget_seq;
--- end gadget data ----
+-- end gadget data ---
-- W3C Widget data
@@ -437,18 +431,18 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- User layouts
---- Layout for user_id_1 ---
+-- Layout for user_id_1 --
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_1_id, 'Main', @user_id_1, null, @newuser_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data
+-- Set up page user data
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_1_id, @user_id_1, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data
+-- end page user data
set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -496,12 +490,12 @@ INSERT INTO page (entity_id, name, owner
values (@page_2_id, 'Social', @user_id_1, null, @two_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data
+-- Set up page user data
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_2_id, @user_id_1, true, 2, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data
+-- end page user data
set @page_2_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -530,20 +524,20 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- person profile page for user 1
---- End canonical user_id_1 layout ---
+-- End canonical user_id_1 layout --
---- Layout for user_id_2 ---
+-- Layout for user_id_2 --
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_1_id, 'Main', @user_id_2, null, @newuser_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_1_id, @user_id_2, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -579,20 +573,20 @@ set @next_region_widget = (SELECT seq_co
INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End john.doe user_id_2 layout ---
+-- End john.doe user_id_2 layout --
---- Layout for user_id_3 ---
+-- Layout for user_id_3 --
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_1_id, 'Main', @user_id_3, null, @newuser_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_1_id, @user_id_3, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -628,47 +622,47 @@ set @next_region_widget = (SELECT seq_co
INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End jane.doe user_id_3 layout ---
+-- End jane.doe user_id_3 layout --
---- Layout for user_id_4 ---
+-- Layout for user_id_4 --
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_1_id, 'Main', @user_id_4, null, @two_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_1_id, @user_id_4, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
---- End user_id_4 layout ---
+-- End page user data--
+-- End user_id_4 layout --
---- Layout for user_id_5 ---
----set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
----INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
----values (@page_1_id, 'Main', @user_id_5, null, @two_col_id, 'USER');
----UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
----set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
----insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
----values (@page_user_id, @page_1_id, @user_id_5, true, 1, 'OWNER');
----UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
---- End user_id_5 layout ---
+-- Layout for user_id_5 --
+-- Set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
+-- INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
+-- values (@page_1_id, 'Main', @user_id_5, null, @two_col_id, 'USER');
+-- UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
+-- Set up page user data--
+-- Set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+-- insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+-- values (@page_user_id, @page_1_id, @user_id_5, true, 1, 'OWNER');
+-- UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+-- End page user data--
+-- End user_id_5 layout --
---- Layout for user_id_6 ---
+-- Layout for user_id_6 --
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_1_id, 'Main', @user_id_6, null, @two_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_1_id, @user_id_6, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -700,19 +694,19 @@ set @next_region_widget = (SELECT seq_co
INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
values (@next_region_widget, @tabnews_widget_id, @page_1_region_2, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End user_id_6 layout ---
+-- End user_id_6 layout --
---- Layout for user_id_7 ---
+-- Layout for user_id_7 --
set @page_7_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_7_id, 'Main', @user_id_7, null, @one_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_7_id, @user_id_7, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_7_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -729,19 +723,19 @@ set @next_region_widget = (SELECT seq_co
INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
values (@next_region_widget, @tabnews_widget_id, @page_7_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End asgoyal.one user_id_7 layout ---
+-- End asgoyal.one user_id_7 layout --
---- Layout for user_id_8 ---
+-- Layout for user_id_8 --
set @page_8_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_8_id, 'Main', @user_id_8, null, @twown_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_8_id, @user_id_8, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_8_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -772,19 +766,19 @@ set @next_region_widget = (SELECT seq_co
INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
values (@next_region_widget, @translate_widget_id, @page_8_region_2, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End asgoyal.twown user_id_8 layout ---
+-- End asgoyal.twown user_id_8 layout --
---- Layout for user_id_9 ---
+-- Layout for user_id_9 --
set @page_9_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_9_id, 'Main', @user_id_9, null, @three_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_9_id, @user_id_9, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_9_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -820,19 +814,19 @@ set @next_region_widget = (SELECT seq_co
INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
values (@next_region_widget, @translate_widget_id, @page_9_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End asgoyal.three user_id_9 layout ---
+-- End asgoyal.three user_id_9 layout --
---- Layout for user_id_10 ---
+-- Layout for user_id_10 --
set @page_10_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_10_id, 'Main', @user_id_10, null, @threewn_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_10_id, @user_id_10, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_10_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -868,19 +862,19 @@ set @next_region_widget = (SELECT seq_co
INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
values (@next_region_widget, @translate_widget_id, @page_10_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End asgoyal.threewn user_id_10 layout ---
+-- End asgoyal.threewn user_id_10 layout --
---- Layout for user_id_11 ---
+-- Layout for user_id_11 --
set @page_11_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_11_id, 'Main', @user_id_11, null, @four_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_11_id, @user_id_11, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_11_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -922,19 +916,19 @@ INSERT INTO region_widget(entity_id, wid
values (@next_region_widget, @translate_widget_id, @page_11_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End asgoyal.four user_id_11 layout ---
+-- End asgoyal.four user_id_11 layout --
---- Layout for user_id_12 ---
+-- Layout for user_id_12 --
set @page_12_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_12_id, 'Main', @user_id_12, null, @fourwn_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_12_id, @user_id_12, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_12_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -975,19 +969,19 @@ set @next_region_widget = (SELECT seq_co
INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
values (@next_region_widget, @translate_widget_id, @page_12_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End asgoyal.fourwn user_id_12 layout ---
+-- End asgoyal.fourwn user_id_12 layout --
---- Layout for user_id_13 ---
+-- Layout for user_id_13 --
set @page_13_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
values (@page_13_id, 'Main', @user_id_13, null, @fourwn_col_id, 'USER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
---Set up page user data--
+-- Set up page user data--
set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
values (@page_user_id, @page_13_id, @user_id_13, true, 1, 'OWNER');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
---end page user data--
+-- End page user data--
set @page_13_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
INSERT INTO region(entity_id, page_id, render_order, locked)
@@ -1028,7 +1022,7 @@ set @next_region_widget = (SELECT seq_co
INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
values (@next_region_widget, @translate_widget_id, @page_13_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
---- End openid user_id_13 layout ---
+-- End openid user_id_13 layout --
-- authorities
set @user_authority_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @granted_authority_seq);
@@ -1075,21 +1069,21 @@ values (@user_id_13, @user_authority_id)
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'titleSuffix');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, ' - Rave');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'pageSize');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, '10');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'javaScriptDebugMode');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, '1');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
-- end portal preferences
@@ -1130,10 +1124,9 @@ values (@wikipedia_widget_id, @category_
insert into widget_category (widget_id, category_id)
values (@nyt_widget_id, @category_id2);
-----------------------------------------
-- person profile parent page templates
-----------------------------------------
--- page
+
+-- page
set @person_profile_page_template_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_template_seq);
insert into page_template (entity_id, page_type, page_layout_id, name, description, parent_page_template_id, render_sequence, default_template)
values (@person_profile_page_template_id, 'PERSON_PROFILE', @person_profile_layout_id, 'Person Profile', 'Template for person profile pages', null, 0, true);
@@ -1156,10 +1149,10 @@ insert into page_template_widget (entity
values (@next_person_profile_page_template_widget_id, @person_profile_page_template_region_id, 1, @my_experience_widget_id, true, true);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_template_widget_seq;
-------------------------------------------
+
-- person profile about sub page templates
-------------------------------------------
--- page
+
+-- page
set @person_profile_subpage1_template_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_template_seq);
insert into page_template (entity_id, page_type, page_layout_id, name, description, parent_page_template_id, render_sequence, default_template)
values (@person_profile_subpage1_template_id, 'SUB_PAGE', @one_col_id, 'About', 'Template for the About sub page for the person profile', @person_profile_page_template_id, 0, false);
@@ -1182,9 +1175,8 @@ insert into page_template_widget (entity
values (@next_person_profile_subpage1_template_widget_id, @person_profile_subpage1_template_region_id, 1, @schedule_widget_id, true, false);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_template_widget_seq;
---------------------------------------------------
-- person profile my activities sub page templates
---------------------------------------------------
+
-- page
set @person_profile_subpage2_template_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_template_seq);
insert into page_template (entity_id, page_type, page_layout_id, name, description, parent_page_template_id, render_sequence, default_template)
Modified: rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp Thu Aug 9 21:45:33 2012
@@ -22,8 +22,17 @@
<fmt:message key="page.addwidget.title" var="pagetitle"/>
<rave:navbar pageTitle="${pagetitle}"/>
-<div class="container">
- <h2><fmt:message key="page.addwidget.form.header"/></h2>
+<div class="container-fluid navbar-spacer">
+ <div class="row-fluid">
+ <ul class="nav nav-tabs">
+ <li class="active"><a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}" />">OpenSocial</a></li>
+ <li><a href="<spring:url value="/app/store/widget/add/w3c?referringPageId=${referringPageId}" />">W3C</a></li>
+
+ <c:if test="${not empty marketplace}">
+ <li><a href="<spring:url value="/app/marketplace?referringPageId=${referringPageId}" />">Marketplace</a></li>
+ </c:if>
+ </ul>
+
<form:errors path="widget" cssClass="error" element="p"/>
<form:form cssClass="form-horizontal" id="newWidgetForm" action="add?referringPageId=${referringPageId}" commandName="widget" method="POST">
<fieldset>
@@ -38,28 +47,14 @@
</spring:bind>
<form:errors path="url" cssClass="error"/>
</div>
-
- <div class="control-group">
- <label class="control-label" for="type1"><fmt:message key="widget.type"/> *</label>
- </div>
- <div class="control-group">
- <label class="control-label" for="type1"><fmt:message key="widget.type.OpenSocial"/></label>
- <div class="controls"><form:radiobutton path="type" value="OpenSocial"/></div>
- </div>
- <div class="control-group">
- <label class="control-label" for="type2"><fmt:message key="widget.type.W3C"/></label>
-
- <div class="controls"><form:radiobutton path="type" value="W3C"/>
- <a id="w3cBrowseLink" style="margin-left: 10px;" href="#"><fmt:message key="page.general.browse"/></a>
- </div>
- <form:errors path="type" cssClass="error"/>
- </div>
+
+ <form:hidden path="type" value="OpenSocial"/>
<a href="#" class="btn btn-primary"
id="fetchMetadataButton"
onclick="rave.api.rpc.getWidgetMetadata({
url: $('#url').get(0).value,
- providerType: $('input:radio[name=type]:checked').val(),
+ providerType: 'OpenSocial',
successCallback: function(result) {
var widget = result.result;
$('#title').val(widget.title);
@@ -71,12 +66,6 @@
$('#authorEmail').val(widget.authorEmail);
$('#addWidgetForm').show();
$('#addWidgetFormSubmit').show();
- // update this field so we can pass widgets by key
- // (soon to be superseeded in wookie by using the guid instead)
- // remove when using 0.10.0 of wookie
- if($('input[name=type]:checked').val()=='W3C'){
- $('#url').val(widget.url);
- }
}
});">
<fmt:message key="page.getWidgetMetadata.button"/>
@@ -84,7 +73,6 @@
<div class="row clearfix" id="addWidgetForm">
-
<div class="control-group">
<form:label cssClass="control-label" path="title"> <fmt:message key="widget.title"/> *</form:label>
<div class="controls">
@@ -152,10 +140,6 @@
</div>
</form:form>
</div>
-<div id="w3cBrowseForm" title="<fmt:message key="page.general.browse"/>">
- <ul id="w3cwidgetsList" class="storeItems">
- </ul>
-</div>
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
@@ -163,154 +147,9 @@
if ($('#url').val().length === 0) {
$('#addWidgetForm').hide();
$('#addWidgetFormSubmit').hide();
- $('input[name=type]:first').attr('checked', true);
- }
- if ($('input[name=type]:checked').val() != 'W3C') {
- $('#w3cBrowseLink').hide();
}
- $('input[name=type]').change(function(){
- if($('input[name=type]:checked').val()=='W3C'){
- $('#w3cBrowseLink').show();
- }
- else{
- $('#w3cBrowseLink').hide();
- }
- });
-
- $("#w3cBrowseForm").dialog({
- autoOpen: false,
- height: 300,
- width: 350,
- modal: true,
- buttons: {
- Cancel: function(){
- $(this).dialog("close");
- }
- },
- close: function(){
- // clear contents
- $('#w3cwidgetsList').empty();
- }
- });
-
- $("#w3cBrowseLink").click(function() {
- rave.api.rpc.getWidgetMetadataGroup({
- url: "?all=true",
- providerType: "W3C",
- successCallback: function(result) {
- var i=0;
- var widgets = result.result;
- PostLoadW3cWidgets.setList(widgets);
- jQuery.each(widgets, function() {
- $('#w3cwidgetsList')
- .append(
- $("<li/>")
- .addClass("storeItem")
- .append( // container
- $("<div/>")
- .css('overflow','hidden')
- .append(
- $("<div/>")
- .css('float','left')
- .css('width','50%')
- .append(
- $("<div/>")
- .attr("id", "w3cImageHolder"+i)
- )
- .append(
- $("<div/>")
- .attr("id", "widgetAdded")
- .addClass("storeButton")
- .append(
- $("<button/>")
- .addClass("btn btn-small btn-primary")
- .attr("id", this.url)
- .attr("onclick", "updateRaveMetadata("+i+");")
- .text(rave.getClientMessage("get.metadata"))
- )
- )
- )
- .append(
- $("<div/>")
- .css('float','left')
- .css('width','50%')
- .css('margin-right','-1px')
- .append(
- $("<div/>")
- .addClass("secondaryPageItemTitle")
- .css('padding', '2px')
- .text(this.title)
- )
- .append(
- $("<div/>")
- .addClass("storeWidgetAuthor")
- .css('padding', '2px')
- .text(this.author)
- )
- .append(
- $("<div/>")
- .addClass("storeWidgetDesc")
- .css('padding', '2px')
- .text(this.description)
- )
- )
- .append(
- $("<div/>")
- .addClass("clear-float")
- )
- )
- )
- // add the thumbnail image if found
- if(this.thumbnailUrl!=null){
- $('#w3cImageHolder'+i)
- .append(
- $("<img/>")
- .addClass("storeWidgetThumbnail")
- .attr("src", this.thumbnailUrl)
- .attr("title", this.title)
- .attr("alt", "")
- .attr("width", "80")
- .attr("height", "80")
- )
- }
- i++;
- });
- $("#w3cBrowseForm").dialog("open");
- }
- })
- });
- });
- // use this object to hold the choices of w3c widgets after the page has loaded.
- var PostLoadW3cWidgets = new function PostLoadW3cWidgets() {
- this.list = null;
- this.setList = function (list) {
- this.list = list;
- }
- this.getList = function () {
- return this.list;
- }
- this.getListItemByIndex = function(idx){
- return this.list[idx];
- }
- }
-
- function updateRaveMetadata(id){
- if(id != null){
- widget = PostLoadW3cWidgets.getListItemByIndex(id);
- $('#title').val(widget.title);
- $('#description').val(widget.description);
- $('#thumbnailUrl').val(widget.thumbnailUrl);
- $('#screenshotUrl').val(widget.screenshotUrl);
- $('#titleUrl').val(widget.titleUrl);
- $('#author').val(widget.author);
- $('#authorEmail').val(widget.authorEmail);
- $('#url').val(widget.url);
- $('#addWidgetForm').show();
- $('#addWidgetFormSubmit').show();
- }
- $("#w3cBrowseForm").dialog("close");
- }
+ });
</script>
</portal:register-init-script>
Modified: rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp Thu Aug 9 21:45:33 2012
@@ -77,6 +77,29 @@
<form:errors path="javaScriptDebugMode.value" cssClass="error"/>
</spring:bind>
</div>
+ <div class="control-group">
+ <spring:bind path="initialWidgetStatus.value">
+ <form:label path="initialWidgetStatus.value" class="control-label">
+ <fmt:message key="admin.preferencedetail.initialWidgetStatus"/> *
+ </form:label>
+ <div class="controls">
+ <form:select id="initialWidgetStatus" path="initialWidgetStatus.value">
+ <form:option value="PREVIEW"><fmt:message key="admin.preferencedetail.initialWidgetStatus.preview"/></form:option>
+ <form:option value="PUBLISHED"><fmt:message key="admin.preferencedetail.initialWidgetStatus.published"/></form:option>
+ </form:select>
+ </div>
+ <form:errors path="initialWidgetStatus.value" cssClass="error"/>
+ </spring:bind>
+ </div>
+ <div class="control-group">
+ <form:label path="externalMarketplaceUrl.value" class="control-label">
+ <fmt:message key="admin.preferencedetail.externalMarketplaceUrl"/>
+ </form:label>
+ <div class="controls">
+ <form:input path="externalMarketplaceUrl.value"/>
+ </div>
+ <form:errors path="externalMarketplaceUrl.value" cssClass="error"/>
+ </div>
<fieldset>
<fmt:message key="admin.preferencedetail.updateButton" var="updateButtonText"/>
<button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
Modified: rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp Thu Aug 9 21:45:33 2012
@@ -103,8 +103,19 @@
<div class="controls"><form:input id="displayNameField" path="displayName" autofocus="autofocus"/></div>
</div>
<div class="control-group">
- <label class="control-label" for="statusField"><fmt:message key="page.general.status"/></label>
- <div class="controls"><form:input id="statusField" path="status" autofocus="autofocus"/></div>
+ <label class="control-label" for="statusField"><fmt:message key="page.general.relation.status"/></label>
+ <div class="controls">
+ <form:select path="status" id="statusField">
+ <fmt:message key="page.general.relation.single" var="singleText"/>
+ <form:option value="${singleText}" id="single_id">${singleText}</form:option>
+ <fmt:message key="page.general.relation.committed" var="committedText"/>
+ <form:option value="${committedText}" id="committed_id">${committedText}</form:option>
+ <fmt:message key="page.general.relation.married" var="marriedText"/>
+ <form:option value="${marriedText}" id="married_id">${marriedText}</form:option>
+ <fmt:message key="page.general.relation.other" var="otherText"/>
+ <form:option value="${otherText}" id="other_id">${otherText}</form:option>
+ </form:select>
+ </div>
</div>
<div class="control-group">
<label class="control-label" for="aboutMeField"><fmt:message key="page.general.about.me"/></label>
Modified: rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp Thu Aug 9 21:45:33 2012
@@ -26,144 +26,95 @@
<tiles:importAttribute name="pageTitleKey" scope="request"/>
<tiles:putAttribute name="body">
- <div class="container">
+
+ <rave:login_navbar hideButton="loginButton" />
+
+ <div class="container-fluid">
<c:if test="${not empty message}">
<div class="alert alert-info">${message}</div>
</c:if>
-
+
<h1><fmt:message key="${pageTitleKey}"/></h1>
-
-
- <div class="row well">
- <div class="span6">
+ <div class="row-fluid" id="loginOptions">
+ <div id="loginBlock" class="clearfix well">
+ <div class="span6">
<%--
//############################################
// LOGIN FORM
//############################################
--%>
- <form class="form-horizontal" id="loginForm" name="loginForm" action="j_spring_security_check" method="post">
-
- <c:if test="${param['authfail'] eq 'form'}">
- <p class="error"><fmt:message key="page.login.usernamepassword.fail"/></p>
- </c:if>
- <fieldset>
- <legend><fmt:message key="page.login.usernamepassword"/></legend>
- <div class="control-group">
- <label class="control-label" for="usernameField"><fmt:message key="page.general.username"/></label>
- <div class="controls">
- <input class="input-large" id="usernameField" type="text" name="j_username" autofocus="autofocus"/>
- </div>
- </div>
- <div class="control-group">
- <label class="control-label" for="passwordField"><fmt:message key="page.general.password"/></label>
- <div class="controls">
- <input class="input-large" id="passwordField" type="password" name="j_password"/>
- </div>
- </div>
- <div class="control-group">
- <label class="control-label" for="remember_me">
- <fmt:message key="page.login.rememberme"/>
- </label>
- <div class="controls">
- <input type='checkbox' name='_spring_security_remember_me' id="remember_me" value="true"/>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <fmt:message key="page.login.usernamepassword.login" var="loginButtonText"/>
- <div class="controls">
- <button class="btn btn-primary" type="submit" value="${loginButtonText}">${loginButtonText}</button>
- </div>
- </fieldset>
- </form>
- </div>
- <div class="span4">
+ <form class="form-horizontal" id="loginForm" name="loginForm" action="j_spring_security_check" method="post">
+ <fieldset>
+ <legend><fmt:message key="page.login.usernamepassword"/></legend>
+ <c:if test="${param['authfail'] eq 'form'}">
+ <div class="alert alert-error"><fmt:message key="page.login.usernamepassword.fail"/></div>
+ </c:if>
+ <div class="control-group">
+ <label class="control-label" for="usernameField"><fmt:message key="page.general.username"/></label>
+ <div class="controls">
+ <input class="input-large" id="usernameField" type="text" name="j_username" autofocus="autofocus"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="passwordField"><fmt:message key="page.general.password"/></label>
+ <div class="controls">
+ <input class="input-large" id="passwordField" type="password" name="j_password"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="remember_me">
+ <fmt:message key="page.login.rememberme"/>
+ </label>
+ <div class="controls">
+ <input type='checkbox' name='_spring_security_remember_me' id="remember_me" value="true"/>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="page.login.usernamepassword.login" var="loginButtonText"/>
+ <div class="controls">
+ <button class="btn btn-primary" type="submit" value="${loginButtonText}">${loginButtonText}</button>
+ </div>
+ </fieldset>
+ </form>
+ </div>
+ <div class="span4">
<%--
//############################################
// OPENID LOGIN
//############################################
--%>
-
- <form class="form-horizontal" id="openIdForm" name='oidf' action='j_spring_openid_security_check' method='POST'>
- <c:if test="${param['authfail'] eq 'openid'}">
- <p class="error"><fmt:message key="page.login.openid.fail"/></p>
- </c:if>
- <fieldset>
- <legend><fmt:message key="page.login.openid"/></legend>
- <div class="control-group">
- <label class="control-label" for="openid_identifier"><fmt:message key="page.login.openid.identifier"/></label>
- <div class="controls">
- <input class="input-large" type="text" id="openid_identifier" name='openid_identifier'/>
- </div>
- </div>
- <div class="control-group">
- <label class="control-label" for="remember_me">
- <fmt:message key="page.login.rememberme"/>
- </label>
- <div class="controls">
- <input type='checkbox' name='_spring_security_remember_me' id="remember_me_openid" value="true"/>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <fmt:message key="page.login.openid.button" var="openidButtonText"/>
- <div class="controls">
- <button class="btn btn-primary" type="submit" value="${openidButtonText}">${openidButtonText}</button>
- </div>
- </fieldset>
-
- </form>
- </div>
- </div>
- <div class="row">
- <%--
- //############################################
- // PASSWORD REMINDER
- //############################################
- --%>
-
- <form class="form-horizontal well" action="<c:url value="/app/newpassword"/>" method="get">
- <fieldset>
- <legend><fmt:message key="page.login.forgot.password"/></legend>
- <fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
-
- <label for="requestNewPasswordButton"><fmt:message key="page.login.forgot.password.label"/></label>
- <div class="controls">
- <button class="btn btn-primary" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
- </div>
- </fieldset>
- </form>
- <%--
- //############################################
- // ACCOUNT REMINDER
- //############################################
- --%>
- <form class="form-horizontal well" action="<c:url value="/app/retrieveusername"/>" method="get">
- <fieldset>
- <legend><fmt:message key="page.login.forgot.username"/></legend>
- <label for="requestNewUsernameButton"><fmt:message key="page.login.forgot.username.label"/></label>
- <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
- <div class="controls">
- <button class="btn btn-primary" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
- </div>
- </fieldset>
- </form>
-
- <%--
- //############################################
- // NEW ACCOUNT REQUEST
- //############################################
- --%>
- <form class="form-horizontal well" action="<c:url value="/app/newaccount.jsp"/>" method="get">
- <fieldset>
- <legend><fmt:message key="page.login.createaccount"/></legend>
- <label for="createNewAccountButton"><fmt:message key="page.login.createaccount.label"/></label>
- <fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
- <div class="controls">
- <button class="btn btn-primary" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
- </div>
- </fieldset>
- </form>
+ <form class="form-horizontal" id="openIdForm" name='oidf' action='j_spring_openid_security_check' method='POST'>
+ <fieldset>
+ <legend><fmt:message key="page.login.openid"/></legend>
+ <c:if test="${param['authfail'] eq 'openid'}">
+ <div class="alert alert-error"><fmt:message key="page.login.openid.fail"/></div>
+ </c:if>
+ <div class="control-group">
+ <label class="control-label" for="openid_identifier"><fmt:message key="page.login.openid.identifier"/></label>
+ <div class="controls">
+ <input class="input-large" type="text" id="openid_identifier" name='openid_identifier'/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="remember_me">
+ <fmt:message key="page.login.rememberme"/>
+ </label>
+ <div class="controls">
+ <input type='checkbox' name='_spring_security_remember_me' id="remember_me_openid" value="true"/>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="page.login.openid.button" var="openidButtonText"/>
+ <div class="controls">
+ <button class="btn btn-primary" type="submit" value="${openidButtonText}">${openidButtonText}</button>
+ </div>
+ </fieldset>
+
+ </form>
+ </div>
+ </div>
</div>
</div>
</tiles:putAttribute>
Modified: rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp Thu Aug 9 21:45:33 2012
@@ -24,43 +24,21 @@ under the License.
<tiles:putAttribute name="pageTitleKey" value="page.newaccount.title"/>
<tiles:importAttribute name="pageTitleKey" scope="request"/>
-<header>
- <nav>
- <div class="navbar navbar-fixed-top">
- <div class="container">
- <a href="/" class="brand">RAVE</a>
- <ul class="nav pull-right">
- <li class="divider-vertical"></li>
- <li>
- <form class="form-inline" action="<c:url value="/app/newpassword"/>" method="get">
- <fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
- <button class="btn btn-info" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
- </form>
- </li>
- <li class="divider-vertical"></li>
- <li>
- <form class="form-inline " action="<c:url value="/app/retrieveusername"/>" method="get">
- <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
- <button class="btn btn-info" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
- </form>
- </li>
- <li class="divider-vertical"></li>
- </ul>
- </div>
- </div>
- </nav>
-</header>
-<br><br>
-<div class="container navbar-spacer">
- <h1>${pagetitle}</h1>
+<rave:login_navbar hideButton="createNewAccountButton" />
- <!-- Login information (required) -->
- <h2><fmt:message key="page.general.login.information"/></h2>
- <%@ include file="/WEB-INF/jsp/views/includes/new_user_form.jsp" %>
+<div class="container-fluid">
+ <div class="row-fluid">
+ <h1><fmt:message key="page.newaccount.title"/></h1>
+ <!-- Login information (required) -->
+ <div class="well">
+ <h2><fmt:message key="page.general.login.information"/></h2>
+ <%@ include file="/WEB-INF/jsp/views/includes/new_user_form.jsp" %>
+ </div>
+ </div>
</div>
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
$(document).ready(rave.forms.validateNewAccountForm());
</script>
-</portal:register-init-script>
\ No newline at end of file
+</portal:register-init-script>
Modified: rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp Thu Aug 9 21:45:33 2012
@@ -24,74 +24,48 @@
<tiles:putAttribute name="pageTitleKey" value="page.newpassword.title"/>
<tiles:importAttribute name="pageTitleKey" scope="request"/>
-<header>
- <nav>
- <div class="navbar navbar-fixed-top">
- <div class="container">
- <a href="<c:url value="/"/>" class="brand">RAVE</a>
- <ul class="nav pull-right">
- <li class="divider-vertical"></li>
- <li>
- <form class="form-inline " action="<c:url value="/app/retrieveusername"/>" method="get">
- <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
- <button class="btn btn-info" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
- </form>
- </li>
- <li class="divider-vertical"></li>
+ <rave:login_navbar hideButton="requestNewPasswordButton" />
- <li>
- <form class="form-inline" action="<c:url value="/app/newaccount.jsp"/>" method="get">
- <fieldset>
- <fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
- <button class="btn btn-info" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
- </fieldset>
- </form>
- </li>
- <li class="divider-vertical"></li>
- </ul>
- </div>
- </div>
- </nav>
-</header>
-<br><br>
-<div class="container navbar-spacer">
- <h1><fmt:message key="page.newpassword.title"/></h1>
- <c:choose>
- <c:when test="${success}">
- <div class="alert-message success">
- <fmt:message key="page.newpassword.email.sent">
- <fmt:param>${email}</fmt:param>
- </fmt:message>
- </div>
- <a href="<c:url value="/"/>"><fmt:message key="page.newpassword.email.sent.login"/></a>
- </c:when>
-
- <c:otherwise>
-
- <form:form cssClass="form-horizontal well" commandName="user" action="newpassword" method="post">
- <fieldset>
- <p><fmt:message key="form.all.fields.required"/></p>
-
- <p><form:errors cssClass="error"/></p>
-
- <div class="control-group">
- <label class="control-label" for="emailField"><fmt:message key="page.general.email"/></label>
- <div class="controls">
- <form:input id="emailField" path="email" required="required" autofocus="autofocus"/>
- <form:errors path="email" cssClass="error"/>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <div class="control-group">
- <div class="controls">${captchaHtml}</div>
- </div>
- </fieldset>
- <fieldset>
- <fmt:message key="page.login.forgot.password.button" var="submitButtonText"/>
- <button type="submit" class="btn btn-primary" value="${submitButtonText}">${submitButtonText}</button>
- </fieldset>
- </form:form>
- </c:otherwise>
- </c:choose>
+<div class="container-fluid">
+ <div class="row-fluid">
+ <h1><fmt:message key="page.newpassword.title"/></h1>
+ <c:choose>
+ <c:when test="${success}">
+ <div class="alert-message success">
+ <fmt:message key="page.newpassword.email.sent">
+ <fmt:param>${email}</fmt:param>
+ </fmt:message>
+ </div>
+ <a href="<c:url value="/"/>"><fmt:message key="page.newpassword.email.sent.login"/></a>
+ </c:when>
+
+ <c:otherwise>
+
+ <form:form cssClass="form-horizontal well" commandName="user" action="newpassword" method="post">
+ <fieldset>
+ <p><fmt:message key="form.all.fields.required"/></p>
+
+ <p><form:errors cssClass="error"/></p>
+
+ <div class="control-group">
+ <label class="control-label" for="emailField"><fmt:message key="page.general.email"/></label>
+ <div class="controls">
+ <form:input id="emailField" path="email" required="required" autofocus="autofocus"/>
+ <form:errors path="email" cssClass="error"/>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <div class="control-group">
+ <div class="controls">${captchaHtml}</div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="page.login.forgot.password.button" var="submitButtonText"/>
+ <button type="submit" class="btn btn-primary" value="${submitButtonText}">${submitButtonText}</button>
+ </fieldset>
+ </form:form>
+ </c:otherwise>
+ </c:choose>
+ </div>
</div>
\ No newline at end of file