]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 25 Mar 2018 02:15:23 +0000 (04:15 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 25 Mar 2018 02:22:06 +0000 (04:22 +0200)
- renamed admin_form_mobile_data.tpl to admin_edit_form_mobile_data.tpl as this
  tag is for editing mobile numbers
- started cleanup by removing no longer valid (PF + jquery-ui have own stuff)
  <div> tags
- reformatted more p:inputText
- size="10" for <landLine|fax|mobile>Number is a bit to short, let's take 20
  again
- size="20" for email addresses is a bit to short, let's take 40 then
- replace more h:outputLink with p:link, need to take href attribute with this
  tag then
- renamed *_LANDLINE_* i18n keys to *_LAND_LINE_*
- used p:outputPanel instead of plain <div> tag, may now lesser break
- no size of landline/fax number (not area-code)

Signed-off-by: Roland Häder <roland@mxchange.org>
21 files changed:
src/java/org/mxchange/localization/generic_de_DE.properties
src/java/org/mxchange/localization/generic_en_US.properties
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl
web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl
web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl
web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl
web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
web/WEB-INF/widgets.jsf.taglib.xml
web/admin/contact/admin_contact_export.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_show.xhtml
web/admin/user/admin_user_export.xhtml

index 532e18450f4a35e3cdd1130f2e731783c5add44b..4fbd04ea640eeff97997954a2c3832e87e99036a 100644 (file)
@@ -477,7 +477,7 @@ ADMIN_LINK_LIST_CONTACT=Kontaktdaten
 ADMIN_LINK_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden.
 ADMIN_CONTACT_COUNTRY_CODE=L\u00e4ndercode:
 ADMIN_CONTACT_MOBILE_NUMBER=Handynummer:
-ADMIN_CONTACT_LANDLINE_NUMBER=Telefonnummer:
+ADMIN_CONTACT_LAND_LINE_NUMBER=Telefonnummer:
 ADMIN_CONTACT_FAX_NUMBER=Faxnummer:
 PAGE_TITLE_ADMIN_EXPORT_CONTACT=Kontaktdaten exportieren
 CONTENT_TITLE_ADMIN_EXPORT_CONTACT=Kontaktdaten exportieren:
@@ -503,7 +503,7 @@ ADMIN_EXPORT_CONTACT_CITY=Wohnort
 ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS=Email-Adresse
 ADMIN_EXPORT_CONTACT_BIRTHDAY=Geburtsdatum
 ADMIN_EXPORT_CONTACT_MOBILE_NUMBER=Handynummer
-ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER=Festnetznummer
+ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER=Festnetznummer
 ADMIN_EXPORT_CONTACT_FAX_NUMBER=Faxnummer
 ADMIN_EXPORT_CONTACT_CREATED=Eintrag erstellt
 GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED=Bitte geben Sie Ihren Vornamen ein.
@@ -892,12 +892,12 @@ 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.
+ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE=Zeigt Details zur Festnetznummer an.
+ADMIN_LINK_EDIT_LAND_LINE_NUMBER_TITLE=Editieren der Festnetznummer.
 #@TODO Please fix German umlauts!
-ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE=Entfernt die Verkuepfung der Festnetznummer vom Kontakt.
+ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE=Entfernt die Verkuepfung der Festnetznummer vom Kontakt.
 #@TODO Please fix German umlauts!
-ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE=Loescht die Festnetznummer.
+ADMIN_LINK_DELETE_LAND_LINE_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.
@@ -932,7 +932,7 @@ ADMIN_EMPTY_LIST_COUNTRY=Es befinden sich keine Laender in der Datenbank. Oder I
 #@TODO Please fix German umlauts!
 ADMIN_EMPTY_LIST_FAX_NUMBER=Es befinden sich keine Faxnummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen.
 #@TODO Please fix German umlauts!
-ADMIN_EMPTY_LIST_LANDLINE_NUMBER=Es befinden sich keine Festnetznummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen.
+ADMIN_EMPTY_LIST_LAND_LINE_NUMBER=Es befinden sich keine Festnetznummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen.
 #@TODO Please fix German umlauts!
 ADMIN_EMPTY_LIST_MOBILE_NUMBER=Es befinden sich keine Mobilfunknummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen.
 #@TODO Please fix German umlauts!
@@ -1158,3 +1158,7 @@ COUNTRY_ITALIA=Italien
 ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Bitte geben Sie das Geburtsdatum des Kontaktes ein.
 ADMIN_SELECT_USER_PROFILE_MODE=Profilmodus ausw\u00e4hlen:
 ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Filialbesitzer/-leiter
+ADMIN_LAND_LINE_AREA_CODE_REQUIRED=Bitte geben Sie die Vorwahlnummer zur Festnetznummer ein.
+ADMIN_LAND_LINE_NUMBER_REQUIRED=Bitte geben Sie die Rufnummer zur Festnetznummer ein.
+ADMIN_FAX_AREA_CODE_REQUIRED=Bitte geben Sie die Vorwahlnummer zur Faxnummer ein.
+ADMIN_FAX_NUMBER_REQUIRED=Bitte geben Sie die Rufnummer zur Faxnummer ein.
index 6b51d5c703941c85b28b4a63a27f0b81ad2614f7..56523449909678c96cd35e12d87563cb4839b399 100644 (file)
@@ -465,7 +465,7 @@ ADMIN_LINK_LIST_CONTACT=Contact data
 ADMIN_LINK_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created.
 ADMIN_CONTACT_COUNTRY_CODE=Country code:
 ADMIN_CONTACT_MOBILE_NUMBER=Mobile number:
-ADMIN_CONTACT_LANDLINE_NUMBER=Phone number:
+ADMIN_CONTACT_LAND_LINE_NUMBER=Phone number:
 ADMIN_CONTACT_FAX_NUMBER=Fax number:
 PAGE_TITLE_ADMIN_EXPORT_CONTACT=Export contact data
 CONTENT_TITLE_ADMIN_EXPORT_CONTACT=Export contact data:
@@ -491,7 +491,7 @@ ADMIN_EXPORT_CONTACT_CITY=City
 ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS=Email address
 ADMIN_EXPORT_CONTACT_BIRTHDAY=Birthday
 ADMIN_EXPORT_CONTACT_MOBILE_NUMBER=Mobile number
-ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER=Land-line number
+ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER=Land-line number
 ADMIN_EXPORT_CONTACT_FAX_NUMBER=Fax number
 ADMIN_EXPORT_CONTACT_CREATED=Entry created
 GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED=Please enter your first name.
@@ -846,10 +846,10 @@ 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 a land-line number.
-ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE=Edit of a land-line number.
-ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE=Unlinks land-line number from contact.
-ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE=Deletes a land-line number.
+ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE=Shows details to a land-line number.
+ADMIN_LINK_EDIT_LAND_LINE_NUMBER_TITLE=Edit of a land-line number.
+ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE=Unlinks land-line number from contact.
+ADMIN_LINK_DELETE_LAND_LINE_NUMBER_TITLE=Deletes a land-line number.
 ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE=Unlinks mobile number from contact.
 ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE=Shows details of a mobile number.
 ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE=Unlinks fax number from contact.
@@ -873,7 +873,7 @@ ADMIN_LINK_EDIT_COUNTRY_TITLE=Edit of a country.
 ADMIN_LINK_DELETE_COUNTRY_TITLE=Deletes a country.
 ADMIN_EMPTY_LIST_COUNTRY=There are no countries in database. Or your search criteria doesn't match anything.
 ADMIN_EMPTY_LIST_FAX_NUMBER=There are no fax numbers in database. Or your search criteria doesn't match anything.
-ADMIN_EMPTY_LIST_LANDLINE_NUMBER=There are no land-line numbers in database. Or your search criteria doesn't match anything.
+ADMIN_EMPTY_LIST_LAND_LINE_NUMBER=There are no land-line numbers in database. Or your search criteria doesn't match anything.
 ADMIN_EMPTY_LIST_MOBILE_NUMBER=There are no mobile numbers in database. Or your search criteria doesn't match anything.
 ADMIN_EMPTY_LIST_CONTACT_MOBILE=There are no mobile numbers of contacts in database. Or your search criteria doesn't match anything.
 ADMIN_MOBILE_PROVIDER_COUNTRY_REQUIRED=Please select a country for mobile provider.
@@ -1046,3 +1046,7 @@ COUNTRY_ITALIA=Italia
 ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Please enter birthday of contact.
 ADMIN_SELECT_USER_PROFILE_MODE=Select profile mode:
 ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Branch office owner/leader
+ADMIN_LAND_LINE_AREA_CODE_REQUIRED=Please enter an area-code for land-line number.
+ADMIN_LAND_LINE_NUMBER_REQUIRED=Please enter caller number for land-line number.
+ADMIN_FAX_AREA_CODE_REQUIRED=Please enter an area-code for fax number.
+ADMIN_FAX_NUMBER_REQUIRED=Please enter caller number for fax number.
index d60ab1a2a48a9b94f09e42f872ffa5c69ce3a2cb..f79cb3cecae025d9abd8dd041c95d17a3bd16f24 100644 (file)
@@ -98,9 +98,9 @@
        <p:column>
                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+               <p:link id="contactEmailAddress" styleClass="table-data-field" href="mailto:#{beanHelper.contact.contactEmailAddress}">
                        <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
-               </h:outputLink>
+               </p:link>
        </p:column>
 
        <p:column>
index 72ad507f07ea97d318dc633cd5f36926cfcf6cdd..d5ff8f9942af09de4e69a43340ffdcc96e29ed30 100644 (file)
@@ -34,8 +34,8 @@
        <p:column>
                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+               <p:link id="contactEmailAddress" styleClass="table-data-field" href="mailto:#{beanHelper.contact.contactEmailAddress}">
                        <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
-               </h:outputLink>
+               </p:link>
        </p:column>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl
new file mode 100644 (file)
index 0000000..d938eb3
--- /dev/null
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui">
+
+       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
+               <fieldset class="fieldset">
+                       <legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
+                       </legend>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <p:outputLabel for="mobileNumberId" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:outputText id="mobileNumberId" value="#{mobileNumber.phoneId}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                                       <p:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
+
+                                       <p:selectOneMenu
+                                               id="mobileProvider"
+                                               value="#{adminPhoneController.mobileProvider}"
+                                               filter="true"
+                                               filterMatchMode="contains"
+                                               required="true"
+                                               requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
+                                               >
+                                               <f:converter converterId="MobileProviderConverter" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+                                       </p:selectOneMenu>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="mobileProvider" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
+
+                               <p:inputText
+                                       id="mobileNumber"
+                                       size="20"
+                                       maxlength="20"
+                                       value="#{adminPhoneController.phoneNumber}"
+                                       required="true"
+                                       requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}"
+                                       >
+                                       <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+                               </p:inputText>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="mobileNumber" />
+                       </h:panelGroup>
+               </fieldset>
+       </h:panelGroup>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
deleted file mode 100644 (file)
index a5f194d..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
-
-       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
-               <fieldset class="fieldset">
-                       <legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
-                       </legend>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="mobileNumberId" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:outputText id="mobileNumberId" value="#{mobileNumber.phoneId}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu
-                                               id="mobileProvider"
-                                               value="#{adminPhoneController.mobileProvider}"
-                                               filter="true"
-                                               filterMatchMode="contains"
-                                               required="true"
-                                               requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
-                                               >
-                                               <f:converter converterId="MobileProviderConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="mobileProvider" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
-                                               <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="mobileNumber" />
-                       </h:panelGroup>
-               </fieldset>
-       </h:panelGroup>
-</ui:composition>
index c1d9c669fa5fb2b6c5142c39612c60fdc2f5a5e7..c4845dc986205a59ec6aa453191f38cdd93107f4 100644 (file)
                <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
                                <li class="navlink-mini">
