moved template to proper place

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
index 02a8c00b7597082495c04018ade7a01332b75e8e..1f27e7dbeaac6dcd8e8cc248388afe37d1c609f1 100644 (file)
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
@@ -10,7 +10,7 @@
        </ui:fragment>
 
        <ui:fragment rendered="#{empty cellphoneNumber and not empty contact}">
-               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl">
+               <ui:include src="/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl">
                        <ui:param name="contact" value="#{contact}" />
                </ui:include>
        </ui:fragment>

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 db480479e7e4026e041663b3ccac65ad46c9e117..b14353891718a247684f923faa910ff4e31269b7 100644 (file)
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -1,57 +1,57 @@
-<?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">
-
-       <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">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_CELLPHONE_DATA}" />
-               </f:facet>
-
-               <h:column>
-                       <h:outputLabel for="cellphoneId" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
-
-                       <h:outputText id="cellphoneId" styleClass="data_field" value="#{cellphoneNumber.phoneId}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="cellphoneProvider" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_PROVIDER_NAME}" />
-
-                       <h:link outcome="admin_show_mobile_provider">
-                               <f:param name="providerId" value="#{cellphoneNumber.cellphoneProvider.providerId}" />
-                               <h:outputText id="cellphoneProvider" styleClass="data_field" value="#{cellphoneNumber.cellphoneProvider.providerName}" />
-                       </h:link>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="cellphoneNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE}" />
-
-                       <h:outputText id="cellphoneNumber" styleClass="data_field" value="#{cellphoneNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{cellphoneNumber.cellphoneProvider.providerDialPrefix}-#{cellphoneNumber.phoneNumber}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
-
-                       <div class="data_field">
-                               <ui:fragment rendered="#{not empty contact}">
-                                       <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
-                                               <ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
-                                               <ui:param name="contact" value="#{contact}" />
-                                               <ui:param name="isShowPage" value="#{isShowPage}" />
-                                       </ui:include>
-                               </ui:fragment>
-
-                               <ui:fragment rendered="#{empty contact}">
-                                       <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
-                                               <ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
-                                               <ui:param name="isShowPage" value="#{isShowPage}" />
-                                       </ui:include>
-                               </ui:fragment>
-                       </div>
-               </h:column>
-       </h:panelGrid>
-</ui:composition>
+<?xml version="1.0" encoding="UTF-8" ?>\r
+<ui:composition\r
+       xmlns="http://www.w3.org/1999/xhtml"\r
+       xmlns:f="http://java.sun.com/jsf/core"\r
+       xmlns:h="http://java.sun.com/jsf/html"\r
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">\r
+\r
+       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />\r
+\r
+       <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}">\r
+               <f:facet name="header">\r
+                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_CELLPHONE_DATA}" />\r
+               </f:facet>\r
+\r
+               <h:column>\r
+                       <h:outputLabel for="cellphoneId" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />\r
+\r
+                       <h:outputText id="cellphoneId" styleClass="data_field" value="#{cellphoneNumber.phoneId}" />\r
+               </h:column>\r
+\r
+               <h:column>\r
+                       <h:outputLabel for="cellphoneProvider" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_PROVIDER_NAME}" />\r
+\r
+                       <h:link outcome="admin_show_mobile_provider">\r
+                               <f:param name="providerId" value="#{cellphoneNumber.cellphoneProvider.providerId}" />\r
+                               <h:outputText id="cellphoneProvider" styleClass="data_field" value="#{cellphoneNumber.cellphoneProvider.providerName}" />\r
+                       </h:link>\r
+               </h:column>\r
+\r
+               <h:column>\r
+                       <h:outputLabel for="cellphoneNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE}" />\r
+\r
+                       <h:outputText id="cellphoneNumber" styleClass="data_field" value="#{cellphoneNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{cellphoneNumber.cellphoneProvider.providerDialPrefix}-#{cellphoneNumber.phoneNumber}" />\r
+               </h:column>\r
+\r
+               <h:column>\r
+                       <h:outputLabel styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />\r
+\r
+                       <div class="data_field">\r
+                               <ui:fragment rendered="#{not empty contact}">\r
+                                       <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">\r
+                                               <ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />\r
+                                               <ui:param name="contact" value="#{contact}" />\r
+                                               <ui:param name="isShowPage" value="#{isShowPage}" />\r
+                                       </ui:include>\r
+                               </ui:fragment>\r
+\r
+                               <ui:fragment rendered="#{empty contact}">\r
+                                       <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">\r
+                                               <ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />\r
+                                               <ui:param name="isShowPage" value="#{isShowPage}" />\r
+                                       </ui:include>\r
+                               </ui:fragment>\r
+                       </div>\r
+               </h:column>\r
+       </h:panelGrid>\r
+</ui:composition>\r

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl
new file mode 100644 (file)
index 0000000..25dd7b3
--- /dev/null
+++ b/web/WEB-INF/templates/admin/cellphone/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/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl
deleted file mode 100644 (file)
index 25dd7b3..0000000
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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>