[portal-commits] JBoss Portal SVN: r11703 - in branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war: jsf and 2 other directories.

Tuesday, 19 August 2008


Author: thomas.heute(a)jboss.com
Date: 2008-08-19 07:47:25 -0400 (Tue, 19 Aug 2008)
New Revision: 11703

Added:
  
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/editProfileInfo.xhtml
  
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/viewProfileInfo.xhtml
Modified:
  
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml
  
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml
  
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml
  
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml
  
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml
Log:
JBPORTAL-1816: abillity to create profile at registration 
Thank you Andy !

Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml	2008-08-19
09:43:42 UTC (rev 11702)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml	2008-08-19
11:47:25 UTC (rev 11703)
@@ -70,6 +70,11 @@
       		<name>captcha</name>
       		<value>true</value>
       	</preference>
+        <preference>
+      		<!-- The user can complete the whole profile during registration -->
+      		<name>profileAtRegistration</name>
+      		<value>false</value>
+      	</preference>
       	<preference>
       		<!-- 
       			Use lost password service

Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml	2008-08-19
09:43:42 UTC (rev 11702)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml	2008-08-19
11:47:25 UTC (rev 11703)
@@ -18,6 +18,14 @@
 		<h:outputText id="password">******</h:outputText>
 	</h:panelGrid>
 	<br/>
+	<c:if test="#{portletPreferenceValue.profileAtRegistration == true}">
+		<ui:define name="content">
+			<ui:decorate template="/jsf/common/viewProfileInfo.xhtml">
+				<ui:param name="manager" value="#{userregistermgr}"/>
+			</ui:decorate>
+		</ui:define>
+	</c:if>
+	<br/>
 	<c:if test="#{show_roles == true}">
 	<!-- assigned roles -->
 	<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_ASSIGNED}" />