-                                       <p:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
+                                       <p:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}">
                                                <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
                                        </p:link>
                                </li>
                        </ui:fragment>
 
                        <li class="navlink-mini">
-                               <p:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE}">
+                               <p:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_LAND_LINE_NUMBER_TITLE}">
                                        <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
                                </p:link>
                        </li>
@@ -26,7 +26,7 @@
                        <ui:fragment rendered="#{not empty contact}">
                                <li class="navlink-mini">
                                        <p:link outcome="admin_unlink_contact_landline">
-                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
+                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}" />
                                                <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
                                                <f:param name="contactId" value="#{contact.contactId}" />
                                        </p:link>
@@ -35,7 +35,7 @@
 
                        <li class="navlink-mini">
                                <p:link outcome="admin_delete_landline">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE}" />
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_LAND_LINE_NUMBER_TITLE}" />
                                        <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
                                </p:link>
                        </li>
index 6b3f892515e2dae81ea5f83c6206652197151eea..fea581065aba0a43677542b6ebad8d5bf30e694d 100644 (file)
@@ -9,11 +9,24 @@
        <p:panelGrid layout="grid" columns="3" styleClass="table table-full ui-noborder" rendered="#{empty rendered or rendered == true}">
                <core:outputCountrySelector id="faxCountry" styleClass="select" value="#{targetController.faxCountry}" />
 
