From: Roland Häder <roland@mxchange.org>
Date: Tue, 12 Sep 2017 20:59:02 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=084efced224555615ba9632796d99f6d0ca23707;p=jfinancials-war.git

Please cherry-pick:
- introduced JSF tag outputBasicDataAdminLinks which will render administrative
  links for basic company data
- all short navigational links now have full-explaining title attribute
- added missing navigation cases for edit/delete basic company data

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

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 1d3b64f2..0e40781b 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -907,8 +907,8 @@ ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE=Geben Sie hier die Adresse der Filiale
 ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED=Bitte geben Sie die Postleitzahl zur Filiale ein.
 ADMIN_BRANCH_OFFICE_CITY_REQUIRED=Bitte geben Sie die Stadt der Filiale ein.
 ADMIN_BRANCH_OFFICE_ALREADY_CREATED=Eine Filiale existiert bereits mit den angegebenen Daten.
-ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE=Zeige Details dieser Filiale an.
-ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE=Zeit das Benutzerprofil des Besitzers des Filialeintrages an.
+ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE=Zeigt Details dieser Filiale an.
+ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE=Zeigt das Benutzerprofil des Besitzers des Filialeintrages an.
 ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE=Dieser Filiale einen Benutzer als Besitzer zuweisen.
 ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE=Zeit die Daten der Kontaktperson dieser Filiale an.
 ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE=Einen Mitarbeiter als Kontaktperson dieser Filiale zuweisen.
@@ -916,3 +916,24 @@ NO_EMAIL_ADDRESS_ENTERED=Keine Email-Adresse eingegeben.
 DATA_ADDRESS=Adresse
 DATA_STORE=Etage:
 DATA_SUITE_NUMBER=Appartmentnummer:
+ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE=Zeigt Details zur Festnetznummer an.
+ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE=Editieren der Festnetznummer.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE=Entfernt die Verkuepfung der Festnetznummer vom Kontakt.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE=Loescht die Festnetznummer.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE=Entfernt die Verknuepfung der Mobilfunknummer vom Kontakt.
+ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE=Zeigt Details zur Mobilfunknummer an.
+ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE=Entfernt Verlinkung der Faxnummer vom Kontakt.
+ADMIN_LINK_SHOW_FAX_NUMBER_TITLE=Zeigt Details zur Faxnummer an.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE=Loescht die Mobilfunknummer.
+ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE=Editieren der Mobilfunknummer.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_DELETE_FAX_NUMBER_TITLE=Loescht die Faxnummer.
+ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Editieren der Faxnummer.
+ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edieren von Grunddaten des Unternehmens.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Loescht Grunddaten des Unternehmens.
+ADMIN_ACTION_LINKS=Aktionen:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 0a949742..f389354f 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -873,3 +873,18 @@ NO_EMAIL_ADDRESS_ENTERED=No email address entered.
 DATA_ADDRESS=Address
 DATA_STORE=Store:
 DATA_SUITE_NUMBER=Suite number:
+ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE=Shows details to land-line number.
+ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE=Edit of land-line number.
+ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE=Unlinks land-line number from contact.
+ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE=Deletes land-line number.
+ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE=Unlinks mobile number from contact.
+ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE=Shows details of mobile number.
+ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE=Unlinks fax number from contact.
+ADMIN_LINK_SHOW_FAX_NUMBER_TITLE=Shows details of fax number.
+ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE=Deletes mobile mobile.
+ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE=Edit of mobile number
+ADMIN_LINK_DELETE_FAX_NUMBER_TITLE=Deletes fax number.
+ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Edit of fax number.
+ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edit of basic data of company.
+ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Deletes basic data of company.
+ADMIN_ACTION_LINKS=Actions:
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 9b990622..b5a010a4 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -712,6 +712,14 @@
 			<from-outcome>admin_show_basic_data</from-outcome>
 			<to-view-id>/admin/basic_company_data/admin_basic_company_data_show.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_basic_data</from-outcome>
+			<to-view-id>/admin/basic_company_data/admin_basic_company_data_edit.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_delete_basic_data</from-outcome>
+			<to-view-id>/admin/basic_company_data/admin_basic_company_data_delete.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_assign_basic_company_data_contact</from-outcome>
 			<to-view-id>/admin/basic_company_data/admin_basic_company_data_assign_contact.xhtml</to-view-id>
diff --git a/web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl
new file mode 100644
index 00000000..10c6b8c6
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl
@@ -0,0 +1,32 @@
+<?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 rendered or rendered}">
+		<ul class="navbar-mini">
+			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+				<li class="navlink-mini">
+					<h:link outcome="admin_show_basic_data" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
+						<f:param name="basicDataId" value="#{basicData.basicDataId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="navlink-mini">
+				<h:link outcome="admin_edit_basic_data" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
+					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
+				</h:link>
+			</li>
+
+			<li class="navlink-mini">
+				<h:link outcome="admin_delete_basic_data">
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE}" />
+					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
+				</h:link>
+			</li>
+		</ul>
+	</ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl
index 22ab97e7..ec4645b1 100644
--- a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl
@@ -9,14 +9,14 @@
 	<ul class="navbar-mini">
 		<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
 			<li class="navlink-mini">
-				<h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+				<h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
 				</h:link>
 			</li>
 		</ui:fragment>
 
 		<li class="navlink-mini">
-			<h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
+			<h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}">
 				<f:param name="phoneId" value="#{faxNumber.phoneId}" />
 			</h:link>
 		</li>
@@ -24,7 +24,7 @@
 		<ui:fragment rendered="#{not empty contact}">
 			<li class="navlink-mini">
 				<h:link outcome="admin_unlink_contact_fax">
