X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=web%2FWEB-INF%2Ftemplates%2Fadmin%2Fuser%2Fadmin_form_user_data.tpl;h=4d533c4c219fa40da700793d72e9b4467707b53a;hb=81bd2f31031c73b5c24ccf308a9c9dad8d21ebd8;hp=d96ee2efdd9daa4a961e8914bd645a8c479e1fcf;hpb=bcdcc6db0910e7c8fdc22cc2ec233bcf511d2446;p=pizzaservice-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..4d533c4c 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,80 +1,79 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	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}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_MODE_NOT_SET}" styleClass="errors" 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>
+	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
+		<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>
 
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="userName" value="#{msg.ADMIN_USER_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>
-
-					<div class="clear"></div>
+			<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_row">
-					<div class="table_left">
-						<h:outputLabel for="emailAddress" value="#{msg.ADMIN_USER_DATA_ENTER_EMAIL}" />
-					</div>
-
-					<div class="table_right">
-						<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
-					</div>
-
-					<div class="clear"></div>
+				<div class="table_right_medium">
+					<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
 				</div>
 
-				<div class="para"></div>
+				<div class="clear"></div>
+			</h:panelGroup>
 
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />
-					</div>
+			<div class="para"></div>
 
-					<div class="table_right">
-						<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
-					</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="clear"></div>
+				<div class="table_right_medium">
+					<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
 				</div>
 
-				<div class="table_row">
-					<div class="table_left">
-						<h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />
-					</div>
+				<div class="clear"></div>
+			</h:panelGroup>
 
-					<div class="table_right">
-						<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
-					</div>
+			<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="clear"></div>
+				<div class="table_right_medium">
+					<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
 				</div>
 
-				<div class="para notice">
-					<ul>
-						<li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
+				<div class="clear"></div>
+			</h:panelGroup>
 
-						<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>
+			<h:panelGroup styleClass="table_row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
+				<div class="table_left_medium">
+					<h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
+				</div>
 
-						<li>#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}</li>
-					</ul>
+				<div class="table_right_medium">
+					<h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
 				</div>
-			</fieldset>
-		</div>
-	</ui:fragment>
+
+				<div class="clear"></div>
+			</h:panelGroup>
+
+			<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>
+				</ul>
+			</div>
+		</fieldset>
+	</h:panelGroup>
 </ui:composition>