-               <p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
+               <p:inputText
+                       id="faxAreaCode"
+                       size="5"
+                       maxlength="10"
+                       value="#{targetController.faxAreaCode}"
+                       required="#{required}"
+                       requiredMessage="#{msg.ADMIN_FAX_AREA_CODE_REQUIRED}"
+                       >
                        <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                </p:inputText>
 
-               <p:inputText id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
+               <p:inputText
+                       id="faxNumber"
+                       maxlength="20"
+                       value="#{targetController.faxNumber}"
+                       required="#{required}"
+                       requiredMessage="#{msg.ADMIN_FAX_NUMBER_REQUIRED}"
+                       >
                        <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                </p:inputText>
        </p:panelGrid>
index 4c75c4be865c545b53329c50f0d8736da641f061..161f7212e5c59f328f401559253a9649721c90b0 100644 (file)
@@ -9,11 +9,24 @@
        <p:panelGrid layout="grid" columns="3" styleClass="table table-full ui-noborder" rendered="#{empty rendered or rendered == true}">
                <core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{targetController.landLineCountry}" />
 
-               <p:inputText id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
+               <p:inputText
+                       id="landLineAreaCode"
+                       size="5"
+                       maxlength="10"
+                       value="#{targetController.landLineAreaCode}"
+                       required="#{required}"
+                       requiredMessage="#{msg.ADMIN_LAND_LINE_AREA_CODE_REQUIRED}"
+                       >
                        <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
                </p:inputText>
 
