opps, not all was renamed (please cherry-pick)

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index 59a0b285c0f97c8e2a853213c8454a51de615183..1403a0d8ffe2987c4d2bc65b50a89e1bfeb2d0d3 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -7,7 +7,7 @@
 
        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
 
        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 

-       <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
+       <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">

                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_FORM_TITLE}" />
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_FORM_TITLE}" />


@@ -26,7 +26,7 @@
                                        <h:selectOneMenu styleClass="select right_space" id="choosenLandLineNumber" value="#{adminPhoneController.choosenLandLineNumber}">
                                                <f:converter converterId="LandLineConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                        <h:selectOneMenu styleClass="select right_space" id="choosenLandLineNumber" value="#{adminPhoneController.choosenLandLineNumber}">
                                                <f:converter converterId="LandLineConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />

-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
+                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.faxProvider.providerCountry.countryExternalDialPrefix} (#{faxNumber.faxProvider.providerDialPrefix}) #{faxNumber.phoneNumber}" />

                                        </h:selectOneMenu>
                                </div>
                        </div>
                                        </h:selectOneMenu>
                                </div>
                        </div>


@@ -37,7 +37,7 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
 
                        <div class="table_row">
                                <div class="table_left_medium">

-                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
+                                       <h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />

                                </div>
 
                                <div class="table_right_medium">
                                </div>
 
                                <div class="table_right_medium">

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index 59a0b285c0f97c8e2a853213c8454a51de615183..8d5c650fd6b3082bf00573c3616601cc9a230c51 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -7,7 +7,7 @@
 
        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
 
        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 

-       <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
+       <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">

                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_FORM_TITLE}" />
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_FORM_TITLE}" />


@@ -26,7 +26,7 @@
                                        <h:selectOneMenu styleClass="select right_space" id="choosenLandLineNumber" value="#{adminPhoneController.choosenLandLineNumber}">
                                                <f:converter converterId="LandLineConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                        <h:selectOneMenu styleClass="select right_space" id="choosenLandLineNumber" value="#{adminPhoneController.choosenLandLineNumber}">
                                                <f:converter converterId="LandLineConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />

-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
+                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.landlineProvider.providerCountry.countryExternalDialPrefix} (#{landlineNumber.landlineProvider.providerDialPrefix}) #{landlineNumber.phoneNumber}" />

                                        </h:selectOneMenu>
                                </div>
                        </div>
                                        </h:selectOneMenu>
                                </div>
                        </div>


@@ -37,7 +37,7 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
 
                        <div class="table_row">
                                <div class="table_left_medium">

-                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
+                                       <h:outputLabel for="landlineNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />

                                </div>
 
                                <div class="table_right_medium">
                                </div>
 
                                <div class="table_right_medium">

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
index 0bc92a85e14493ca0ec0eae90b41853b61cde5f8..35fc34d3c98045a1225cd735209a10c6d3ac663a 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
@@ -8,10 +8,10 @@
        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">

-               <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
+               <ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />

        </ui:fragment>
 
        <ui:fragment rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
        </ui:fragment>
 
        <ui:fragment rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">

-               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl" />
+               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl" />

        </ui:fragment>
 </ui:composition>
        </ui:fragment>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
index 4369ce0d4c141ab7c3e6194a890e3fbc9105e84a..f3195a77a60b26b733ecb5bd33cdb2dd9fa81187 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
@@ -7,7 +7,7 @@
 
        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
 
 
        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
 

-       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
+       <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty beanHelper.landLineNumber}">

                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_DATA}" />
                </f:facet>
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_DATA}" />
                </f:facet>


@@ -23,25 +23,25 @@
                </h:column>
 
                <h:column>
                </h:column>
 
                <h:column>

-                       <h:outputLabel for="mobileProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
+                       <h:outputLabel for="landlineProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />

 
 

