Continued a bit: (please cherry-pick)

- variable was not fully renamed, fixed
- renamed countryI18nkey -> countryI18nKey
- fixed name of context property (was shortended)

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

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 56be154b439ab6e15b60268ef9b5d4c57006b2df..8de921209c7f36efd6ca9fde1c4cf575b2e22f6d 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -137,7 +137,7 @@
                                <div class="table_right_medium">
                                        <h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
 

diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index 6f87af0747b25b65a1b0893b29efb4ae645bbfb6..f4b11504a7e06b4b8c71e5ef73646e756f4b602a 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -65,7 +65,7 @@
                                <div class="table_right_medium">
                                        <h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
 

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index ce9699ae2f8fb2f1e72c468e48c96052318dc2cb..51455c983853f462df85ebfa761acb0fb7d18598 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -170,11 +170,7 @@
                                <div class="table_right">
                                        <h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <<<<<<< HEAD
-                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
-                                               =======
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
-                                               >>>>>>> 99a5257... Continued a bit: (please cherry-pick)
                                        </h:selectOneMenu>
                                </div>
 

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 37c28b0ee8bf3a5ffca9c565b7b96308f1b475b5..40fa93ae700b3cbcdfae4657c005e8052218c6fe 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -18,8 +18,33 @@
         <param-value>false</param-value>
     </context-param>
     <context-param>
-        <description>Whether the multi-page registration page or a single registration page is active</description>
-        <param-name>is_multi_register_page</param-name>
+        <description>Whether "resend confirmation link" is enabled.</description>
+        <param-name>is_feature_user_resend_confirmation_link_enabled</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>Whether default timezon is set from system's timezone</description>
+        <param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>Whether registration page is enabled.</description>
+        <param-name>is_feature_user_registration_enabled</param-name>
+        <param-value>false</param-value>
+    </context-param>
+    <context-param>
+        <description>Whether the guest menu is enabled/shown to the user.</description>
+        <param-name>is_feature_guest_menu_enabled</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>Whether recovery of user passwords is enabled.</description>
+        <param-name>is_feature_user_password_recovery_enabled</param-name>
+        <param-value>false</param-value>
+    </context-param>
+    <context-param>
+        <description>Wether the gender is required for using the general contact controller.</description>
+        <param-name>is_feature_general_gender_enabled</param-name>
         <param-value>true</param-value>
     </context-param>
     <context-param>

diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 26b383ae5e7ba08b058e1b07cdf3f5b0ecc88e0d..6e6b3e7e51137db4b02da51f2d792b9ac216be5e 100644 (file)
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -47,7 +47,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[country.countryI18nkey]}" />
+                                       <h:outputText value="#{msg[country.countryI18nKey]}" />
                                </h:column>
                        </h:dataTable>
 

diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 8d30d8b19be303bc2db7e134e6d39b7c6d336971..d14802947373b9d28080f61fecabc0545e4d08b1 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -47,7 +47,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />
+                                       <h:outputText value="#{msg[mobile.providerCountry.countryI18nKey]}" />
                                </h:column>
 
                                <h:column>

diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml
index c4e8ab67142ab7bbb45dabdb3bf07791f8a6df16..5a4d6080c7f5b9c62b1ae5fc2d14f67ca96fd298 100644 (file)
--- a/web/guest/user/register_done.xhtml
+++ b/web/guest/user/register_done.xhtml
@@ -20,9 +20,7 @@
                        </div>
 
                        <div class="registration_form">
-                               <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESENT_CONFIRMATION_LINK}" outcome="user_resend_link">
-                                       <f:param name="user_id" value="#{userController.userId}" />
-                               </h:link>
+                               <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
                        </div>
                </ui:define>
        </ui:composition>

diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
index f0b675dbe0a0da37b87a1b35f3150b79177e938f..51061ce14b2c2467d49c28f1540762cbe482599d 100644 (file)
--- a/web/guest/user/resend_link.xhtml
+++ b/web/guest/user/resend_link.xhtml
@@ -2,10 +2,10 @@
 <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"
-         >
+       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="guest_title">#{msg.PAGE_TITLE_INDEX_RESEND_LINK}</ui:define>
@@ -15,50 +15,52 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{registerController.isResendConfirmationLinkEnabled()}">
-                               <h:form id="form_resend_link">
-                                       <div class="table">
-                                               <div class="table_header">
-                                                       <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
-                                               </div>
-
-                                               <fieldset id="email_address_notice">
-                                                       <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
-                                                               <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
-                                                       </legend>
+                       <h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
+                                       </div>
 
-                                                       <div class="table_row">
-                                                               <div class="table_left">
-                                                                       <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
-                                                               </div>
+                                       <fieldset id="email_address_notice">
+                                               <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
+                                                       <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
+                                               </legend>
 
-                                                               <div class="table_right">
-                                                                       <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{resendController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
-                                                                               <f:validator validatorId="EmailAddressValidator" />
-                                                                       </h:inputText>
-                                                               </div>
+                                               <div class="table_row">
+                                                       <div class="table_left">
+                                                               <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
                                                        </div>
-                                               </fieldset>
 
-                                               <div>
-                                                       <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                                                       <div class="table_right">
+                                                               <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{resendController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+                                                                       <f:validator validatorId="EmailAddressValidator" />
+                                                               </h:inputText>
+                                                       </div>
                                                </div>
+                                       </fieldset>
 
-                                               <div class="table_row">
-                                                       <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
-                                               </div>
+                                       <div>
+                                               <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                                       </div>
 
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{resendController.doResendLink()}" />
-                                               </div>
+                                       <div class="table_row">
+                                               <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
                                        </div>
-                               </h:form>
-                       </ui:fragment>
 
+                                       <div class="table_footer">
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{resendController.doResendLink()}" />
+                                       </div>
+                               </div>
+                       </h:form>
+
+                       <<<<<<< HEAD
                        <ui:fragment rendered="#{not registerController.isResendConfirmationLinkEnabled()}">
                                <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
                        </ui:fragment>
+                       =======
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+                       >>>>>>> de7e9f0... Continued a bit: (please cherry-pick)
                </ui:define>
        </ui:composition>
 </html>