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 d1d06bb014c4bbcef1df4cb3d585e7a6886053ce..aa442752288244f073aaae03955c6894a709995c 100644 (file)
--- 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 (file)
index 0000000..2f3ec75
--- /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 dfaf3a64cc5a76de4106a46bc8909de6713a5979..47ce5c93e8d5d061f882327b742a2a6fc9a2c182 100644 (file)
--- 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 c3dffb486cea4fe4f45a70d55875571b77c141fc..abd24354063aa6cdec21b40c444f927ced8ae3ad 100644 (file)
--- 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 (file)
index 0000000..25dd7b3
--- /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 629ec20ce93a6c1b1cd36eeb2d2feb429af45658..2e45ef7344c5235c9530b4de9d2d49511a8ddcc5 100644 (file)
--- 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>