From: Roland Häder <roland@mxchange.org>
Date: Fri, 9 Jun 2017 18:52:34 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f70a17cb0e13fc1838c5c067f4a34baaf25774c;p=jfinancials-war.git

Please cherry-pick:
- used h:panelGroup instead of div
- sorted context parameters in web.xml
- added missing (somehow) user_must_change_email_address feature flag (enabled)

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

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index eedc6614..cc84a604 100644
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -35,7 +35,7 @@
 					<ui:include src="/WEB-INF/templates/generic/locale_selection_box.tpl" />
 				</div>
 
-				<div id="content_outer" class="left_content">
+				<h:panelGroup id="content_outer" class="left_content" layout="block">
 					<div id="content_header">
 						<ui:insert name="content_header">Default content header</ui:insert>
 					</div>
@@ -47,7 +47,7 @@
 					<h:panelGroup styleClass="error_container" layout="block">
 						<h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
 					</h:panelGroup>
-				</div>
+				</h:panelGroup>
 
 				<div class="clear"></div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 936e772f..4ab43f24 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -12,11 +12,6 @@
         <param-name>is_feature_user_name_required_enabled</param-name>
         <param-value>true</param-value>
     </context-param>
-    <context-param>
-        <description>Whether the public user profile is enabled.</description>
-        <param-name>is_public_profile_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
     <context-param>
         <description>Whether "resend confirmation link" is enabled.</description>
         <param-name>is_feature_user_resend_confirmation_link_enabled</param-name>
@@ -78,7 +73,7 @@
         <param-value>true</param-value>
     </context-param>
     <context-param>
-        <description>Feature: Users must change password after login (with current password). Administrators can enforce this.</description>
+        <description>Whether users must change password after login (with current password). Administrators can enforce this.</description>
         <param-name>is_feature_user_must_change_password_enabled</param-name>
         <param-value>true</param-value>
     </context-param>
@@ -88,22 +83,23 @@
         <param-value>true</param-value>
     </context-param>
     <context-param>
-        <description>Maximum passwords that must be different.</description>
-        <param-name>max_user_password_history</param-name>
-        <param-value>5</param-value>
-    </context-param>
-    <context-param>
-        <param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
+        <description>Whether users can change their email address.</description>
+        <param-name>is_feature_user_must_change_email_address_enabled</param-name>
         <param-value>true</param-value>
     </context-param>
     <context-param>
-        <description>Whether debugging of registration form is enabled.</description>
-        <param-name>is_debug_register_enabled</param-name>
+        <description>Whether user registration page is in index or own page.</description>
+        <param-name>is_feature_user_registration_in_index_enabled</param-name>
         <param-value>false</param-value>
     </context-param>
     <context-param>
-        <description>Whether users can change their email address.</description>
-        <param-name>is_feature_user_must_change_email_address_enabled</param-name>
+        <description>Whether the can change email address.</description>
+        <param-name>is_feature_user_change_email_address_enabled</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>Whether the public user profile is enabled.</description>
+        <param-name>is_public_profile_enabled</param-name>
         <param-value>true</param-value>
     </context-param>
     <context-param>
@@ -112,10 +108,19 @@
         <param-value>50</param-value>
     </context-param>
     <context-param>
-        <description>Whether user registration page is in index or own page.</description>
-        <param-name>is_feature_user_registration_in_index_enabled</param-name>
+        <description>Maximum passwords that must be different.</description>
+        <param-name>max_user_password_history</param-name>
+        <param-value>5</param-value>
+    </context-param>
+    <context-param>
+        <description>Whether debugging of registration form is enabled.</description>
+        <param-name>is_debug_register_enabled</param-name>
         <param-value>false</param-value>
     </context-param>
+    <context-param>
+        <param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
+        <param-value>true</param-value>
+    </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>