From: Roland Häder <roland@mxchange.org>
Date: Tue, 25 Apr 2017 11:41:23 +0000 (+0200)
Subject: Please cherry-pick (if needed):
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bcc9eab5702f531b72fb5316cc54b7da27282bb0;p=addressbook-war.git

Please cherry-pick (if needed):
- removed cellphone stuff
- no more cellphone here, now all mobile phones are welcome!

Signed-off-by: Roland Häder <roland@mxchange.org>
---

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
deleted file mode 100644
index de0dd7e7..00000000
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
+++ /dev/null
@@ -1,22 +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">
-
-	<ui:fragment rendered="#{empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
-			<ui:param name="styleClass" value="errors" />
-		</ui:include>
-	</ui:fragment>
-
-	<ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
-	</ui:fragment>
-
-	<ui:fragment rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl" />
-	</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
deleted file mode 100644
index 228cea62..00000000
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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_ADMIN_BEAN_MOBILE_NUMBER_NOT_SET}" rendered="#{empty adminPhoneController.MobileNumber}" />
-
-	<h:panelGrid id="cellphone_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty adminPhoneController.MobileNumber}">
-		<f:facet name="header">
-			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_DATA}" />
-		</f:facet>
-
-		<h:column>
-			<h:outputLabel for="cellphoneId" styleClass="data_label" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
-
-			<h:outputText id="cellphoneId" styleClass="data_field" value="#{adminPhoneController.MobileNumber.phoneId}" />
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="cellphoneProvider" styleClass="data_label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
-
-			<h:link outcome="admin_show_mobile_provider">
-				<f:param name="providerId" value="#{adminPhoneController.MobileNumber.cellphoneProvider.providerId}" />
-				<h:outputText id="cellphoneProvider" styleClass="data_field" value="#{adminPhoneController.MobileNumber.cellphoneProvider.providerName}" />
-			</h:link>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="cellphoneNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
-
-			<h:outputText id="cellphoneNumber" styleClass="data_field" value="#{adminPhoneController.MobileNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{adminPhoneController.MobileNumber.cellphoneProvider.providerDialPrefix}-#{adminPhoneController.MobileNumber.phoneNumber}" />
-		</h:column>
-
-		<h:column>
-			<h:outputLabel styleClass="data_label" value="#{msg.ADMIN_SHOW_MOBILE_LINKS}" />
-
-			<div class="data_field">
-				<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">
-					<ui:param name="isShowPage" value="#{isShowPage}" />
-				</ui:include>
-			</div>
-		</h:column>
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
deleted file mode 100644
index 964dd44a..00000000
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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">
-
-	<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
-			<ui:param name="styleClass" value="errors" />
-		</ui:include>
-	</ui:fragment>
-
-	<ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
-		<ul class="mini_nav">
-			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-				<li class="mini_link">
-					<h:link outcome="admin_show_cellphone">
-						<h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="mini_link">
-				<h:link outcome="admin_edit_cellphone">
-					<h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
-					<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-				</h:link>
-			</li>
-
-			<ui:fragment rendered="#{not empty beanHelper.contact}">
-				<li class="mini_link">
-					<h:link outcome="admin_unlink_contact_cellphone">
-						<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="mini_link">
-				<h:link outcome="admin_delete_cellphone">
-					<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-					<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-				</h:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
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
deleted file mode 100644
index 06e96e21..00000000
--- a/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl
+++ /dev/null
@@ -1,12 +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:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
-
-	<h:form id="form_add_contact_cellphone">
-	</h:form>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index fd6e7137..77695f02 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -230,7 +230,7 @@
 
 			<div class="table_row">
 				<div class="table_left_medium">
-					<h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
 				</div>
 
 				<div class="table_right_medium">
diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
index 65aef5bb..33a74e47 100644
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
@@ -6,14 +6,14 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}">
+		<h:selectOneMenu styleClass="select" id="mobileCarrier" value="#{targetController.mobileCarrier}">
 			<f:converter converterId="MobileProviderConverter" />
 			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 			<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
 		</h:selectOneMenu>
 
-		<h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">
-			<f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
+		<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
 		</h:inputText>
 	</ui:fragment>
 
diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml
index d4e1d24c..960a3bb1 100644
--- a/web/admin/mobile/admin_contact_mobile_list.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_list.xhtml
@@ -9,15 +9,15 @@
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
-			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}" />
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">
-			<h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allCellphones()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CELLPHONES}" rendered="#{not phoneController.allCellphones().isEmpty()}">
+			<h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
 				<h:column>
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index a1a364b1..3554b220 100644
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -14,11 +14,11 @@
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
-			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}" />
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">