From: Roland Häder <roland@mxchange.org>
Date: Fri, 10 Jun 2016 13:01:57 +0000 (+0200)
Subject: added missing language i18n strings + show logout form only to logged-in users ...
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1d3ea26ac3b654427c88b30fcc140669bd24fffe;p=pizzaservice-war.git

added missing language i18n strings + show logout form only to logged-in users ...

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

diff --git a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionController.java
index f5a841f4..b71a3f43 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionController.java
@@ -40,19 +40,27 @@ public interface PizzaUserLoginWebSessionController extends Serializable {
 	 */
 	void setBaseTemplatePathName (final String baseTemplatePathName);
 
+	/**
+	 * Logout for administrator area. If a logged-in user instance exists, it is
+	 * being logged-out, too.
+	 * <p>
+	 * @return Outcome (should be redirected)
+	 */
+	String doAdminLogout ();
+
 	/**
 	 * Logins the user, if the account is found, confirmed and unlocked.
 	 * <p>
 	 * @return Redirect target
 	 */
-	String doLogin ();
+	String doUserLogin ();
 
 	/**
 	 * Logout for current user by invalidating the current session.
 	 * <p>
 	 * @return Outcome (should be redirected)
 	 */
-	String doLogout ();
+	String doUserLogout ();
 
 	/**
 	 * Getter for logged-in user instance
diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml
index 27022217..8d8c61f1 100644
--- a/web/user/login_logout.xhtml
+++ b/web/user/login_logout.xhtml
@@ -15,7 +15,7 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:form id="user_logout">
+			<h:form id="user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
 				<div class="table">
 					<div class="table_header">
 						<h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />
@@ -31,6 +31,10 @@
 					</div>
 				</div>
 			</h:form>
+
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>