Added:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/editProfileInfo.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/editProfileInfo.xhtml	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/editProfileInfo.xhtml	2008-08-19
11:47:25 UTC (rev 11703)
@@ -0,0 +1,204 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:c="http://java.sun.com/jstl/core"
+   class="identity-ui">
+
+	<!-- User Profile -->
+	<h:panelGrid columns="2" cellpadding="3">	
+	<h:panelGroup/>
+	<h:panelGroup>
+	<ul class="topnav">
+		<li id="currentTab">
+			<h:outputText value="#{bundle.IDENTITY_CATEGORY_GENERAL}" />
+		</li>
+	</ul>
+	</h:panelGroup>
+	
+	<h:panelGroup>
+  		<h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.timezone.required}" />
+  	</h:panelGroup>
+  	<h:selectOneMenu id="timezone"
value="#{manager.uiUser.attribute.timezone}" 
required="#{metadataservice.timezone.required}">
+  		<f:selectItems value="#{metadataservice.timezone.values}" />
+  	</h:selectOneMenu>
+  	<h:panelGroup />
+  	<h:message for="timezone" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+	<h:panelGroup>
+  		<h:outputText value="#{bundle.IDENTITY_THEME}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.theme.required}" />
+  	</h:panelGroup>
+  	<h:selectOneMenu id="theme"
value="#{manager.uiUser.attribute.theme}" 
required="#{metadataservice.theme.required}">
+  		<f:selectItems value="#{metadataservice.theme.values}" />
+  	</h:selectOneMenu>
+  	<h:panelGroup />
+  	<h:message for="theme" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_LOCALE}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.locale.required}" />
+  	</h:panelGroup>
+  	<h:selectOneMenu id="locale"
value="#{manager.uiUser.attribute.locale}"
required="#{metadataservice.locale.required}">
+  		<f:selectItems value="#{metadataservice.locale.values}" />
+  	</h:selectOneMenu>
+  	<h:panelGroup />
+  	<h:message for="locale" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+	<h:panelGroup/>
+	<h:panelGroup>
+	<ul class="topnav">
+		<li id="currentTab">
+			<h:outputText value="#{bundle.IDENTITY_CATEGORY_PERSONAL}" />
+		</li>
+	</ul>
+	</h:panelGroup>
+		
+	
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.givenname.required}" />
+  	</h:panelGroup>
+  	<h:inputText id="givenname"
value="#{manager.uiUser.attribute.givenname}"
required="#{metadataservice.givenname.required}"/>
+  	<h:panelGroup />
+  	<h:message for="givenname" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.familyname.required}" />
+  	</h:panelGroup>
+  	<h:inputText id="lastname" 
value="#{manager.uiUser.attribute.familyname}"
required="#{metadataservice.familyname.required}"/>
+  	<h:panelGroup />
+  	<h:message for="lastname" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_LOCATION}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.location.required}" />
+  	</h:panelGroup>
+	<h:inputText id="location" 
value="#{manager.uiUser.attribute.location}"
required="#{metadataservice.location.required}"/>
+  	<h:panelGroup />
+	<h:message for="location" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+	<h:panelGroup/>
+	<h:panelGroup>
+	<ul class="topnav">
+		<li id="currentTab">
+			<h:outputText value="#{bundle.IDENTITY_CATEGORY_INSTANT}" />
+		</li>
+	</ul>
+	</h:panelGroup>
+
+  		
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_SKYPE}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.skype.required}" />
+  	</h:panelGroup>
+  		<h:inputText id="skype" 
value="#{manager.uiUser.attribute.skype}"
required="#{metadataservice.skype.required}"/>
+  		<h:panelGroup />
+  		<h:message for="skype" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_ICQ}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.icq.required}" />
+  	</h:panelGroup>
+  		<h:inputText id="icq"  value="#{manager.uiUser.attribute.icq}"
required="#{metadataservice.icq.required}"/>
+  		<h:panelGroup />
+  		<h:message for="icq" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+  	  	
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_AIM}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.aim.required}" />
+  	</h:panelGroup>
+  		<h:inputText id="aim"  value="#{manager.uiUser.attribute.aim}"
required="#{metadataservice.aim.required}"/>
+  		<h:panelGroup />
+  		<h:message for="aim" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+  	
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_MSNM}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.msnm.required}" />
+  	</h:panelGroup>
+  		<h:inputText id="msnm" 
value="#{manager.uiUser.attribute.msnm}"
required="#{metadataservice.msnm.required}"/>
+  		<h:panelGroup />
+  		<h:message for="msnm" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_YIM}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.yim.required}" />
+  	</h:panelGroup>
+  		<h:inputText id="yim"  value="#{manager.uiUser.attribute.yim}"
required="#{metadataservice.yim.required}"/>
+  		<h:panelGroup />
+  		<h:message for="yim" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_XMMP}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.xmmp.required}" />
+  	</h:panelGroup>
+  		<h:inputText id="xmmp" 
value="#{manager.uiUser.attribute.xmmp}"
required="#{metadataservice.xmmp.required}"/>
+  		<h:panelGroup />
+  		<h:message for="xmmp" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+	<h:panelGroup/>
+	<h:panelGroup>
+	<ul class="topnav">
+		<li id="currentTab">
+			<h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL}" />
+		</li>
+	</ul>
+	</h:panelGroup>
+  		
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.homepage.required}" />
+  	</h:panelGroup>
+  	<h:inputText id="homepage" 
value="#{manager.uiUser.attribute.homepage}"
required="#{metadataservice.homepage.required}"/>
+  	<h:panelGroup />
+  	<h:message for="homepage" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+  		
+  		
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.occupation.required}" />
+  	</h:panelGroup>
+  		<h:inputText id="occupation" 
value="#{manager.uiUser.attribute.occupation}"
required="#{metadataservice.occupation.required}"/>
+  		<h:panelGroup />
+  		<h:message for="occupation" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+  		
+  		
+	<h:panelGroup>
+		<h:outputText value="#{bundle.IDENTITY_INTERESTS}"/>
+  		<h:outputText value=" *"
rendered="#{metadataservice.interests.required}" />
+  	</h:panelGroup>
+  		<h:inputText id="interests"
value="#{manager.uiUser.attribute.interests}"
required="#{metadataservice.interests.required}"/>
+  		<h:panelGroup />
+  		<h:message for="interests" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+  		
+  		
+		<h:panelGroup>
+			<h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/>
+	  		<h:outputText value=" *"
rendered="#{metadataservice.signature.required}" />
+	  	</h:panelGroup>
+  		<h:panelGroup>
+  			<h:inputTextarea id="signature"
value="#{manager.uiUser.attribute.signature}" cols="50"
rows="5"
required="#{metadataservice.signature.required}"/><br/>	
+  			<h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE}"
/>
+  		</h:panelGroup>
+  		<h:panelGroup />
+  		<h:message for="signature" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+
+  		
+		<h:panelGroup>
+			<h:outputText value="#{bundle.IDENTITY_EXTRA}"/>
+	  		<h:outputText value=" *"
rendered="#{metadataservice.extra.required}" />
+	  	</h:panelGroup>
+  		<h:panelGroup>
+  			<h:inputTextarea id="extra"
value="#{manager.uiUser.attribute.extra}" cols="50" rows="5"
required="#{metadataservice.extra.required}"/><br/>
+  			<h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_EXTRA}"
/>
+  		</h:panelGroup>
+  		<h:panelGroup />
+  		<h:message for="extra" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+  		
+	</h:panelGrid>
+	
+</div>
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml	2008-08-19
09:43:42 UTC (rev 11702)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml	2008-08-19
11:47:25 UTC (rev 11703)
@@ -10,201 +10,13 @@
 
 	<ui:include src="/jsf/common/userInfo.xhtml" />
 
