From: Roland Häder <roland@mxchange.org>
Date: Wed, 10 Aug 2016 12:58:13 +0000 (+0200)
Subject: Continued with cell phone: (please cherry-pick)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=056630e98b5a0bb8df215f1d11925982e4d5c678;p=jjobs-war.git

Continued with cell phone: (please cherry-pick)
- add template parameter showAdminLinks which hides all administrative links in admin_cellphone_data.tpl template
- added missing i18n string
- removed CSS property from data_label as it caused deformation (better fix it with an additional div/span tag)
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 7c143d8a..0cc39a3b 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -618,3 +618,4 @@ ADMIN_MOBILE_PROVIDER_REQUIRED=Bitte einen Mobilfunkanbieter ausw\u00e4hlen.
 ADMIN_CELLPHONE_NUMBER_REQUIRED=Bitte Mobilfunknummer angeben.
 BUTTON_ADMIN_DELETE_CELLPHONE=Mobilfunknummer l\u00f6schen
 ADMIN_DELETE_CELLPHONE_DATA_NOTICE=Wenn Sie die Mobilfunknummer l\u00f6schen, steht diese nicht mehr im System zur Verf\u00fcgung. Bitte \u00fcberlegen Sie genau, ob Sie dies wollen.
+ADMIN_DELETE_CELLPHONE_TITLE=Wollen Sie die Mobilfunknummer wirklich l\u00f6schen?
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index fc455c03..ecbf277b 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -618,3 +618,4 @@ ADMIN_MOBILE_PROVIDER_REQUIRED=Please choose a mobile provider.
 ADMIN_CELLPHONE_NUMBER_REQUIRED=Please enter a cell phone number.
 BUTTON_ADMIN_DELETE_CELLPHONE=Delete cell phone number
 ADMIN_DELETE_CELLPHONE_DATA_NOTICE=If you delete the cell phone number, it won't be available anymore for anything. Please consider carefully if you really want this.
+ADMIN_DELETE_CELLPHONE_TITLE=Do you really want to delete the cell phone number?
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 dd960dd5..46858e2e 100644
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -33,7 +33,7 @@
 			<h:outputText id="cellphoneNumber" styleClass="data_field" value="#{beanHelper.cellPhoneNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.cellPhoneNumber.cellphoneProvider.providerDialPrefix}-#{beanHelper.cellPhoneNumber.phoneNumber}" />
 		</h:column>
 
-		<h:column>
+		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
 			<h:outputLabel styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
 
 			<div class="data_field">
diff --git a/web/admin/cellphone/admin_cellphone_delete.xhtml b/web/admin/cellphone/admin_cellphone_delete.xhtml
index e3ce7a26..440c8bd1 100644
--- a/web/admin/cellphone/admin_cellphone_delete.xhtml
+++ b/web/admin/cellphone/admin_cellphone_delete.xhtml
@@ -28,6 +28,7 @@
 					<div class="para">
 						<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
 							<ui:param name="isShowPage" value="#{false}" />
+							<ui:param name="showAdminLinks" value="#{false}" />
 						</ui:include>
 					</div>
 
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index 2c9f27de..612651dc 100644
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -236,8 +236,7 @@ ul.footer_nav li.footer_copyright {
 
 .data_label {
 	font-weight: bold;
-	background-color: #dddddd;
-	padding-left: 2px;
+		background-color: #dddddd;
 }
 
 .unlink_link {