From 4c4623ef7e77d439fe393ad71bc0251dd5c95f29 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 19 Apr 2017 17:47:37 +0200
Subject: [PATCH] Maybe cherry-pick: - text should be wrapped in h:outputText
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland HÃ¤der <roland@mxchange.org>
---
 web/WEB-INF/faces-config.xml                  | 15 -----
 web/guest/user/user_show_addressbook.xhtml    | 56 -------------------
 .../user/user_show_addressbook_entries.xhtml  | 22 --------
 3 files changed, 93 deletions(-)
 delete mode 100644 web/guest/user/user_show_addressbook.xhtml
 delete mode 100644 web/guest/user/user_show_addressbook_entries.xhtml
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 60130680..22c241cd 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -156,21 +156,6 @@
 			<to-view-id>/index.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
-	<navigation-rule>
-		<from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>user_add_addressbook</from-outcome>
-			<to-view-id>/user/login_add_addressbook.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>user_show_addressbook</from-outcome>
-			<to-view-id>/guest/user/user_show_addressbook.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>show_addressbook_entries</from-outcome>
-			<to-view-id>/guest/user/user_show_addressbook_entries.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/guest/user/user_list.xhtml</from-view-id>
 		<navigation-case>
diff --git a/web/guest/user/user_show_addressbook.xhtml b/web/guest/user/user_show_addressbook.xhtml
deleted file mode 100644
index a02d5e90..00000000
--- a/web/guest/user/user_show_addressbook.xhtml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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">
-
-	<f:metadata>
-		<f:viewParam id="addressbookId" name="addressbookId" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">
-			<f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-			<f:validator for="addressbookId" validatorId="JLandingPageIdValidator" />
-		</f:viewParam>
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadJLandingPage()}">
-				<f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
-
-				<h:outputLabel for="addressbookName" styleClass="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
-				<h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
-
-				<h:outputLabel for="userProfileLink" styleClass="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
-				<ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
-					<ui:param name="user" value="#{addressbookController.addressbookUser}" />
-				</ui:include>
-
-				<h:outputLabel for="addressbookCreated" styleClass="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
-				<h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
-					<f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
-				</h:outputFormat>
-
-				<h:outputLabel for="addressbookStatus" styleClass="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>
-				<h:outputText id="addressbookStatus" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />
-
-				<f:facet name="footer">
-					<h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not userLoginController.isUserLoggedIn()}" />
-					<h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{userLoginController.isUserLoggedIn() and userLoginController.isInvisible()}" />
-
-					<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.isInvisible()}">
-						<h:outputText value="Bla bla" rendered="#{addressbookController.isOtherJLandingPage()}" />
-					</ui:fragment>
-				</f:facet>
-			</h:panelGrid>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/guest/user/user_show_addressbook_entries.xhtml b/web/guest/user/user_show_addressbook_entries.xhtml
deleted file mode 100644
index 88472995..00000000
--- a/web/guest/user/user_show_addressbook_entries.xhtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
-- 
2.39.5