-	<!-- User Profile -->
-	<h:panelGrid columns="2" cellpadding="3">	
-	<h:panelGroup/>
-	<h:panelGroup>
-	<ul class="topnav">
-		<li id="currentTab">
-			<h:outputText value="#{bundle.IDENTITY_CATEGORY_GENERAL}" />
-		</li>
-	</ul>
-	</h:panelGroup>
+	<ui:define name="content">
+		<ui:decorate template="/jsf/common/editProfileInfo.xhtml">
+			<ui:param name="manager" value="#{editprofilemgr}"/>
+			<ui:param name="adminMode" value="false"/>
+		</ui:decorate>
+	</ui:define>
 	
-	<h:panelGroup>
-  		<h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.timezone.required}" />
-  	</h:panelGroup>
-  	<h:selectOneMenu id="timezone"
value="#{manager.uiUser.attribute.timezone}" 
required="#{metadataservice.timezone.required}">
-  		<f:selectItems value="#{metadataservice.timezone.values}" />
-  	</h:selectOneMenu>
-  	<h:panelGroup />
-  	<h:message for="timezone" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-	<h:panelGroup>
-  		<h:outputText value="#{bundle.IDENTITY_THEME}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.theme.required}" />
-  	</h:panelGroup>
-  	<h:selectOneMenu id="theme"
value="#{manager.uiUser.attribute.theme}" 
required="#{metadataservice.theme.required}">
-  		<f:selectItems value="#{metadataservice.theme.values}" />
-  	</h:selectOneMenu>
-  	<h:panelGroup />
-  	<h:message for="theme" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_LOCALE}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.locale.required}" />
-  	</h:panelGroup>
-  	<h:selectOneMenu id="locale"
value="#{manager.uiUser.attribute.locale}"
required="#{metadataservice.locale.required}">
-  		<f:selectItems value="#{metadataservice.locale.values}" />
-  	</h:selectOneMenu>
-  	<h:panelGroup />
-  	<h:message for="locale" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-	<h:panelGroup/>
-	<h:panelGroup>
-	<ul class="topnav">
-		<li id="currentTab">
-			<h:outputText value="#{bundle.IDENTITY_CATEGORY_PERSONAL}" />
-		</li>
-	</ul>
-	</h:panelGroup>
-		
-	
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.givenname.required}" />
-  	</h:panelGroup>
-  	<h:inputText id="givenname"
value="#{manager.uiUser.attribute.givenname}"
required="#{metadataservice.givenname.required}"/>
-  	<h:panelGroup />
-  	<h:message for="givenname" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.familyname.required}" />
-  	</h:panelGroup>
-  	<h:inputText id="lastname" 
value="#{manager.uiUser.attribute.familyname}"
required="#{metadataservice.familyname.required}"/>
-  	<h:panelGroup />
-  	<h:message for="lastname" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_LOCATION}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.location.required}" />
-  	</h:panelGroup>
-	<h:inputText id="location" 
value="#{manager.uiUser.attribute.location}"
required="#{metadataservice.location.required}"/>
-  	<h:panelGroup />
-	<h:message for="location" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-	<h:panelGroup/>
-	<h:panelGroup>
-	<ul class="topnav">
-		<li id="currentTab">
-			<h:outputText value="#{bundle.IDENTITY_CATEGORY_INSTANT}" />
-		</li>
-	</ul>
-	</h:panelGroup>
-
-  		
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_SKYPE}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.skype.required}" />
-  	</h:panelGroup>
-  		<h:inputText id="skype" 
value="#{manager.uiUser.attribute.skype}"
required="#{metadataservice.skype.required}"/>
-  		<h:panelGroup />
-  		<h:message for="skype" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_ICQ}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.icq.required}" />
-  	</h:panelGroup>
-  		<h:inputText id="icq"  value="#{manager.uiUser.attribute.icq}"
required="#{metadataservice.icq.required}"/>
-  		<h:panelGroup />
-  		<h:message for="icq" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-  	  	
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_AIM}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.aim.required}" />
-  	</h:panelGroup>
-  		<h:inputText id="aim"  value="#{manager.uiUser.attribute.aim}"
required="#{metadataservice.aim.required}"/>
-  		<h:panelGroup />
-  		<h:message for="aim" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-  	
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_MSNM}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.msnm.required}" />
-  	</h:panelGroup>
-  		<h:inputText id="msnm" 
value="#{manager.uiUser.attribute.msnm}"
required="#{metadataservice.msnm.required}"/>
-  		<h:panelGroup />
-  		<h:message for="msnm" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_YIM}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.yim.required}" />
-  	</h:panelGroup>
-  		<h:inputText id="yim"  value="#{manager.uiUser.attribute.yim}"
required="#{metadataservice.yim.required}"/>
-  		<h:panelGroup />
-  		<h:message for="yim" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_XMMP}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.xmmp.required}" />
-  	</h:panelGroup>
-  		<h:inputText id="xmmp" 
value="#{manager.uiUser.attribute.xmmp}"
required="#{metadataservice.xmmp.required}"/>
-  		<h:panelGroup />
-  		<h:message for="xmmp" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-	<h:panelGroup/>
-	<h:panelGroup>
-	<ul class="topnav">
-		<li id="currentTab">
-			<h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL}" />
-		</li>
-	</ul>
-	</h:panelGroup>
-  		
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.homepage.required}" />
-  	</h:panelGroup>
-  	<h:inputText id="homepage" 
value="#{manager.uiUser.attribute.homepage}"
required="#{metadataservice.homepage.required}"/>
-  	<h:panelGroup />
-  	<h:message for="homepage" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-  		
-  		
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.occupation.required}" />
-  	</h:panelGroup>
-  		<h:inputText id="occupation" 
value="#{manager.uiUser.attribute.occupation}"
required="#{metadataservice.occupation.required}"/>
-  		<h:panelGroup />
-  		<h:message for="occupation" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-  		
-  		
-	<h:panelGroup>
-		<h:outputText value="#{bundle.IDENTITY_INTERESTS}"/>
-  		<h:outputText value=" *"
rendered="#{metadataservice.interests.required}" />
-  	</h:panelGroup>
-  		<h:inputText id="interests"
value="#{manager.uiUser.attribute.interests}"
required="#{metadataservice.interests.required}"/>
-  		<h:panelGroup />
-  		<h:message for="interests" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-  		
-  		
-		<h:panelGroup>
-			<h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/>
-	  		<h:outputText value=" *"
rendered="#{metadataservice.signature.required}" />
-	  	</h:panelGroup>
-  		<h:panelGroup>
-  			<h:inputTextarea id="signature"
value="#{manager.uiUser.attribute.signature}" cols="50"
rows="5"
required="#{metadataservice.signature.required}"/><br/>	
-  			<h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE}"
/>
-  		</h:panelGroup>
-  		<h:panelGroup />
-  		<h:message for="signature" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-
-  		
-		<h:panelGroup>
-			<h:outputText value="#{bundle.IDENTITY_EXTRA}"/>
-	  		<h:outputText value=" *"
rendered="#{metadataservice.extra.required}" />
-	  	</h:panelGroup>
-  		<h:panelGroup>
-  			<h:inputTextarea id="extra"
value="#{manager.uiUser.attribute.extra}" cols="50" rows="5"
required="#{metadataservice.extra.required}"/><br/>
-  			<h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_EXTRA}"
/>
-  		</h:panelGroup>
-  		<h:panelGroup />
-  		<h:message for="extra" infoClass="portlet-msg-success"
errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
-  		
-	</h:panelGrid>
-	
 	<hr/>
 		<p style="text-align: left;">
 			<h:outputText value="* #{bundle.IDENTITY_REGISTER_REQUIRED_INFORMATION}"