-               <p:inputText id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
+               <p:inputText
+                       id="landLineNumber"
+                       maxlength="20"
+                       value="#{targetController.landLineNumber}"
+                       required="#{required}"
+                       requiredMessage="#{msg.ADMIN_LAND_LINE_NUMBER_REQUIRED}"
+                       >
                        <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
                </p:inputText>
        </p:panelGrid>
index e8a039098e6038473ca1954fede5856319771c82..8e88242d240c8307109eeb31dfff73c54b5316f2 100644 (file)
                        >
                        <f:converter converterId="MobileProviderConverter" />
                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                       <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+                       <f:selectItems
+                               value="#{mobileProviderController.allMobileProviders()}"
+                               var="mobileProvider"
+                               itemValue="#{mobileProvider}"
+                               itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})"
+                               />
                </p:selectOneMenu>
 
-               <p:inputText id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+               <p:inputText
+                       id="mobileNumber"
+                       maxlength="20"
+                       value="#{targetController.mobileNumber}"
+                       required="#{required}"
+                       requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}"
+                       >
                        <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                </p:inputText>
        </p:panelGrid>
index d9cfe262ed16ce7602c9dd02f3d7f7636b9f3a09..2f831a990f70da27907d81659744b776cedde530 100644 (file)
                                </p:inputText>
 
                                <p:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BASIC_DATA_COMPANY_EMAIL_ADDRESS}" />