-                       <h:link outcome="admin_show_mobile_provider">
-                               <f:param name="providerId" value="#{beanHelper.landLineNumber.mobileProvider.providerId}" />
-                               <h:outputText id="mobileProvider" styleClass="table_data_field" value="#{beanHelper.landLineNumber.mobileProvider.providerName}" />
+                       <h:link outcome="admin_show_landline_provider">
+                               <f:param name="providerId" value="#{beanHelper.landLineNumber.landlineProvider.providerId}" />
+                               <h:outputText id="landlineProvider" styleClass="table_data_field" value="#{beanHelper.landLineNumber.landlineProvider.providerName}" />

                        </h:link>
                </h:column>
 
                <h:column>
                        <h:outputLabel for="landLineNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
 
                        </h:link>
                </h:column>
 
                <h:column>
                        <h:outputLabel for="landLineNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
 

-                       <h:outputText id="landLineNumber" styleClass="table_data_field" value="#{beanHelper.landLineNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.landLineNumber.mobileProvider.providerDialPrefix}-#{beanHelper.landLineNumber.phoneNumber}" />
+                       <h:outputText id="landLineNumber" styleClass="table_data_field" value="#{beanHelper.landLineNumber.landlineProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.landLineNumber.landlineProvider.providerDialPrefix}-#{beanHelper.landLineNumber.phoneNumber}" />

                </h:column>
 
                <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
                        <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_LINKS}" />
 
                        <div class="table_data_field">
                </h:column>
 
                <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
                        <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_LINKS}" />
 
                        <div class="table_data_field">

-                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">
+                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_links.tpl">

                                        <ui:param name="isShowPage" value="#{isShowPage}" />
                                </ui:include>
                        </div>
                                        <ui:param name="isShowPage" value="#{isShowPage}" />
                                </ui:include>
                        </div>

diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
index f5b64ccd80325878df96c893ef43094f27cf6358..cd5c60a7f96739d992563f7eeea3a3a8a3d8d5e0 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
@@ -11,7 +11,7 @@
                <ul class="mini_nav">
                        <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
                                <li class="mini_link">
                <ul class="mini_nav">
                        <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
                                <li class="mini_link">

-                                       <h:link outcome="admin_show_mobile">
+                                       <h:link outcome="admin_show_landline">

                                                <h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                        </h:link>
                                                <h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                        </h:link>


@@ -19,7 +19,7 @@
                        </ui:fragment>
 
                        <li class="mini_link">
                        </ui:fragment>
 
                        <li class="mini_link">

-                               <h:link outcome="admin_edit_mobile">
+                               <h:link outcome="admin_edit_landline">

                                        <h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
                                        <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:link>
                                        <h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
                                        <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:link>


@@ -27,7 +27,7 @@
 
                        <ui:fragment rendered="#{not empty beanHelper.contact}">
                                <li class="mini_link">
 
                        <ui:fragment rendered="#{not empty beanHelper.contact}">
                                <li class="mini_link">

-                                       <h:link outcome="admin_unlink_contact_mobile">
+                                       <h:link outcome="admin_unlink_contact_landline">

                                                <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                                <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />


@@ -36,7 +36,7 @@
                        </ui:fragment>
 
                        <li class="mini_link">
                        </ui:fragment>
 
                        <li class="mini_link">

-                               <h:link outcome="admin_delete_mobile">
+                               <h:link outcome="admin_delete_landline">

                                        <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
                                        <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:link>
                                        <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
                                        <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:link>

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 414215b168fb27758e37388230b8b6b9b7b6e675..e41e6f3e673d73a061ab7f9b70d2511c246dbd9b 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -179,13 +179,21 @@
                                </h:column>
                        </h:panelGrid>
 
                                </h:column>
                        </h:panelGrid>
 

-                       <div>
+                       <div class="para">

                                <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl" />
                        </div>
 
                                <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl" />
                        </div>
 

-                       <div>
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+                       </div>
+
+                       <div class="para">

                                <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
                        </div>
                                <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
                        </div>

+
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+                       </div>

                </ui:define>
        </ui:composition>
 </html>
                </ui:define>
        </ui:composition>
 </html>