/>

Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml	2008-08-19
09:43:42 UTC (rev 11702)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml	2008-08-19
11:47:25 UTC (rev 11703)
@@ -44,6 +44,16 @@
 	<!-- include captcha -->
 	<ui:include src="/jsf/common/captcha.xhtml" />
 	
+	
+	<c:if test="#{portletPreferenceValue.profileAtRegistration == true}">
+		<ui:define name="content">
+			<ui:decorate template="/jsf/common/editProfileInfo.xhtml">
+				<ui:param name="manager" value="#{userregistermgr}"/>
+				<ui:param name="adminMode" value="false"/>
+			</ui:decorate>
+		</ui:define>
+	</c:if>
+	
 	<hr/>
 		<p style="text-align: left;">
 			<h:outputText value="* #{bundle.IDENTITY_REGISTER_REQUIRED_INFORMATION}"
/>

Added:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/viewProfileInfo.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/viewProfileInfo.xhtml	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/viewProfileInfo.xhtml	2008-08-19
11:47:25 UTC (rev 11703)
@@ -0,0 +1,33 @@
+<div
+   xmlns="http://www.w3.org/1999/xhtml"
+   xmlns:ui="http://java.sun.com/jsf/facelets"
+   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:f="http://java.sun.com/jsf/core"
+   xmlns:c="http://java.sun.com/jstl/core"
+   class="identity-ui">
+
+	<f:loadBundle var="bundle" basename="conf.bundles.Identity"
/>
+	<h:message id="status" for="status"
infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+		fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+
+	<h:panelGrid columns="2">
+	<h:outputText value="#{bundle.IDENTITY_USERNAME}:"/>
+	<h:outputText value="#{editprofilemgr.uiUser.username}"/>
+	
+	<h:outputText value="#{bundle.IDENTITY_EMAIL}:"
rendered="#{editprofilemgr.uiUser.attribute.email != null}"/>
+	<h:outputText value="#{editprofilemgr.uiUser.attribute.email}"
rendered="#{editprofilemgr.uiUser.attribute.email != null}"/>
+	
+	<h:outputText value="#{bundle.IDENTITY_GIVENNAME}:"
rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/>
+	<h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}"
rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/>
+	
+	<h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:"
rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/>
+	<h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}" 
rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/>
+	
+	<h:outputText value="#{bundle.IDENTITY_LOCATION}:"
rendered="#{editprofilemgr.uiUser.attribute.location != null}"/>
+	<h:outputText value="#{editprofilemgr.uiUser.attribute.location}"
rendered="#{editprofilemgr.uiUser.attribute.location != null}"/>
+	
+	<h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:"
rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/>
+	<h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}"
rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/>
+	
+	</h:panelGrid>
+</div>

Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml	2008-08-19
09:43:42 UTC (rev 11702)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml	2008-08-19
11:47:25 UTC (rev 11703)
@@ -15,29 +15,11 @@
 </ui:define>
 
 <ui:define name="content">
