X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2FWEB-INF%2Ftemplates%2Fadmin%2Fuser%2Fadmin_form_user_data.tpl;h=e91047b4f5750b39e53e07c9f3c4a9e217ed85b9;hb=1d74c2c08b6c7d6e701f67d7262252fd763974a0;hp=d96ee2efdd9daa4a961e8914bd645a8c479e1fcf;hpb=575402b87eefa9fa3033b8d0d96de25bceed6058;p=jjobs-war.git

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index d96ee2ef..e91047b4 100644
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -5,73 +5,84 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />
+	<ui:fragment rendered="#{empty mode}">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
+			<ui:param name="message" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<ui:fragment rendered="#{not empty mode}">
 		<div class="para">
-			<fieldset id="login_data">
-				<legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}</legend>
-
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="userName" value="#{msg.ADMIN_USER_DATA_ENTER_USER_NAME}" />
+			<fieldset class="fieldset" id="login_data">
+				<legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
+					<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
+				</legend>
+
+				<h:panelGroup styleClass="table_row" layout="block">
+					<div class="table_left_medium">
+						<h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
 					</div>
 
-					<div class="table_right">
-						<h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+					<div class="table_right_medium">
+						<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
 					</div>
 
 					<div class="clear"></div>
-				</div>
+				</h:panelGroup>
+
+				<div class="para"></div>
 
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="emailAddress" value="#{msg.ADMIN_USER_DATA_ENTER_EMAIL}" />
+				<h:panelGroup styleClass="table_row" layout="block">
+					<div class="table_left_medium">
+						<h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
 					</div>
 
-					<div class="table_right">
-						<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
+					<div class="table_right_medium">
+						<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
 					</div>
 
 					<div class="clear"></div>
-				</div>
-
-				<div class="para"></div>
+				</h:panelGroup>
 
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />
+				<h:panelGroup styleClass="table_row" layout="block">
+					<div class="table_left_medium">
+						<h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
 					</div>
 
-					<div class="table_right">
-						<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+					<div class="table_right_medium">
+						<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
 					</div>
 
 					<div class="clear"></div>
-				</div>
+				</h:panelGroup>
 
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />
-					</div>
+				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
+					<h:panelGroup styleClass="table_row" layout="block">
+						<div class="table_left_medium">
+							<h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
+						</div>
 
-					<div class="table_right">
-						<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
-					</div>
+						<div class="table_right_medium">
+							<h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
+						</div>
 
-					<div class="clear"></div>
-				</div>
+						<div class="clear"></div>
+					</div>
+				</ui:fragment>
 
 				<div class="para notice">
 					<ul>
-						<li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
+						<li><h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" /></li>
 
 						<li>
 							<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
 							<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
 						</li>
 
-						<li>#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}</li>
+						<li>
+							<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />
+						</li>
 					</ul>
 				</div>
 			</fieldset>