From: Roland Häder <roland@mxchange.org>
Date: Mon, 5 Sep 2016 15:10:18 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9fecd6fda6671d5fb117f9a610c7ca253d27b3a9;p=jjobs-war.git

Please cherry-pick:
- added feature switch "user_registraion_in_index" which controls whether the registration page is in index (true) or own page (false).
- please put your index stuff in guest_index.tpl for now
- maybe later this will be changed to a datbase-driven CMS?

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

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 6c3c7458..600d4c7d 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -794,3 +794,4 @@ USER_ENTER_NEW_PASSWORD_REPEAT=Wiederholen:
 BUTTON_USER_CHANGE_PASSWORD=Passwort \u00e4ndern
 ADMIN_LINK_SHOW_CONTACT_DATA=Kontaktdaten anzeigen
 ERROR_USER_PASSWORD_TO_WEAK=Das eingegebene Passwort ist zu schwach. Bitte geben Sie Bustaben, Zahlen und Sonderzeichen ein, um ein sicheres Passwort zu erstellen.
+ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Fehler: Anmeldeseite ist die Eingangsseite, nicht die Anmeldeseite.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index c7a06137..65b31316 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -795,3 +795,4 @@ USER_ENTER_NEW_PASSWORD_REPEAT=Repeat:
 BUTTON_USER_CHANGE_PASSWORD=Change password
 ADMIN_LINK_SHOW_CONTACT_DATA=Show contact data
 ERROR_USER_PASSWORD_TO_WEAK=Your entered password is to weak. Please enter letters, numbers and special characters to create a secure password.
+ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Error: Registration page is index, not the registration page.
diff --git a/web/WEB-INF/templates/guest/guest_index.tpl b/web/WEB-INF/templates/guest/guest_index.tpl
new file mode 100644
index 00000000..50339f55
--- /dev/null
+++ b/web/WEB-INF/templates/guest/guest_index.tpl
@@ -0,0 +1,9 @@
+<?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">
+
+	Here goes your content.
+</ui:composition>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index eb42f2d3..a8025bfc 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -127,6 +127,11 @@
         <param-name>min_user_password_score</param-name>
         <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_registraion_in_index_enabled</param-name>
+        <param-value>false</param-value>
+    </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 340b6981..1bd6dd9b 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -16,7 +16,7 @@
 			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
 		</ui:define>
 
-		<ui:define name="content">
+		<ui:define name="content" rendered="#{not featureController.isFeatureEnabled('user_registraion_in_index')}">
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
 					<div class="para">
@@ -46,5 +46,12 @@
 				</ui:include>
 			</ui:fragment>
 		</ui:define>
+
+		<ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registraion_in_index')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/index.xhtml b/web/index.xhtml
index 9b7f7cde..2d926740 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -16,18 +16,19 @@
 			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_WELCOME}" />
 		</ui:define>
 
-		<ui:define name="content">
-			<div class="para">
-				<h:outputText value="#{msg.CONTENT_PAGE_INDEX_PARA1}" />
-			</div>
-
-			<div class="para">
-				<h:outputText value="#{msg.CONTENT_PAGE_INDEX_PARA2}" />
-			</div>
+		<ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registraion_in_index')}">
+			<div class="registration_form">
+				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
+					<ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
+				</ui:fragment>
 
 			<div class="para">
 				<h:outputText value="#{msg.CONTENT_PAGE_INDEX_PARA3}" />
 			</div>
 		</ui:define>
+
+		<ui:define name="content" rendered="#{not featureController.isFeatureEnabled('user_registraion_in_index')}">
+			<ui:include src="/WEB-INF/templates/guest/guest_index.tpl" />
+		</ui:define>
 	</ui:composition>
 </html>