-                               <p:inputText id="companyEmailAddress" size="20" maxlength="255" value="#{adminBasicCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                               <p:inputText
+                                       id="companyEmailAddress"
+                                       size="40"
+                                       maxlength="255"
+                                       value="#{adminBasicCompanyDataController.companyEmailAddress}"
+                                       validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
+                                       >
                                        <validator:basicDataEmailAddressValidator allowEmptyRequiredData="true" />
                                </p:inputText>
 
                                <core:outputMessageBox id="companyLogo" message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
 
                                <p:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BASIC_DATA_COMPANY_TAX_NUMBER}" />
-                               <p:inputText id="companyTaxNumber" size="30" maxlength="200" value="#{adminBasicCompanyDataController.companyTaxNumber}" />
+                               <p:inputText
+                                       id="companyTaxNumber"
+                                       size="30"
+                                       maxlength="200"
+                                       value="#{adminBasicCompanyDataController.companyTaxNumber}"
+                                       />
 
                                <p:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BASIC_DATA_COMPANY_WEBSITE_URL}" />
-                               <p:inputText id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminBasicCompanyDataController.companyWebsiteUrl}" validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}">
+                               <p:inputText
+                                       id="companyWebsiteUrl"
+                                       size="30"
+                                       maxlength="200"
+                                       value="#{adminBasicCompanyDataController.companyWebsiteUrl}"
+                                       validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}"
+                                       >
                                        <validator:urlValidator allowEmptyRequiredData="true" />
                                </p:inputText>
 
index e4fd7bd2b10887d28f21ae54e5fc0fedc70d182a..22ebd8a779ee7434cf4530108f1a7d20df85a74b 100644 (file)
                        </p:selectOneMenu>
 
                        <p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
-                       <p:inputText id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                       <p:inputText
+                               id="branchEmailAddress"
+                               size="40"
+                               maxlength="255"
+                               value="#{adminBranchOfficeController.branchEmailAddress}"
+                               validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
+                               >
                                <validator:basicDataEmailAddressValidator allowEmptyRequiredData="true" />
                        </p:inputText>
 
index 2cc22003942cf2a1a4d2e11e3887a2fb718c9755..e206995b2304ffaa4c5c662e42c3237271cc615a 100644 (file)
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeeEmailAddress" value="#{msg.ADMIN_ENTER_EMPLOYEE_EMAIL_ADDRESS}" />
-                       <p:inputText id="employeeEmailAddress" size="20" maxlength="255" value="#{adminEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                       <p:inputText
+                               id="employeeEmailAddress"
+                               size="40"
+                               maxlength="255"
+                               value="#{adminEmployeeController.employeeEmailAddress}"
+                               validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
+                               >
                                <validator:employeeEmailAddressValidator allowEmptyRequiredData="true" />
                        </p:inputText>
 
index 97e6f3cddf674daf2877e2d7db9e006cc98801ce..2f5abe8582abadfbc713d5fe6741e63c9acdbc57 100644 (file)
                        </p:selectOneMenu>
 
                        <p:outputLabel for="headquarterEmailAddress" value="#{msg.ADMIN_ENTER_HEADQUARTER_EMAIL_ADDRESS}" />
-                       <p:inputText id="headquarterEmailAddress" size="20" maxlength="255" value="#{adminHeadquarterController.headquarterEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                       <p:inputText
+                               id="headquarterEmailAddress"
+                               size="40"
+                               maxlength="255"
+                               value="#{adminHeadquarterController.headquarterEmailAddress}"
+                               validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
+                               >
                                <validator:headquarterEmailAddressValidator allowEmptyRequiredData="true" />
                        </p:inputText>
 
index e30997d1b3483bedaad3c88b813b7dd6ce9de8d9..a29e127bb6cd12a7fac51f87671885f9c11c5d31 100644 (file)
@@ -162,7 +162,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputAdminMobileDataFormFields</tag-name>
                <description>This tag renders a fieldset for administrative purposes of mobile data.</description>
-               <source>resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl</source>
+               <source>resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl</source>
                <attribute>
                        <name>mobileNumber</name>
                        <description>The mobile instance that provides the data for this tag.</description>
@@ -404,6 +404,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
                        <type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
                </attribute>