-	<h:message id="status" for="status"
infoClass="portlet-msg-success" errorClass="portlet-msg-error"
-		fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
-
-	<h:panelGrid columns="2">
-	<h:outputText value="#{bundle.IDENTITY_USERNAME}:"/>
-	<h:outputText value="#{editprofilemgr.uiUser.username}"/>
-	
-	<h:outputText value="#{bundle.IDENTITY_EMAIL}:"
rendered="#{editprofilemgr.uiUser.attribute.email != null}"/>
-	<h:outputText value="#{editprofilemgr.uiUser.attribute.email}"
rendered="#{editprofilemgr.uiUser.attribute.email != null}"/>
-	
-	<h:outputText value="#{bundle.IDENTITY_GIVENNAME}:"
rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/>
-	<h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}"
rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/>
-	
-	<h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:"
rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/>
-	<h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}" 
rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/>
-	
-	<h:outputText value="#{bundle.IDENTITY_LOCATION}:"
rendered="#{editprofilemgr.uiUser.attribute.location != null}"/>
-	<h:outputText value="#{editprofilemgr.uiUser.attribute.location}"
rendered="#{editprofilemgr.uiUser.attribute.location != null}"/>
-	
-	<h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:"
rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/>
-	<h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}"
rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/>
-	
-	</h:panelGrid>
+	<ui:define name="content">
+		<ui:decorate template="/jsf/common/viewProfileInfo.xhtml">
+			<ui:param name="manager" value="#{editprofilemgr}"/>
+		</ui:decorate>
+	</ui:define>
 </ui:define>
 
 </ui:composition>

Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml	2008-08-19
09:43:42 UTC (rev 11702)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml	2008-08-19
11:47:25 UTC (rev 11703)
@@ -16,7 +16,7 @@
 					<h:outputText value="#{bundle.IDENTITY_WELCOME}"/>
 				</li>
 				<li>
-					<h:commandLink value="#{bundle.IDENTITY_REGISTER}"
action="register"/>
+					<h:commandLink value="#{bundle.IDENTITY_REGISTER}"
action="register"  />
 				</li>
          <!--  check if we should enable lostPassword -->
 				<c:if test="#{portletPreferenceValue.lostPassword == true}">


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r11703 - in branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war: jsf and 2 other directories.