]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Tue, 12 Sep 2017 20:59:02 +0000 (22:59 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 16 Sep 2017 14:38:54 +0000 (16:38 +0200)
- 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>
15 files changed:
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/faces-config.xml
web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl
web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl
web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl
web/WEB-INF/widgets.jsf.taglib.xml
web/admin/basic_company_data/admin_basic_company_data_list.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile/admin_mobile_show.xhtml

index 30d41a8c7fec8cfe80244896652ff181a1014319..51ab88fa2c416cd3a4e8b9b5b77bd5301a5c6580 100644 (file)
@@ -885,8 +885,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.
@@ -894,5 +894,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!
-PARAMETER_ADDRESSBOOK_ID_NOT_FOUND=Der angeklickte Link ist nicht mehr gueltig: Addressbook mit der eingegebenen Id-Nummer existiert nicht mehr.
+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:
index ced58b6d13e1206e0cae8ccd543e609d153215b1..b34e2318dab20e24a56378e6eff954c86079d50d 100644 (file)
@@ -130,7 +130,6 @@ COUNTRY_PHILIPPINES=Philippines
 NONE_SELECTED=Empty
 ENTERED_HOUSE_NUMBER_INVALID=The entered house number is invalid.
 ENTERED_ZIP_CODE_INVALID=The entered ZIP code is invalid.
-PARAMETER_ADDRESSBOOK_ID_NOT_FOUND=The clicked link is no longer valid: Address book with entered id number does not exist (anymore).
 TABLE_HEADER_USER_LIST=List all users
 TABLE_SUMMARY_USER_LIST=This table lists all registered users you can share your address books with.
 USER_PROFILE_LEGEND=Publicly visible profile:
@@ -861,3 +860,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:
index c6cb418f715a1f5139086bdf85c58ee807c35e06..3fc8dc8001ad70059733225588776faa57642f16 100644 (file)
                        <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 (file)
index 0000000..10c6b8c
--- /dev/null
@@ -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>
index 22ab97e797d35c0652f8f92c65795e6648f69c12..ec4645b1d0bb4e6e28310d0b66fcbb8214f301d4 100644 (file)
@@ -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>
index 426fcda1590a0106101bbd1c7c4aba05a32f226e..e047f65114c1a9f9437d6665587470d936ab162f 100644 (file)
                <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>
index eb5a81d022d3696bd19ffd454bc11617c4c959cb..26ee5a28015e992b2f12f9d9ce0ada2fe3101ff6 100644 (file)
@@ -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>
index 07a5078825556fbc9af878f9b27fc44e46cff13a..02d2aca3b977c2aad195680292688bfabffaefc3 100644 (file)
@@ -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>
index 31e384e0e02aa177215f5c6dda0d5ff6c8eb19f3..f993a0822dc5d5a108aa67917aba2561bcbbbf15 100644 (file)
                                        <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">
index c3d608671436ef0c7914942f7d6dd26fe24aad3c..e4fc9ecff2173d0aa53d4a592a51a78ca00c12f9 100644 (file)
@@ -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>
index 0af3d3123760255dcf06b8976e15f38c55c284ca..4fdeb105de10af7259af174ca81a9ce6544643be 100644 (file)
@@ -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>
index 14bc6404d36fa87389ec990e466621dfc41b29ac..4ea5a9bac34f62e4fb12d3ab73ebb366ad5c61f2 100644 (file)
@@ -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>
index 084cc6d9facb3a10aba4034ac62b7cb01e0ffaab..77d693b53132f6b3538b37b3fb6aae91dd1f5812 100644 (file)
@@ -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>
index 7372fb823a353bd2fabca7059975ee5dc0f2ef25..9dae953f4231e0cd9ffc8e32d8b125307580aa6c 100644 (file)
        </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>
index e5e8413c02051dfac6d8ba9468350f1d4a926087..1edd06f9e8dfcda73ea987532289fec2debe0b49 100644 (file)
@@ -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>