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=32a07ff8657ccaf1b44431262ed7c471cb004aa4;hpb=c0abb71f417f87ff79785f0503fe40f8af1524ed;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 32a07ff8..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
@@ -1,88 +1,91 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	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="#{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_medium">
-						<h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
-					</div>
-
-					<div class="table_right">
-						<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
-					</div>
-
-					<div class="clear"></div>
-				</div>
-
-				<div class="para"></div>
-
-				<ui:fragment rendered="#{mode == 'add'}">
-					<div class="table_row">
-						<div class="table_left_medium">
-							<h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS}" />
-						</div>
-
-						<div class="table_right">
-							<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
-						</div>
-
-						<div class="clear"></div>
-					</div>
-
-					<div class="para"></div>
-				</ui:fragment>
-
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />
-					</div>
-
-					<div class="table_right">
-						<h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
-					</div>
-
-					<div class="clear"></div>
-				</div>
-
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />
-					</div>
-
-					<div class="table_right">
-						<h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
-					</div>
-
-					<div class="clear"></div>
-				</div>
-
-				<div class="para notice">
-					<ul>
-						<li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
-
-						<li>
-							<h:outputText value="#{msg.ADMIN_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
-							<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
-						</li>
-
-						<ui:fragment rendered="#{mode == 'add'}">
-							<li>
-								<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />
-							</li>
-						</ui:fragment>
-					</ul>
-				</div>
-			</fieldset>
-		</div>
-	</ui:fragment>
-</ui:composition>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<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 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_medium">
+						<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+					</div>
+
+					<div class="clear"></div>
+				</h:panelGroup>
+
+				<div class="para"></div>
+
+				<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_medium">
+						<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+					</div>
+
+					<div class="clear"></div>
+				</h:panelGroup>
+
+				<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_medium">
+						<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+					</div>
+
+					<div class="clear"></div>
+				</h:panelGroup>
+
+				<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_medium">
+							<h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
+						</div>
+
+						<div class="clear"></div>
+					</div>
+				</ui:fragment>
+
+				<div class="para notice">
+					<ul>
+						<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>
+							<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />
+						</li>
+					</ul>
+				</div>
+			</fieldset>
+		</div>
+	</ui:fragment>
+</ui:composition>