+               <attribute>
+                       <name>required</name>
+                       <description>Whether the fax number is a required field (default: false).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
        </tag>
        <tag>
                <tag-name>inputLandLineNumberPanelGrid</tag-name>
@@ -411,7 +417,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                <source>resources/tags/input/panel_grid/landline_input_panel_grid.tpl</source>
                <attribute>
                        <name>rendered</name>
-                       <description>Whether this tag is being rendered by JSF engine (default: true).</description>
+                       <description>Whether this tag is being rendered by JSF engine (default: true)</description>
                        <required>false</required>
                        <type>java.lang.Boolean</type>
                </attribute>
@@ -422,6 +428,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
                        <type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
                </attribute>
+               <attribute>
+                       <name>required</name>
+                       <description>Whether the land-line number is a required field (default: false).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
        </tag>
        <tag>
                <tag-name>inputMobileNumberPanelGrid</tag-name>
@@ -440,5 +452,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
                        <type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
                </attribute>
+               <attribute>
+                       <name>required</name>
+                       <description>Whether the mobile number is a required field (default: false).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
        </tag>
 </facelet-taglib>
index c1e081632aa7ede2c13a3bee86f64eb6fb2fc156..7e1b93419c40359c0aa1878ad8b22253b9ae2ae2 100644 (file)
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER}" />
                                        </f:facet>
 
                                        <h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactLandLineNumber)}" />
index 89ea9ee7aa71da3979b6c2d32f7f8286c141bdc1..c0bfa91cce7c3a1988141cdb65931aa06443355d 100644 (file)
@@ -67,9 +67,9 @@
                        <p:column>
                                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+                               <p:link id="contactEmailAddress" styleClass="table-data-field" href="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
-                               </h:outputLink>
+                               </p:link>
                        </p:column>
 
                        <p:column>
index f7c681176767df186ed67394cd67b6c505c40ac9..7f5e2d073a58b79fb1c5dc7c711fb362e12ddb9f 100644 (file)
                        paginator="true"
                        rows="10"
                        summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}"
-                       emptyMessage="#{msg.ADMIN_EMPTY_LIST_LANDLINE_NUMBER}"
+                       emptyMessage="#{msg.ADMIN_EMPTY_LIST_LAND_LINE_NUMBER}"
                        >
                        <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_HEADER_ID_NUMBER}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
+                               <p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}">
                                        <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
                                </p:link>
                        </p:column>
index 4a96da03cbb5b7b3d267ffb00bfff6921f7fdbe7..eff8df45466807796f9f387af8621912f24ce035 100644 (file)
@@ -68,9 +68,9 @@
                        <p:column>
                                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+                               <p:link id="contactEmailAddress" styleClass="table-data-field" href="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
-                               </h:outputLink>
+                               </p:link>
                        </p:column>
 
                        <p:column>
@@ -80,7 +80,7 @@
                                        <ul class="navbar-mini">
                                                <li class="navlink-mini">
                                                        <p:link outcome="admin_unlink_contact_landline">
-                                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
+                                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}" />
                                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </p:link>
index 25214c8a701ffbdd661ff173fdbc263714d7b7b3..17d62b512348647b62eb64392da247d11d205a5e 100644 (file)
                        <p:column>
                                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+                               <p:link id="contactEmailAddress" styleClass="table-data-field" href="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
-                               </h:outputLink>
+                               </p:link>
                        </p:column>
 
                        <p:column>
                                <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-                               <div class="table-data-field">
+                               <p:outputPanel styleClass="table-data-field">
                                        <ul class="navbar-mini">
                                                <li class="navlink-mini">
                                                        <p:link outcome="admin_unlink_contact_mobile">
@@ -85,7 +85,7 @@
                                                        </p:link>
                                                </li>
                                        </ul>
-                               </div>
+                               </p:outputPanel>
                        </p:column>
                </p:dataTable>
        </ui:define>
index dbd24a44ee2917f108a88bc1b8be35fd90e100f1..d29e695a00b1aa87bab420e57403c08419d81636 100644 (file)
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER}" />
                                        </f:facet>
 
                                        <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactLandLineNumber)}" />