Author: raminder
Date: Thu Jul 26 21:12:17 2012
New Revision: 1366203
URL: http://svn.apache.org/viewvc?rev=1366203&view=rev
Log:
Applying patch for user status. Rave-727
Modified:
rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java
rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties
rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
Modified: rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
(original)
+++ rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql Thu
Jul 26 21:12:17 2012
@@ -127,69 +127,69 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--
***********************************************************************************
--- 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, family_name, given_name)
-values (@user_id_1, 'canonical',
'$2a$10$TkEgze5kLy9nRlfd8PT1zunh6P1ND8WPjLojFjAMNgZMu1D9D1n4.', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', 'Canonical', 'Paul');
+insert into person (entity_id, username, password, expired, locked, enabled,
email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_1, 'canonical',
'$2a$10$TkEgze5kLy9nRlfd8PT1zunh6P1ND8WPjLojFjAMNgZMu1D9D1n4.', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', 'Canonical', 'Paul',
'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, family_name, given_name)
-values (@user_id_2, 'john.doe',
'$2a$10$8Dir7boy3UyVqy6erfj6WuQXUTf.ejTldPSsVIty7.pPT3Krkly26', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', 'Doe', 'John');
+insert into person (entity_id, username, password, expired, locked, enabled,
email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_2, 'john.doe',
'$2a$10$8Dir7boy3UyVqy6erfj6WuQXUTf.ejTldPSsVIty7.pPT3Krkly26', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', '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, family_name, given_name)
-values (@user_id_3, 'jane.doe',
'$2a$10$YP9cjZEA.gG/ng2YwTBIyucMpuiQ7Fvz0K8rOt14rIBhVwlOrh1tu', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', 'Doe', 'Jane');
+insert into person (entity_id, username, password, expired, locked, enabled,
email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_3, 'jane.doe',
'$2a$10$YP9cjZEA.gG/ng2YwTBIyucMpuiQ7Fvz0K8rOt14rIBhVwlOrh1tu', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', '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, family_name, given_name,
forgotPasswordHash)
-values (@user_id_4, 'george.doe',
'$2a$10$0bcOUkQgAwE/qmdc1NcUveNzx/IYIcOUu4ydyT8DEicTCxGJF/vcW', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', 'Doe', 'George',
'ABC123');
+insert into person (entity_id, username, password, expired, locked, enabled,
email, default_page_layout_id, dtype, family_name, given_name, status,
forgotPasswordHash)
+values (@user_id_4, 'george.doe',
'$2a$10$0bcOUkQgAwE/qmdc1NcUveNzx/IYIcOUu4ydyT8DEicTCxGJF/vcW', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', 'Doe', 'George',
'Single', 'ABC123');
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, family_name, given_name)
-values (@user_id_5,'mario.rossi',
'$2a$10$HZ6WHAKQCs8waLooL98l6.fLzwh3D8u/V0.UebIjojawfXJhX1DQ2', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', 'Rossi', 'Mario');
+insert into person (entity_id, username, password, expired, locked, enabled,
email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_5,'mario.rossi',
'$2a$10$HZ6WHAKQCs8waLooL98l6.fLzwh3D8u/V0.UebIjojawfXJhX1DQ2', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', '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, family_name, given_name)
-values (@user_id_6, 'maija.m',
'$2a$10$3feYdjrW40hkqP4/xupKP.YMgdYmDsZZus./vK4FbBs9QZG2.FuNC', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', 'M', 'Maija');
+insert into person (entity_id, username, password, expired, locked, enabled,
email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_6, 'maija.m',
'$2a$10$3feYdjrW40hkqP4/xupKP.YMgdYmDsZZus./vK4FbBs9QZG2.FuNC', FALSE, FALSE,
TRUE,'[email protected]', @three_col_id, 'User', '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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @three_col_id, 'User', 'Column2', '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,'[email protected]', @three_col_id, 'User', 'Column2', '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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @three_col_id, 'User', 'Column2', '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,'[email protected]', @three_col_id, 'User', 'Column2', '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,'[email protected]', @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,'[email protected]', @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 ---
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
Thu Jul 26 21:12:17 2012
@@ -83,9 +83,9 @@ public class ProfileController {
public String updateProfile(ModelMap model,
@RequestParam(required = false) Long
referringPageId,
@ModelAttribute("updatedUser") UserForm
updatedUser) {
- logger.info("Updating " + updatedUser.getUsername() + " profile
information");
User user = userService.getAuthenticatedUser();
+ logger.info("Updating " + user.getUsername() + " profile information");
//set the updated fields for optional information
user.setGivenName(updatedUser.getGivenName());
Modified:
rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
---
rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java
(original)
+++
rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java
Thu Jul 26 21:12:17 2012
@@ -24,6 +24,7 @@ import org.jbehave.core.annotations.Then
import org.jbehave.core.annotations.When;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.Select;
import org.springframework.beans.factory.annotation.Autowired;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -78,9 +79,10 @@ public class ProfileSteps {
changeFieldValue("aboutMeField", aboutMe);
}
- @When("I change the status to \"$status\"")
+ @When("I choose the status as \"$status\"")
public void changeStatus(String status) {
- changeFieldValue("statusField", status);
+ final Select relationshipStatus = new
Select(portal.findElement(By.id("statusField")));
+ relationshipStatus.selectByValue(status);
}
private void changeFieldValue(String fieldId, String value) {
Modified:
rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
---
rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story
(original)
+++
rave/trunk/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story
Thu Jul 26 21:12:17 2012
@@ -37,16 +37,16 @@ When I log in with username "john.doe" a
And I go to "http://localhost:8080/portal/app/person/john.doe";
Then I see the email address "[email protected]" on the profile page
And I see the about me "" on the profile page
-And I see the status "" on the profile page
+And I see the status "Single" on the profile page
When I click on the "profileEdit" button
Then I can edit the email address
When I change the email address to "[email protected]"
And I change the about me to "I'm a test user"
-And I change the status to "It's complicated"
+And I choose the status as "Committed"
And I submit the edit profile form
Then I see the email address "[email protected]" on the profile page
And I see the about me "I'm a test user" on the profile page
-And I see the status "It's complicated" on the profile page
+And I see the status "Committed" on the profile page
When I log out
Scenario: John Doe reverts his profile after logging out and in
@@ -54,16 +54,16 @@ When I log in with username "john.doe" a
And I go to "http://localhost:8080/portal/app/person/john.doe";
Then I see the email address "[email protected]" on the profile page
And I see the about me "I'm a test user" on the profile page
-And I see the status "It's complicated" on the profile page
+And I see the status "Committed" on the profile page
When I click on the "profileEdit" button
Then I can edit the email address
When I change the email address to "[email protected]"
And I change the about me to ""
-And I change the status to ""
+And I choose the status as "Single"
And I submit the edit profile form
Then I see the email address "[email protected]" on the profile page
And I see the about me "" on the profile page
-And I see the status "" on the profile page
+And I see the status "Single" on the profile page
When I log out
Scenario: John Doe adds a new page
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages.properties?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages.properties
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages.properties Thu
Jul 26 21:12:17 2012
@@ -73,11 +73,16 @@ page.general.toadmininterface=Admin inte
page.general.username=Username:
page.general.login.information=Enter Login Information
page.general.personal.information=Enter Personal Information (optional)
-page.general.first.name=First Name:
-page.general.last.name=Last Name:
-page.general.display.name=Name seen by other users:
-page.general.status=Status:
-page.general.about.me=Describe Yourself:
+page.general.first.name=First Name:
+page.general.last.name=Last Name:
+page.general.display.name=Name seen by other users:
+page.general.relation.status=Relationship Status:
+page.general.about.me=Describe Yourself:
+
+page.general.relation.single=Single
+page.general.relation.committed=Committed
+page.general.relation.married=Married
+page.general.relation.other=Other
page.general.addpage.title=Title
page.general.addpage.layout.columns_1=One Column
@@ -179,14 +184,14 @@ page.addwidget.result.success=The widget
page.profile.title={0}''s Profile
page.profile.personal.info=Personal Information
-page.profile.first.name=First Name:
-page.profile.last.name=Last Name:
-page.profile.display.name=Display Name:
+page.profile.first.name=First Name:
+page.profile.last.name=Last Name:
+page.profile.display.name=Display Name:
page.profile.basic.info=Basic Information
-page.profile.about.me=About Me:
-page.profile.status=Status:
+page.profile.about.me=About Me:
+page.profile.status=Relationship Status:
page.profile.contact.info=Contact Information
-page.profile.email=Email ID:
+page.profile.email=Email ID:
page.profile.posts=Posts
page.profile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
page.profile.about=About
@@ -202,14 +207,14 @@ page.profile.cancel=Cancel
page.personProfile.title={0}''s Profile
page.personProfile.personal.info=Personal Information
-page.personProfile.first.name=First Name:
-page.personProfile.last.name=Last Name:
-page.personProfile.display.name=Display Name:
+page.personProfile.first.name=First Name:
+page.personProfile.last.name=Last Name:
+page.personProfile.display.name=Display Name:
page.personProfile.basic.info=Basic Information
-page.personProfile.about.me=About Me:
-page.personProfile.status=Status:
+page.personProfile.about.me=About Me:
+page.personProfile.status=Relationship Status:
page.personProfile.contact.info=Contact Information
-page.personProfile.email=Email ID:
+page.personProfile.email=Email ID:
page.personProfile.posts=Posts
page.personProfile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
page.personProfile.about=About
@@ -360,7 +365,7 @@ _rave_client.common.accept=Accept
_rave_client.common.decline=Decline
_rave_client.common.username=Username
_rave_client.common.sharing=Sharing
-_rave_client.common.editing.auth=Edit Permission
+_rave_client.common.editing.auth=Edit Permission
_rave_client.form.password.invalid_match=The password does not match
_rave_client.opensocial.render_error=Unable to render OpenSocial Gadget:
_rave_client.page.add=Add a New Page
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties
Thu Jul 26 21:12:17 2012
@@ -81,6 +81,11 @@ page.general.display.name=Nombre que ver
page.general.status=Estado Marital\:
page.general.about.me=Describase\:
+page.general.relation.single=Soltero
+page.general.relation.committed=Comprometido
+page.general.relation.married=Casado
+page.general.relation.other=Otro
+
page.general.addpage.title=Titulo
page.general.addpage.layout.columns_1=Una Columna
page.general.addpage.layout.columns_2=Dos Columnas
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
Thu Jul 26 21:12:17 2012
@@ -65,7 +65,7 @@ page.general.movethispage=Verplaats deze
page.general.movethispage.after=Na {0}
page.general.movethispage.tofirst=Naar eerste tab
page.general.sharepage=Deel pagina
-page.general.removeshare=Trek delen in
+page.general.removeshare=Trek delen in
page.general.search.title=Zoek of blader voor gebruiker
page.general.password=Wachtwoord:
page.general.screenshot=schermafbeelding
@@ -75,11 +75,16 @@ page.general.toadmininterface=Beheeromge
page.general.username=Gebruikersnaam:
page.general.login.information=Voer inloggegevens in
page.general.personal.information=Voer persoonlijke informatie in (optioneel)
-page.general.first.name=Voornaam:
-page.general.last.name=Achternaam:
-page.general.display.name=Naam gezien door andere gebruikers:
-page.general.status=Burgerlijke staat:
-page.general.about.me=Beschrijf Uzelf:
+page.general.first.name=Voornaam:
+page.general.last.name=Achternaam:
+page.general.display.name=Naam gezien door andere gebruikers:
+page.general.status=Burgerlijke staat:
+page.general.about.me=Beschrijf Uzelf:
+
+page.general.relation.single=Ongehuwd
+page.general.relation.committed=Verloofd
+page.general.relation.married=Gehuwd
+page.general.relation.other=Ander
page.general.addpage.title=Titel
page.general.addpage.layout.columns_1=Een kolom
@@ -190,14 +195,14 @@ page.addwidget.result.success=De widget
page.profile.title=Profiel van {0}
page.profile.personal.info=Persoonsgegevens
-page.profile.first.name=Voornaam:
-page.profile.last.name=Achternaam:
+page.profile.first.name=Voornaam:
+page.profile.last.name=Achternaam:
page.profile.display.name=Volledige naam\:
page.profile.basic.info=Algemene informatie
-page.profile.about.me=Over mij:
-page.profile.status=Burgerlijke staat:
+page.profile.about.me=Over mij:
+page.profile.status=Burgerlijke staat:
page.profile.contact.info=Contact informatie
-page.profile.email=E-mail:
+page.profile.email=E-mail:
page.profile.posts=Berichten
page.profile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
page.profile.about=Over mij
@@ -213,14 +218,14 @@ page.profile.cancel=Annuleer
page.personProfile.title=Profiel van {0}
page.personProfile.personal.info=Persoonsgegevens
-page.personProfile.first.name=Voornaam:
-page.personProfile.last.name=Achternaam:
+page.personProfile.first.name=Voornaam:
+page.personProfile.last.name=Achternaam:
page.personProfile.display.name=Volledige naam\:
page.personProfile.basic.info=Algemene informatie
-page.personProfile.about.me=Over mij:
-page.personProfile.status=Burgerlijke staat:
+page.personProfile.about.me=Over mij:
+page.personProfile.status=Burgerlijke staat:
page.personProfile.contact.info=Contact informatie
-page.personProfile.email=E-mail:
+page.personProfile.email=E-mail:
page.personProfile.posts=Berichten
page.personProfile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
page.personProfile.about=Over mij
@@ -368,8 +373,8 @@ _rave_client.common.move=Bewegen
_rave_client.common.save=Bewaren
_rave_client.common.update=Bijwerken
_rave_client.common.accept=Accepteer
-_rave_client.common.decline=Wijs af
-_rave_client.common.username=Gebruikersnaam
+_rave_client.common.decline=Wijs af
+_rave_client.common.username=Gebruikersnaam
_rave_client.common.sharing=Delen
_rave_client.common.editing.auth=Geef Toestemming uit
_rave_client.form.password.invalid_match=Het wachtwoord komt niet overeen
@@ -385,7 +390,7 @@ _rave_client.widget.remove_confirm=Weet
_rave_client.widget.users.added_by=is toegevoegd door...
_rave_client.search.list.result.x.to.y=Toont resultaat {0} - {1} van {2}
_rave_client.create.share=Gebruiker is toegevoegd aan deze pagina
-_rave_client.revoke.share=Gebruiker is verwijderd van deze pagina
+_rave_client.revoke.share=Gebruiker is verwijderd van deze pagina
_rave_client.create.share.confirm=Weet je zeker dat je deze gebruiker wilt
toevoegen?
_rave_client.revoke.share.confirm=Weet je zeker dat je deze gebruiker wilt
verwijderen?
_rave_client.revoke.share.current.user=Deze pagina is niet langer gedeeld.
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
Thu Jul 26 21:12:17 2012
@@ -120,69 +120,69 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--
***********************************************************************************
--- 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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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,'[email protected]', @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 ---
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
Thu Jul 26 21:12:17 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/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
Thu Jul 26 21:12:17 2012
@@ -54,67 +54,92 @@
<div id="pageContent" class="container-fluid navbar-spacer">
<div class="row-fluid">
<div class="span9">
- <div id="personProfileContent" class="row-fluid">
- <form:form id="editAccountForm" commandName="userProfile"
action="person?referringPageId=${referringPageId}" method="POST">
- <!-- Display personal information of user-->
- <h2><fmt:message key="page.profile.personal.info" /></h2>
- <fieldset>
- <div class="span12">
- <p>
- <label for="givenNameField"><fmt:message
key="page.profile.first.name"/></label>
- <label id="givenName"
class="profile-info-visible"><c:out value="${userProfile.givenName}"/></label>
- <form:input id="givenNameField"
path="givenName" class="profile-info-hidden" value="${userProfile.givenName}" />
- </p>
- </div>
- <div class="span12">
- <p>
- <label for="familyNameField"><fmt:message
key="page.profile.last.name"/></label>
- <label id="familyName"
class="profile-info-visible"><c:out value="${userProfile.familyName}"/></label>
- <form:input id="familyNameField"
path="familyName" class="profile-info-hidden"
value="${userProfile.familyName}"/>
- </p>
- </div>
- <div class="span12">
- <p>
- <label for="displayNameField"
class="profile-info-hidden"><fmt:message
key="page.profile.display.name"/></label>
- <form:input id="displayNameField"
path="displayName" class="profile-info-hidden"
value="${userProfile.displayName}"/>
- </p>
- </div>
- </fieldset>
+ <div id="personProfileContent">
+ <form:form id="editAccountForm" commandName="userProfile"
action="person?referringPageId=${referringPageId}" method="POST"
class="form-horizontal">
- <!-- Display basic information of user -->
- <h2><fmt:message key="page.profile.basic.info" /></h2>
- <fieldset>
- <div class="span12">
- <p>
- <label for="aboutMeField"><fmt:message
key="page.profile.about.me"/></label>
- <label id="aboutMe"
class="profile-info-visible"><c:out value=" ${userProfile.aboutMe}"/></label>
- <form:textarea id="aboutMeField"
path="aboutMe" class="profile-info-hidden" value="${userProfile.aboutMe}" />
- </p>
- </div>
- <div class="span12">
- <p>
- <label for="statusField"><fmt:message
key="page.profile.status"/></label>
- <label id="status"
class="profile-info-visible"><c:out value=" ${userProfile.status}"/></label>
- <form:input id="statusField" path="status"
class="profile-info-hidden" value="${userProfile.status}" />
- </p>
+ <fieldset class="row-fluid" id="userProfilePrimaryData">
+ <div class="span2 profile-user-thumb">
+ <img
src="http://placehold.it/125x165&text=photo"/>
+ </div>
+
+ <div class="span10">
+ <!-- Display user info-->
+ <div class="profile-info-visible">
+ <h2><c:out
value="${userProfile.displayName}"/></h2>
+ <h3><span id="givenName"><c:out
value="${userProfile.givenName}"/></span> <span id="familyName"><c:out
value="${userProfile.familyName}"/></span></h3>
+ <p class="profile-user-status">
+ <fmt:message key="page.profile.status"/>
+ <span id="status"><c:out
value="${userProfile.status}"/></span>
+ </p>
+ <p class="profile-info-visible">
+ <fmt:message
key="page.profile.about.me"/>
+ <span id="aboutMe"><c:out value="
${userProfile.aboutMe}"/></span>
+ </p>
+ </div>
+ <!-- Display edit view of user info-->
+ <div class="profile-info-hidden">
+ <div class="control-group">
+ <label for="displayNameField"
class="control-label"><fmt:message key="page.profile.display.name"/></label>
+ <div class="controls">
+ <form:input
id="displayNameField" path="displayName" value="${userProfile.displayName}"
class="span6"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label
pull-left"><fmt:message key="page.profile.first.name"/></label>
+ <form:input
id="givenNameField" path="givenName" class="span3 pull-left"
value="${userProfile.givenName}" />
+
+ <label class="control-label
pull-left"><fmt:message key="page.profile.last.name"/></label>
+ <form:input
id="familyNameField" path="familyName" class="span3 pull-left"
value="${userProfile.familyName}"/>
+ </div>
+ <div class="control-group">
+ <label for="statusField"
class="control-label"><fmt:message key="page.profile.status"/></label>
+ <div class="controls">
+ <form:select
path="status" class="span3" 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 for="aboutMeField"
class="control-label"><fmt:message key="page.profile.about.me"/></label>
+ <div class="controls">
+ <form:textarea
id="aboutMeField" path="aboutMe" value="${userProfile.aboutMe}" class="span11"
/>
+ </div>
+ </div>
+ </div>
</div>
</fieldset>
<!-- Display contact information of user -->
- <h2><fmt:message key="page.profile.contact.info" /></h2>
- <fieldset>
- <div class="span12">
- <p>
- <label for="emailField"><fmt:message
key="page.profile.email"/></label>
- <label id="email"
class="profile-info-visible"><c:out value=" ${userProfile.email}"/></label>
- <form:input id="emailField" path="email"
class="profile-info-hidden" value="${userProfile.email}" />
- </p>
- </div>
+ <fieldset class="row-fluid">
+ <div class=" span12">
+ <div class="well">
+ <h4><fmt:message
key="page.profile.contact.info" /></h4>
+ <div class="profile-info-visible">
+ <p id='email'><c:out value="
${userProfile.email}"/></p>
+ </div>
+ <div class="profile-info-hidden">
+ <div class="control-group">
+ <label for="emailField"
class="control-label"><fmt:message key="page.profile.email"/></label>
+ <div class="controls">
+ <form:input
id="emailField" path="email" class="span5" value="${userProfile.email}" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</fieldset>
+
<%-- only display the edit profile button if the current
logged in user matches the profile being viewed --%>
<c:set var="currentUsername"><sec:authentication
property="principal.username" htmlEscape="false" /></c:set>
<c:if test="${currentUsername == userProfile.username}">
- <fieldset>
+ <fieldset class="row-fluid">
<div class="span12">
<p>
<input type="hidden" id="profileInfo"
value="profile-info" />
@@ -126,6 +151,7 @@
</div>
</fieldset>
</c:if>
+
</form:form>
</div>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less?rev=1366203&r1=1366202&r2=1366203&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
Thu Jul 26 21:12:17 2012
@@ -43,9 +43,31 @@
#personProfileContent {
background-color: transparent;
- padding: 0 20px;
- width: 90%;
- margin: 1em auto 0;
+ /*padding: 0 20px;
+ width: 90%;*/
+ margin: 1em 0 0;
+
+ .form-horizontal .controls{
+ margin-left: 100px;
+ }
+
+ .profile-user-thumb img{
+ max-width: 100%;
+ }
+
+ #userProfilePrimaryData{ margin-bottom: 20px;}
+
+ h3{font-weight: normal; margin-bottom: 9px;}
+
+ #editAccountForm {
+ input[type="text"]{float: left;}
+
+ label{
+ text-align: right;
+ width: 95px;
+ margin-right: 5px;
+ }
+ }
}
.person-profile-page-content {
