X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fguest%2Fuser%2Fuser_confirm_account.xhtml;h=00a99c690ea2bb9841b9548e9978e02fb6b3c140;hb=dfa222d281815eb19245c29c173461b7c9fdbb7c;hp=40adbfdf71bb1432be9f5d57d75e764989ffedac;hpb=09f19e69924538b768c70f45f4c565566539bfe1;p=jjobs-war.git

diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index 40adbfdf..00a99c69 100644
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -1,58 +1,45 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+				xmlns="http://www.w3.org/1999/xhtml"
+				xmlns:core="http://mxchange.org/jsf/core/widgets"
+				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:h="http://xmlns.jcp.org/jsf/html"
+				xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="metadata">
-			<f:metadata>
-				<f:viewParam name="confirmKey" value="#{confirmationLinkController.confirmationKey}" />
-				<f:viewAction onPostback="true" action="#{confirmationLinkController.maybeConfirmUserAccount()}" />
-			</f:metadata>
-		</ui:define>
+	<ui:define name="metadata">
+		<f:metadata>
+			<f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
+			<f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
+		</f:metadata>
+	</ui:define>
 
-		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
-		</ui:define>
+	<ui:define name="document_guest_title">
+		<h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
+	</ui:define>
 
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}" />
-		</ui:define>
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}" />
+	</ui:define>
 
-		<ui:define name="content">
-			<ui:fragment rendered="#{not empty confirmationLinkController.confirmationKey}">
-				<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
-					<div class="table_header">
-						<h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
-					</div>
+	<ui:define name="content">
+		<ui:fragment rendered="#{not empty userConfirmationLinkController.confirmationKey}">
+			<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
+				<div class="table-header">
+					<h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
+				</div>
 
-					<div class="table_row">
-						<h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
-							<f:param value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
-							<f:param value="#{beanHelper.user.userContact.contactFirstName}" />
-							<f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
-						</h:outputFormat>
-					</div>
+				<h:panelGroup styleClass="table-row" layout="block">
+					<h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
+						<f:param value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
+						<f:param value="#{beanHelper.user.userContact.contactFirstName}" />
+						<f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
+					</h:outputFormat>
 				</h:panelGroup>
+			</h:panelGroup>
 
-				<ui:fragment rendered="#{empty beanHelper.user}">
-					<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-						<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
-						<ui:param name="styleClass" value="errors" />
-					</ui:include>
-				</ui:fragment>
-			</ui:fragment>
+			<core:outputMessageBox id="error-helper-user" message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+		</ui:fragment>
 
-			<ui:fragment rendered="#{empty confirmationLinkController.confirmationKey}">
-				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
-					<ui:param name="styleClass" value="errors" />
-				</ui:include>
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+		<core:outputMessageBox id="error-confirmation-key" message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
+	</ui:define>
+</ui:composition>
