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 7c143d8a6353a661974fe1de70b3a148c66fac85..0cc39a3bf1b5b1f74df11a14c6172057176a2ff7 100644 (file)
--- 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 fc455c031316c644ef73cb4bc6c71d29f99de200..ecbf277b91ad31d4cdce7b5eea55c1f0163a9da8 100644 (file)
--- 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 dd960dd5e4ffc968aff87598b0fa785c43cae08e..46858e2ec9c905dc58123e35a3672161e2c20e1f 100644 (file)
--- 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 e3ce7a26b699651ac5b3a3a9895f0444ef376a6d..440c8bd1aa41625b10fb33bb5f2ab33a391f9b7e 100644 (file)
--- 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 2c9f27de24f6e9b9d5745c2ab3d0b392f2fc5c0d..612651dcfe1cc480569ad1a50bc0f38e56cca155 100644 (file)
--- 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 {