-					<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+					<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
 					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</h:link>
@@ -33,7 +33,7 @@
 
 		<li class="navlink-mini">
 			<h:link outcome="admin_delete_fax">
-				<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+				<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}" />
 				<f:param name="phoneId" value="#{faxNumber.phoneId}" />
 			</h:link>
 		</li>
diff --git a/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl
index 426fcda1..e047f651 100644
--- a/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl
@@ -10,14 +10,14 @@
 		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+					<h:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
 						<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
 					</h:link>
 				</li>
 			</ui:fragment>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
+				<h:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
 				</h:link>
 			</li>
@@ -25,7 +25,7 @@
 			<ui:fragment rendered="#{not empty contact}">
 				<li class="navlink-mini">
 					<h:link outcome="admin_unlink_contact_landline">
-						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
 						<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
 						<f:param name="contactId" value="#{contact.contactId}" />
 					</h:link>
@@ -34,7 +34,7 @@
 
 			<li class="navlink-mini">
 				<h:link outcome="admin_delete_landline">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE}" />
 					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
 				</h:link>
 			</li>
diff --git a/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl
index eb5a81d0..26ee5a28 100644
--- a/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl
@@ -9,14 +9,14 @@
 	<ul class="navbar-mini">
 		<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
 			<li class="navlink-mini">
-				<h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+				<h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
 				</h:link>
 			</li>
 		</ui:fragment>
 
 		<li class="navlink-mini">
-			<h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
+			<h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
 				<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
 			</h:link>
 		</li>
@@ -24,7 +24,7 @@
 		<ui:fragment rendered="#{not empty contact}">
 			<li class="navlink-mini">
 				<h:link outcome="admin_unlink_contact_mobile">
-					<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+					<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
 					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</h:link>
@@ -33,7 +33,7 @@
 
 		<li class="navlink-mini">
 			<h:link outcome="admin_delete_mobile">
-				<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+				<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
 				<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
 			</h:link>
 		</li>
diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index 07a50788..02d2aca3 100644
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -457,4 +457,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<type>java.lang.Boolean</type>
 		</attribute>
 	</tag>
+	<tag>
+		<tag-name>outputBasicDataAdminLinks</tag-name>
+		<description>This tag renders administrative links for given basicData instance.</description>
+		<source>resources/tags/admin/links/basic_data/admin_basic_data_links.tpl</source>
+		<attribute>
+			<name>basicData</name>
+			<description>The mobile instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type></type>
+		</attribute>
+		<attribute>
+			<name>renderShowLink</name>
+			<description>Whether to render (default: yes) "show basic data" link.</description>
+			<required>false</required>
+			<type>java.langBoolean</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
 </facelet-taglib>
diff --git a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
index 31e384e0..f993a082 100644
--- a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
+++ b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
@@ -91,6 +91,14 @@
 					<f:convertDateTime for="companyCreated" type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
 			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
+				</f:facet>
+
+				<widgets:outputBasicDataAdminLinks basicData="#{basicData}" />
+			</h:column>
 		</h:dataTable>
 
 		<h:form id="form_admin_add_basic_company_data">
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index c3d60867..e4fc9ecf 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -21,7 +21,7 @@
 					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+				<h:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
 				</h:link>
 			</h:column>
@@ -55,6 +55,6 @@
 			</h:column>
 		</h:dataTable>
 
-		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" styleClass="alert-danger" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" messageStyleClass="alert-danger" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 0af3d312..4fdeb105 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -78,7 +78,7 @@
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
 							<h:link outcome="admin_unlink_contact_fax">
-								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</h:link>
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 14bc6404..4ea5a9ba 100644
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -21,7 +21,7 @@
 					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+				<h:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
 				</h:link>
 			</h:column>
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 084cc6d9..77d693b5 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -79,7 +79,7 @@
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
 							<h:link outcome="admin_unlink_contact_landline">
-								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</h:link>
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 7372fb82..9dae953f 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -15,14 +15,14 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_mobile" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
+		<h:dataTable id="table_list_mobile" var="mobileNumber" value="#{phoneController.allMobileNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_mobile" value="#{mobile.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-					<f:param name="phoneId" value="#{mobile.phoneId}" />
+				<h:link outcome="admin_show_mobile" value="#{mobileNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
 				</h:link>
 			</h:column>
 
@@ -31,8 +31,8 @@
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_mobile_provider" value="#{mobile.mobileProvider.providerName}">
-					<f:param name="providerId" value="#{mobile.mobileProvider.providerId}" />
+				<h:link outcome="admin_show_mobile_provider" value="#{mobileNumber.mobileProvider.providerName}">
+					<f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
 				</h:link>
 			</h:column>
 
@@ -41,7 +41,7 @@
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 				</f:facet>
 
-				<h:outputText value="#{mobile.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobile.mobileProvider.providerDialPrefix}-#{mobile.phoneNumber}" />
+				<h:outputText value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
 			</h:column>
 
 			<h:column>
@@ -49,7 +49,7 @@
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 				</f:facet>
 
-				<h:outputText value="#{mobile.phoneEntryCreated.time}">
+				<h:outputText value="#{mobileNumber.phoneEntryCreated.time}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</h:column>
@@ -59,7 +59,7 @@
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 				</f:facet>
 
-				<h:outputText value="#{mobile.phoneEntryUpdated.time}">
+				<h:outputText value="#{mobileNumber.phoneEntryUpdated.time}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</h:column>
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index e5e8413c..1edd06f9 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -78,7 +78,7 @@
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
 							<h:link outcome="admin_unlink_contact_mobile">
-								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</h:link>