From 69df970d1b2d0c20512e96d76d128471cf2bc68b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Apr 2017 21:33:44 +0200
Subject: [PATCH] Please cherry-pick: - updated templates - added missing
 template mobile_selection_box.tpl
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../generic/locale_selection_box.tpl          |  4 ++--
 .../generic/mobile_selection_box.tpl          | 21 +++++++++++++++++++
 .../guest/user/guest_registration_form.tpl    |  4 ++--
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 web/WEB-INF/templates/generic/mobile_selection_box.tpl

diff --git a/web/WEB-INF/templates/generic/locale_selection_box.tpl b/web/WEB-INF/templates/generic/locale_selection_box.tpl
index 49f485c0..3da8dafc 100644
--- a/web/WEB-INF/templates/generic/locale_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/locale_selection_box.tpl
@@ -6,9 +6,9 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:form id="form_locale_selection">
-		<h:selectOneMenu styleClass="select" id="language_selection" value="#{localizationController.language}" onchange="submit()">
+		<h:selectOneMenu id="language_selection" value="#{localizationController.language}" onchange="submit()">
 			<f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" />
-			<f:selectItems value="#{localizationController.selectableLocalizations}" var="l" itemValue="#{l}" itemLabel="#{msg[l.toString().toUpperCase()]}" />
+			<f:selectItems value="#{localizationController.selectableLocalizations}" var="locale" itemValue="#{locale}" itemLabel="#{msg[locale.toString().toUpperCase()]}" />
 		</h:selectOneMenu>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
new file mode 100644
index 00000000..33a74e47
--- /dev/null
+++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<ui:fragment rendered="#{not empty targetController}">
+		<h:selectOneMenu styleClass="select" id="mobileCarrier" value="#{targetController.mobileCarrier}">
+			<f:converter converterId="MobileProviderConverter" />
+			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+			<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+		</h:selectOneMenu>
+
+		<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+		</h:inputText>
+	</ui:fragment>
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/guest_registration_form.tpl b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
index c9020630..0fa8fcd5 100644
--- a/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
@@ -8,7 +8,7 @@
 	<h:form id="register_page2_form">
 		<div class="table">
 			<div class="table_header">
-				#{msg.GUEST_REGISTRATION_PAGE2_TITLE}
+				<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
 			</div>
 
 			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
@@ -80,7 +80,7 @@
 					</div>
 
 					<div class="para notice">
-						#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}
+						<h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" />
 					</div>
 				</fieldset>
 			</div>
-- 
2.39.5