From a6be6025523ec97575ef3268aeb345aa8e966b8f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 2 Aug 2016 16:07:45 +0200
Subject: [PATCH] Continued a bit: (please cherry-pick) - variable was not
 fully renamed, fixed - renamed countryI18nkey -> countryI18nKey - fixed name
 of context property (was shortended)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../admin/contact/admin_form_contact_data.tpl |  2 +-
 .../admin_form_mobile_provider.tpl            |  2 +-
 .../templates/contact/form_contact_data.tpl   |  2 +-
 web/WEB-INF/web.xml                           |  4 +-
 web/admin/country/admin_country_list.xhtml    |  2 +-
 .../admin_mobile_provider_list.xhtml          |  2 +-
 web/customer/empty_basket.xhtml               | 66 +++++++++----------
 web/guest/user/register_done.xhtml            |  4 +-
 8 files changed, 39 insertions(+), 45 deletions(-)

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 63020e78..a0d729a0 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -170,7 +170,7 @@
 					<h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}">
 						<f:converter converterId="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 597d4770..0b2fd8f8 100644
--- 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
@@ -67,7 +67,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 c878ceb5..2340f122 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -185,7 +185,7 @@
 					<h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}">
 						<f:converter converterId="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/web.xml b/web/WEB-INF/web.xml
index 75a17588..3db8bbd3 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -19,8 +19,8 @@
     </context-param>
     <context-param>
         <description>Whether "resend confirmation link" is enabled.</description>
-        <param-name>is_feature_user_resend_confirm_link_enabled</param-name>
-        <param-value>false</param-value>
+        <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>
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 26b383ae..6e6b3e7e 100644
--- 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 8d30d8b1..d1480294 100644
--- 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/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml
index c27205a2..382a2f79 100644
--- a/web/customer/empty_basket.xhtml
+++ b/web/customer/empty_basket.xhtml
@@ -15,50 +15,46 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-				<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>
+
+					<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>
-				</h:form>
-			</ui:fragment>
+				</div>
+			</h:form>
 
-			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-				<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" />
-			</ui:fragment>
+			<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml
index c4e8ab67..5a4d6080 100644
--- 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>
-- 
2.39.5