Please cherry-pick:

- updated templates
- added missing template mobile_selection_box.tpl

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/templates/generic/locale_selection_box.tpl b/web/WEB-INF/templates/generic/locale_selection_box.tpl
index 49f485c0674fd40f018d0ae24d60d00e55701ad0..3da8dafc39ed3cd8041a63d61593cdb5ea31f308 100644 (file)
--- 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 (file)
index 0000000..33a74e4
--- /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 c9020630f08cafcae878d2aae5c843f868edaf5a..0fa8fcd5670b2d6361d703d39763907e0bd60b1c 100644 (file)
--- 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>