From: Roland Haeder <roland@mxchange.org>
Date: Mon, 18 Apr 2016 20:28:43 +0000 (+0200)
Subject: Continued a bit:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b29d25cb273cf8491c3244715637bedbe9333461;p=pizzaservice-war.git

Continued a bit:
- added template for showing "add_contact_cellphone" form or show contact's cellphone data
- added form template for above thing
- fixed some XML name spaces (to .org)
- fixed error message output in some templates
---

diff --git a/web/WEB-INF/templates.dist/template.tpl b/web/WEB-INF/templates.dist/template.tpl
index d1d06bb0..aa442752 100644
--- a/web/WEB-INF/templates.dist/template.tpl
+++ b/web/WEB-INF/templates.dist/template.tpl
@@ -1,8 +1,8 @@
 <?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:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<!-- Put your stuff here //-->
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
new file mode 100644
index 00000000..2f3ec755
--- /dev/null
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<ui:fragment rendered="#{empty cellphoneNumber and not empty user}">
+		<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl">
+			<ui:param name="contact" value="#{user.userContact}" />
+		</ui:include>
+	</ui:fragment>
+
+	<ui:fragment rendered="#{not empty cellphoneNumber}">
+		<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
+			<ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
+			<ui:param name="user" value="#{user}" />
+		</ui:include>
+	</ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
index dfaf3a64..47ce5c93 100644
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />
 
 	<h:panelGrid id="cellphone_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CELLPHONE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty cellphoneNumber}">
 		<f:facet name="header">
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
index c3dffb48..abd24354 100644
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />
 
 	<ui:fragment id="cellphoneLinks" rendered="#{not empty cellphoneNumber}">
 		<ul class="mini_nav">
diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl
new file mode 100644
index 00000000..25dd7b39
--- /dev/null
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:form id="add_contact_cellphone">
+	</h:form>
+</ui:composition>
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 629ec20c..2e45ef73 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -175,7 +175,7 @@
 				<ui:param name="user" value="#{user}" />
 			</ui:include>
 
-			<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
+			<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
 				<ui:param name="cellphoneNumber" value="#{user.userContact.contactCellphoneNumber}" />
 				<ui:param name="user" value="#{user}" />
 			</ui:include>