]> git.mxchange.org Git - addressbook-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 27 Aug 2017 13:02:11 +0000 (15:02 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 27 Aug 2017 13:42:15 +0000 (15:42 +0200)
- rewrote templates (ui:include with unsafe ui:param) to custom JSF tags (
  type-safe parameter, including required parameter)
- also the as type set interfaces are being considered by NetBeans auto-complete
  and matching elements are sorted up and marked bold, very nice!
- remove no longer needed i18n strings ("targetController not set" + "mode")

Signed-off-by: Roland Häder <roland@mxchange.org>
49 files changed:
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/resources/tags/admin/contact/admin_form_contact_data.tpl [deleted file]
web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
web/WEB-INF/templates/admin/fax/admin_fax_data.tpl [deleted file]
web/WEB-INF/templates/admin/fax/admin_fax_links.tpl [deleted file]
web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
web/WEB-INF/templates/admin/landline/admin_landline_data.tpl [deleted file]
web/WEB-INF/templates/admin/landline/admin_landline_links.tpl [deleted file]
web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl [deleted file]
web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl [deleted file]
web/WEB-INF/templates/admin/user/admin_form_user_data.tpl [deleted file]
web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
web/WEB-INF/templates/input_fields/fax_input_fields.tpl [deleted file]
web/WEB-INF/templates/input_fields/landline_input_fields.tpl [deleted file]
web/WEB-INF/templates/user/user_profile_link.tpl [deleted file]
web/WEB-INF/widgets.jsf.taglib.xml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
web/admin/fax/admin_fax_delete.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/landline/admin_landline_delete.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_mobile_delete.xhtml
web/admin/mobile/admin_mobile_show.xhtml
web/admin/user/admin_user_edit.xhtml
web/guest/user/user_list.xhtml

index 6c5dd4a9db4323525e62e16222938587cf48027b..3d5085c95817769291a6f761c1fedf12f5e0fb16 100644 (file)
@@ -343,7 +343,6 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Land:
 ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE=Editieren oder l\u00f6schen der L\u00e4nderdaten
 TABLE_SUMMARY_ADMIN_LIST_COUNTRIES=Listet alle bereits angelegten L\u00e4nderdaten auf.
 COUNTRY_GERMANY=Deutschland
-ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET=Fehler: Der Parameter 'targetController' ist nicht gesetzt.
 ADMIN_MENU_MOBILE_PROVIDER_TITLE=Handyanbieter
 LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE=Hinzuf\u00fcgen, auflisten, \u00e4ndern und l\u00f6schen von Handyanbietern.
 PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST=Handyanbieter verwalten
@@ -465,7 +464,6 @@ ADMIN_LINK_EDIT_CONTACT_TITLE=Hier k\u00f6nnen Sie die Kontaktdaten editieren.
 BUTTON_ADMIN_EDIT_USER=Benutzerdaten \u00e4ndern
 ADMIN_EDIT_USER_TITLE=Benutzerdaten editieren
 ADMIN_DATA_PASSWORD_EDIT_NOTICE=Wenn Sie das Passwort \u00e4ndern wollen, m\u00fcssen Sie es zweimal eingeben, anderfalls beide leer lassen.
-ERROR_PARAMETER_MODE_NOT_SET=Fehler: Parameter 'mode' nicht gesetzt.
 ADMIN_EDIT_CONTACT_TITLE=Kontaktdaten editieren (Id-Nummer: {0})
 BUTTON_ADMIN_EDIT_CONTACT=Kontaktdaten \u00e4ndern
 PAGE_TITLE_ADMIN_LIST_CONTACT=Kotaktdaten auflisten
@@ -916,3 +914,4 @@ ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Daten des Unternehmens
 #@TODO Please fix German umlauts!
 ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Weisst diesem Firmeneintrag einen Unternehmensgruender zu.
 ADMIN_BUSINESS_BASIC_DATA_CREATED=Eintrag erstellt
+ADMIN_USER_NAME_IS_REQUIRED=Bitte vergeben Sie einen Benutzernamen. Dieser muss unique sein.
index afb9bfb994313ba7034c8ac6b1a9a0841abf6811..c6cceca68ba763a7527391edf5ab8829a30cf62a 100644 (file)
@@ -325,7 +325,6 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Country:
 ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE=Edit or delete country
 TABLE_SUMMARY_ADMIN_LIST_COUNTRIES=List of all already added countries.
 COUNTRY_GERMANY=Germany
-ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET=Error: The parameter 'targetController' is not set.
 ADMIN_MENU_MOBILE_PROVIDER_TITLE=Mobile providers
 LINK_ADMIN_LIST_MOBILE_PROVIDER=List mobile provider
 LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE=Add, list, edit and delete mobile providers.
@@ -444,7 +443,6 @@ ADMIN_LINK_EDIT_CONTACT_TITLE=Here you can edit contact data.
 BUTTON_ADMIN_EDIT_USER=Change user data
 ADMIN_EDIT_USER_TITLE=Edit user data
 ADMIN_DATA_PASSWORD_EDIT_NOTICE=If you want to change the password, enter it twice, otherwise leave both empty.
-ERROR_PARAMETER_MODE_NOT_SET=Error: Parameter 'mode' is not set.
 ADMIN_EDIT_CONTACT_TITLE=Edit contact data (id number: {0})
 BUTTON_ADMIN_EDIT_CONTACT=Change contact data
 PAGE_TITLE_ADMIN_LIST_CONTACT=List contact entries
@@ -888,3 +886,4 @@ ADMIN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER=Founder
 ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Show data of company founder.
 ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Assigns a company founder to this company entry.
 ADMIN_BUSINESS_BASIC_DATA_CREATED=Entry created
+ADMIN_USER_NAME_IS_REQUIRED=Please enter a user name. This must be unique.
diff --git a/web/WEB-INF/resources/tags/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/contact/admin_form_contact_data.tpl
deleted file mode 100644 (file)
index 964049c..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="personal_data">
-                       <legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
-                       </legend>
-
-                       <widgets:outputPersonalTitleTableRow targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="firstName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="title" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="familyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="street" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
-                                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
-                                       </h:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="houseNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="houseNumberExtension" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
-                                               <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
-                                       </h:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="zipCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="city" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:selectOneMenu styleClass="select" id="country" value="#{adminContactController.contactCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
-                                       </h:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="country" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:selectOneMenu styleClass="select divider-right" id="landLineCountryCode" value="#{adminContactController.landLineCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </h:selectOneMenu>
-
-                                       <h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
-                                               <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
-
-                                       <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
-                                               <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="faxCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:selectOneMenu styleClass="select divider-right" id="faxCountryCode" value="#{adminContactController.faxCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </h:selectOneMenu>
-
-                                       <h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
-                                               <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
-
-                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
-                                               <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <widgets:outputMobileNumberTableRow targetController="#{adminContactController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                                               <f:validator validatorId="EmailAddressValidator" />
-                                               <f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
-                                       </h:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="emailAddress" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="contactBirthday" value="#{adminContactController.birthday}" size="10" converterMessage="#{msg.INVALID_BIRTHDAY}">
-                                               <f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
-                                       </h:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="contactBirthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputTextarea id="contactComment" styleClass="input" value="#{adminContactController.comment}" rows="7" cols="25" />
-                               </div>
-                       </h:panelGroup>
-               </fieldset>
-       </h:panelGroup>
-
-       <h:panelGroup styleClass="para notice" layout="block">
-               <ul>
-                       <li>
-                               <h:outputText value="#{msg.ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE}" />
-                       </li>
-               </ul>
-       </h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
new file mode 100644 (file)
index 0000000..964049c
--- /dev/null
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <h:panelGroup styleClass="para" layout="block">
+               <fieldset class="fieldset" id="personal_data">
+                       <legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
+                       </legend>
+
+                       <widgets:outputPersonalTitleTableRow targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="firstName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="title" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="familyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="street" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+                                       </h:inputText>
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="houseNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="houseNumberExtension" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                                               <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
+                                       </h:inputText>
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="zipCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="city" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select" id="country" value="#{adminContactController.contactCountry}">
+                                               <f:converter converterId="CountryConverter" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
+                                       </h:selectOneMenu>
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="country" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="landLineCountryCode" value="#{adminContactController.landLineCountry}">
+                                               <f:converter converterId="CountryConverter" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+                                       </h:selectOneMenu>
+
+                                       <h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
+                                               <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+
+                                       <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
+                                               <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="faxCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="faxCountryCode" value="#{adminContactController.faxCountry}">
+                                               <f:converter converterId="CountryConverter" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+                                       </h:selectOneMenu>
+
+                                       <h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
+                                               <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+
+                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
+                                               <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+                               </div>
+                       </h:panelGroup>
+
+                       <widgets:outputMobileNumberTableRow targetController="#{adminContactController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                                               <f:validator validatorId="EmailAddressValidator" />
+                                               <f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
+                                       </h:inputText>
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="emailAddress" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="contactBirthday" value="#{adminContactController.birthday}" size="10" converterMessage="#{msg.INVALID_BIRTHDAY}">
+                                               <f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
+                                       </h:inputText>
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="contactBirthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputTextarea id="contactComment" styleClass="input" value="#{adminContactController.comment}" rows="7" cols="25" />
+                               </div>
+                       </h:panelGroup>
+               </fieldset>
+       </h:panelGroup>
+
+       <h:panelGroup styleClass="para notice" layout="block">
+               <ul>
+                       <li>
+                               <h:outputText value="#{msg.ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE}" />
+                       </li>
+               </ul>
+       </h:panelGroup>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
new file mode 100644 (file)
index 0000000..b9573ae
--- /dev/null
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
+               <fieldset class="fieldset" id="login_data">
+                       <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
+                       </legend>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table-row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
+                               <div class="table-left-medium">
+                                       <h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
+                               </div>
+
+                               <div class="table-right-medium">
+                                       <h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para notice" layout="block">
+                               <ul>
+                                       <li><h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" /></li>
+
+                                       <li>
+                                               <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
+                                               <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
+                                       </li>
+                               </ul>
+                       </h:panelGroup>
+               </fieldset>
+       </h:panelGroup>
+</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
new file mode 100644 (file)
index 0000000..c9bb240
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="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">
+
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+
+       <ui:fragment rendered="#{not empty beanHelper.faxNumber}">
+               <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}">
+                                               <f:param name="phoneId" value="#{beanHelper.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}">
+                                       <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+                               </h:link>
+                       </li>
+
+                       <ui:fragment rendered="#{not empty beanHelper.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}" />
+                                               <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </h:link>
+                               </li>
+                       </ui:fragment>
+
+                       <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}" />
+                                       <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+                               </h:link>
+                       </li>
+               </ul>
+       </ui:fragment>
+</ui:composition>
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
new file mode 100644 (file)
index 0000000..ec0c7db
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="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">
+
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+
+       <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
+               <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}">
+                                               <f:param name="phoneId" value="#{beanHelper.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}">
+                                       <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+                               </h:link>
+                       </li>
+
+                       <ui:fragment rendered="#{not empty beanHelper.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}" />
+                                               <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </h:link>
+                               </li>
+                       </ui:fragment>
+
+                       <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}" />
+                                       <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+                               </h:link>
+                       </li>
+               </ul>
+       </ui:fragment>
+</ui:composition>
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
new file mode 100644 (file)
index 0000000..fa27d6e
--- /dev/null
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="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">
+
+       <ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
+               <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}">
+                                               <f:param name="phoneId" value="#{beanHelper.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}">
+                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+                               </h:link>
+                       </li>
+
+                       <ui:fragment rendered="#{not empty beanHelper.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}" />
+                                               <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </h:link>
+                               </li>
+                       </ui:fragment>
+
+                       <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}" />
+                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+                               </h:link>
+                       </li>
+               </ul>
+       </ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
new file mode 100644 (file)
index 0000000..622573d
--- /dev/null
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="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">
+
+       <h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+               <f:facet name="header">
+                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
+               </f:facet>
+
+               <h:column>
+                       <h:panelGroup>
+                               <h:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+
+                               <h:outputText id="faxNumberId" styleClass="table-data-field" value="#{faxNumber.phoneId}" />
+
+                               <h:message for="faxNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
+
+                       <h:outputText id="faxNumber" styleClass="table-data-field" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+
+                       <h:outputText id="faxCreated" styleClass="table-data-field" value="#{faxNumber.phoneEntryCreated.time}">
+                               <f:convertDateTime for="contactCreated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+
+                       <h:outputText id="faxUpdated" styleClass="table-data-field" value="#{faxNumber.phoneEntryUpdated.time}">
+                               <f:convertDateTime for="contactUpdated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+                       <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+
+                       <div class="table-data-field">
+                               <widgets:outputAdminFaxLinks faxNumber="#{faxNumber}" isShowPage="#{isShowPage}" />
+                       </div>
+               </h:column>
+       </h:panelGrid>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
new file mode 100644 (file)
index 0000000..8017577
--- /dev/null
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="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">
+
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" />
+
+       <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+               <f:facet name="header">
+                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
+               </f:facet>
+
+               <h:column>
+                       <h:panelGroup>
+                               <h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+
+                               <h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{landLineNumber.phoneId}" />
+
+                               <h:message for="landLineNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
+
+                       <h:outputText id="landLineNumber" styleClass="table-data-field" value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+
+                       <h:outputText id="landLineCreated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryCreated.time}">
+                               <f:convertDateTime for="contactCreated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+
+                       <h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryUpdated.time}">
+                               <f:convertDateTime for="contactUpdated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+                       <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+
+                       <div class="table-data-field">
+                               <widgets:outputAdminLandLineLinks landLineNumber="#{landLineNumber}" isShowPage="#{isShowPage}" />
+                       </div>
+               </h:column>
+       </h:panelGrid>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
new file mode 100644 (file)
index 0000000..d936316
--- /dev/null
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="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">
+
+       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+               <f:facet name="header">
+                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
+               </f:facet>
+
+               <h:column>
+                       <h:panelGroup>
+                               <h:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+
+                               <h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{mobileNumber.phoneId}" />
+
+                               <h:message for="mobileNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                       </h:panelGroup>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
+
+                       <h:link id="mobileProvider" outcome="admin_show_mobile_provider">
+                               <h:outputText styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerName}" />
+                               <f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
+                       </h:link>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
+
+                       <h:outputText id="mobileNumber" styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+
+                       <h:outputText id="mobileCreated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryCreated.time}">
+                               <f:convertDateTime for="contactCreated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+
+                       <h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryUpdated.time}">
+                               <f:convertDateTime for="contactUpdated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+                       <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+
+                       <div class="table-data-field">
+                               <widgets:outputAdminMobileLinks mobileNumber="#{mobileNumber}" isShowPage="#{isShowPage}" />
+                       </div>
+               </h:column>
+       </h:panelGrid>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
new file mode 100644 (file)
index 0000000..bc181b0
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="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">
+
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty user}" />
+
+       <widgets:outputMessageBox message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
+
+       <h:link outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
+               <h:outputText value="#{user.userName}" />
+               <f:param name="userId" value="#{user.userId}" />
+       </h:link>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
new file mode 100644 (file)
index 0000000..2a7575f
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="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">
+
+       <ui:fragment rendered="#{empty rendered or rendered}">
+               <h:panelGroup styleClass="table-row" layout="block">
+                       <div class="table-left-medium">
+                               <h:outputLabel for="faxNumber" value="#{labelMessage}" />
+                       </div>
+
+                       <div class="table-right-medium">
+                               <h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{targetController.faxCountry}">
+                                       <f:converter converterId="CountryConverter" />
+                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+                               </h:selectOneMenu>
+
+                               <h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
+                                       <f:validator validatorId="PhoneNumberValidator" />
+                               </h:inputText>
+
+                               <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
+                                       <f:validator validatorId="PhoneNumberValidator" />
+                               </h:inputText>
+                       </div>
+               </h:panelGroup>
+
+               <h:panelGroup styleClass="error_container" layout="block">
+                       <h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+               </h:panelGroup>
+
+               <h:panelGroup styleClass="error_container" layout="block">
+                       <h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+               </h:panelGroup>
+       </ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
new file mode 100644 (file)
index 0000000..624ef2d
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="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">
+
+       <ui:fragment rendered="#{empty rendered or rendered}">
+               <h:panelGroup styleClass="table-row" layout="block">
+                       <div class="table-left-medium">
+                               <h:outputLabel for="landLineNumber" value="#{labelMessage}" />
+                       </div>
+
+                       <div class="table-right-medium">
+                               <h:selectOneMenu styleClass="select divider-right" id="countryPhoneCode" value="#{targetController.landLineCountry}">
+                                       <f:converter converterId="CountryConverter" />
+                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+                               </h:selectOneMenu>
+
+                               <h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
+                                       <f:validator validatorId="PhoneNumberValidator" />
+                               </h:inputText>
+
+                               <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
+                                       <f:validator validatorId="PhoneNumberValidator" />
+                               </h:inputText>
+                       </div>
+               </h:panelGroup>
+
+               <h:panelGroup styleClass="error_container" layout="block">
+                       <h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+               </h:panelGroup>
+
+               <h:panelGroup styleClass="error_container" layout="block">
+                       <h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+               </h:panelGroup>
+       </ui:fragment>
+</ui:composition>
index f4cbe83abdeee2a5a44041eae27ee657782fe382..3d6fc07154b663831f904d4b8cd41d0ddf3a9d6f 100644 (file)
@@ -6,11 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty labelMessage}" />
-
-       <ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
+       <ui:fragment rendered="#{empty rendered or rendered}">
                <h:panelGroup styleClass="table-row" layout="block">
                        <div class="table-left-medium">
                                <h:outputLabel for="mobileNumber" value="#{labelMessage}" />
index ce8b5e88441d650656df3dbc68a80b39419389c3..025265be262e0d4cf1a9d1f1df9b71af97320d8c 100644 (file)
@@ -6,9 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-       <ui:fragment rendered="#{not empty targetController and (empty rendered or rendered)}">
+       <ui:fragment rendered="#{empty rendered or rendered}">
                <h:panelGroup styleClass="table-row" layout="block">
                        <div class="table-left-medium">
                                <h:outputLabel for="userPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
index 086ad4fead15961ff9b37079119f74c51a283a06..b51146ab4ada7a4ede59d0aff4baef6aefa63b9a 100644 (file)
@@ -6,11 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty labelMessage}" />
-
-       <ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
+       <ui:fragment rendered="#{empty rendered or rendered}">
                <h:panelGroup styleClass="table-row" layout="block">
                        <div class="table-left-medium">
                                <h:outputLabel for="profileMode" value="#{labelMessage}" />
index bad5b479d726acb876736f3c397dc17483bd8433..80250d12493d4d6836a8226887aed1647b5ac188 100644 (file)
@@ -12,7 +12,5 @@
                <ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />
        </ui:fragment>
 
-       <ui:fragment rendered="#{not empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl" />
-       </ui:fragment>
+       <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.contact.contactFaxNumber}" rendered="#{not empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}" />
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
deleted file mode 100644 (file)
index bba847e..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="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">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
-       <h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.faxNumber}">
-               <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
-               </f:facet>
-
-               <h:column>
-                       <h:panelGroup>
-                               <h:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-
-                               <h:outputText id="faxNumberId" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneId}" />
-
-                               <h:message for="faxNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
-
-                       <h:outputText id="faxNumber" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.faxNumber.phoneCountry.countryPhoneCode} (#{beanHelper.faxNumber.phoneAreaCode}) #{beanHelper.faxNumber.phoneNumber}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
-
-                       <h:outputText id="faxCreated" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneEntryCreated.time}">
-                               <f:convertDateTime for="contactCreated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
-
-                       <h:outputText id="faxUpdated" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneEntryUpdated.time}">
-                               <f:convertDateTime for="contactUpdated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-                       <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
-
-                       <div class="table-data-field">
-                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_links.tpl">
-                                       <ui:param name="isShowPage" value="#{isShowPage}" />
-                               </ui:include>
-                       </div>
-               </h:column>
-       </h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
deleted file mode 100644 (file)
index c9bb240..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="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">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
-       <ui:fragment rendered="#{not empty beanHelper.faxNumber}">
-               <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}">
-                                               <f:param name="phoneId" value="#{beanHelper.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}">
-                                       <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-                               </h:link>
-                       </li>
-
-                       <ui:fragment rendered="#{not empty beanHelper.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}" />
-                                               <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                       </h:link>
-                               </li>
-                       </ui:fragment>
-
-                       <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}" />
-                                       <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-                               </h:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
index 6ab382d135163f93560b78bd2f2d75d84d880541..48ee76d45523270259e8c2a8881f9142de0062b4 100644 (file)
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA}" />
                        </div>
 
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{adminContactPhoneController}" />
-                                       </ui:include>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
+                       <widgets:outputFaxInputTableRow targetController="#{adminContactPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
 
                        <div class="table-footer">
                                <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
index 35b66744ccb3a8e2289a4cfce1497105a2437986..78e7d6e5b15c6a2941c94af96d8f00baf6ad5202 100644 (file)
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{adminPhoneController}" />
-                                       </ui:include>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
+                       <widgets:outputFaxInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
                </fieldset>
        </h:panelGroup>
 </ui:composition>
index 22d08e9e8be4a6fefd6e147be8ccf757b7ac3aa5..30b289b51fcd498eadedb48933369458f65b8aed 100644 (file)
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
                        </div>
 
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{adminPhoneController}" />
-                                       </ui:include>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
+                       <widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
 
                        <div class="table-footer">
                                <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
index bb9afb036ee336b980209b46c68856a994ec4d90..6c9a55a4241462682b54f02b22f3257224fcac0c 100644 (file)
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{adminPhoneController}" />
-                                       </ui:include>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
+                       <widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
                </fieldset>
        </h:panelGroup>
 </ui:composition>
index 460f4f53c43b740ce44c3deb9e605e3ea9750ed7..bac827a834c362672bb3cf7906821740e9a117f1 100644 (file)
@@ -12,7 +12,5 @@
                <ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />
        </ui:fragment>
 
-       <ui:fragment rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl" />
-       </ui:fragment>
+       <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.contact.contactLandLineNumber}" rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}" />
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
deleted file mode 100644 (file)
index 7fe0086..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="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">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-       <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
-               <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
-               </f:facet>
-
-               <h:column>
-                       <h:panelGroup>
-                               <h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-
-                               <h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneId}" />
-
-                               <h:message for="landLineNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
-
-                       <h:outputText id="landLineNumber" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.landLineNumber.phoneCountry.countryPhoneCode} (#{beanHelper.landLineNumber.phoneAreaCode}) #{beanHelper.landLineNumber.phoneNumber}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
-
-                       <h:outputText id="landLineCreated" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneEntryCreated.time}">
-                               <f:convertDateTime for="contactCreated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
-
-                       <h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneEntryUpdated.time}">
-                               <f:convertDateTime for="contactUpdated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-                       <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
-
-                       <div class="table-data-field">
-                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_links.tpl">
-                                       <ui:param name="isShowPage" value="#{isShowPage}" />
-                               </ui:include>
-                       </div>
-               </h:column>
-       </h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
deleted file mode 100644 (file)
index ec0c7db..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="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">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-       <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
-               <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}">
-                                               <f:param name="phoneId" value="#{beanHelper.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}">
-                                       <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
-                               </h:link>
-                       </li>
-
-                       <ui:fragment rendered="#{not empty beanHelper.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}" />
-                                               <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
-                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                       </h:link>
-                               </li>
-                       </ui:fragment>
-
-                       <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}" />
-                                       <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
-                               </h:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
index 8328e23fa1849df4367a873310774b2b671a22e2..abe6b12ddd8759ab2c729b3102bd005f04691f0a 100644 (file)
@@ -6,13 +6,11 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}"
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
        </ui:fragment>
 
-       <ui:fragment rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
-               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl" />
-       </ui:fragment>
+       <widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.contact.contactMobileNumber}" rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}" />
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
deleted file mode 100644 (file)
index cee8999..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="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">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
-               <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
-               </f:facet>
-
-               <h:column>
-                       <h:panelGroup>
-                               <h:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-
-                               <h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneId}" />
-
-                               <h:message for="mobileNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-                       </h:panelGroup>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
-
-                       <h:link id="mobileProvider" outcome="admin_show_mobile_provider">
-                               <h:outputText styleClass="table-data-field" value="#{beanHelper.mobileNumber.mobileProvider.providerName}" />
-                               <f:param name="providerId" value="#{beanHelper.mobileNumber.mobileProvider.providerId}" />
-                       </h:link>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
-
-                       <h:outputText id="mobileNumber" styleClass="table-data-field" value="#{beanHelper.mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.mobileNumber.mobileProvider.providerDialPrefix}-#{beanHelper.mobileNumber.phoneNumber}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
-
-                       <h:outputText id="mobileCreated" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneEntryCreated.time}">
-                               <f:convertDateTime for="contactCreated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
-
-                       <h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneEntryUpdated.time}">
-                               <f:convertDateTime for="contactUpdated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-                       <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
-
-                       <div class="table-data-field">
-                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">
-                                       <ui:param name="isShowPage" value="#{isShowPage}" />
-                               </ui:include>
-                       </div>
-               </h:column>
-       </h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
deleted file mode 100644 (file)
index 08d3b88..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="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">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-       <ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
-               <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}">
-                                               <f:param name="phoneId" value="#{beanHelper.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}">
-                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-                               </h:link>
-                       </li>
-
-                       <ui:fragment rendered="#{not empty beanHelper.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}" />
-                                               <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                       </h:link>
-                               </li>
-                       </ui:fragment>
-
-                       <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}" />
-                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-                               </h:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
deleted file mode 100644 (file)
index d81fba6..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_MODE_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty mode}" />
-
-       <h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
-               <fieldset class="fieldset" id="login_data">
-                       <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
-                       </legend>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
-                               <div class="table-left-medium">
-                                       <h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="para notice" layout="block">
-                               <ul>
-                                       <li><h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" /></li>
-
-                                       <li>
-                                               <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
-                                               <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
-                                       </li>
-                               </ul>
-                       </h:panelGroup>
-               </fieldset>
-       </h:panelGroup>
-</ui:composition>
index 53c67426dd38162c21dd7dbe04868e8d24c2c84f..724f72ac61c1712a19aa5411552d27ba22cccc1c 100644 (file)
@@ -6,13 +6,11 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
-               <ui:param name="mode" value="add" />
-       </ui:include>
+       <widgets:outputAdminUserDataFormFields mode="add" />
 
        <div class="para notice">
                <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
        </div>
 
-       <widgets:outputAdminContactDataFormFields />
+       <widgets:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 </ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
deleted file mode 100644 (file)
index 94b2cfd..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="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">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-       <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{targetController.faxCountry}">
-                       <f:converter converterId="CountryConverter" />
-                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-               </h:selectOneMenu>
-
-               <h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
-                       <f:validator validatorId="PhoneNumberValidator" />
-               </h:inputText>
-
-               <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
-                       <f:validator validatorId="PhoneNumberValidator" />
-               </h:inputText>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
deleted file mode 100644 (file)
index 8de46d3..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="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">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-       <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu styleClass="select divider-right" id="countryPhoneCode" value="#{targetController.landLineCountry}">
-                       <f:converter converterId="CountryConverter" />
-                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-               </h:selectOneMenu>
-
-               <h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
-                       <f:validator validatorId="PhoneNumberValidator" />
-               </h:inputText>
-
-               <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
-                       <f:validator validatorId="PhoneNumberValidator" />
-               </h:inputText>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl
deleted file mode 100644 (file)
index 6eff0a4..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="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">
-
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty user}" />
-
-       <h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
-
-       <h:link outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
-               <h:outputText value="#{user.userName}" />
-               <f:param name="userId" value="#{user.userId}" />
-       </h:link>
-</ui:composition>
index e0d1ac347904f39dc6726dd1d13319e5a4067b3e..66d02b6b45dc773f5b6374fe7851275774a57338 100644 (file)
@@ -111,8 +111,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>labelMessage</name>
                        <description>A localized message for the rendered label tag. You should use EL code here to add a label message from your bundle.</description>
                        <required>true</required>
-                       <!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
-                       <type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
+                       <type>java.lang.String</type>
                </attribute>
                <attribute>
                        <name>rendered</name>
@@ -131,18 +130,238 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputAdminContactDataFormFields</tag-name>
                <description>This tag renders a fieldset for administrative purposes of contact data.</description>
-               <source>resources/tags/admin/contact/admin_form_contact_data.tpl</source>
+               <source>resources/tags/admin/form_data/contact/admin_form_contact_data.tpl</source>
                <attribute>
                        <name>allowEmptyRequiredData</name>
                        <description>Whether allow the personal title to be left empty. This might be the case when you create a user and want to select a contact from a selection box. EL code resolving to a boolean may be allowed here.</description>
                        <required>false</required>
                        <type>java.lang.Boolean</type>
                </attribute>
+       </tag>
+       <tag>
+               <tag-name>outputAdminUserDataFormFields</tag-name>
+               <description>This tag renders a fieldset for administrative purposes of user data.</description>
+               <source>resources/tags/admin/form_data/user/admin_form_user_data.tpl</source>
+               <attribute>
+                       <name>mode</name>
+                       <description>Mode of the form, must be one of "add" or "edit".</description>
+                       <required>true</required>
+                       <type>java.lang.String</type>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>outputUserProfileLink</tag-name>
+               <description>This tag renders a h:link JSF tag for a user profile.</description>
+               <source>resources/tags/profile/user/user_profile_link.tpl</source>
+               <attribute>
+                       <name>user</name>
+                       <description>An instance of a User class.</description>
+                       <required>true</required>
+                       <type>org.mxchange.jusercore.model.user.User</type>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>outputAdminFaxPanelGrid</tag-name>
+               <description>This tag renders a full h:panelGrid for administrative purposes for fax data.</description>
+               <source>resources/tags/admin/panel_grids/fax/admin_fax_data.tpl</source>
+               <attribute>
+                       <name>isShowPage</name>
+                       <description>Whether this tag is used to show mobile data (default true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+               <attribute>
+                       <name>faxNumber</name>
+                       <description>The fax instance that provides the data for this tag.</description>
+                       <required>true</required>
+                       <type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</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>
+               <attribute>
+                       <name>showAdminLinks</name>
+                       <description>Whether to show administrative links to other pages (default: true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>outputAdminLandLinePanelGrid</tag-name>
+               <description>This tag renders a full h:panelGrid for administrative purposes for land-line data.</description>
+               <source>resources/tags/admin/panel_grids/landline/admin_landline_data.tpl</source>
+               <attribute>
+                       <name>isShowPage</name>
+                       <description>Whether this tag is used to show mobile data (default true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+               <attribute>
+                       <name>landLineNumber</name>
+                       <description>The fax instance that provides the data for this tag.</description>
+                       <required>true</required>
+                       <type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</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>
+               <attribute>
+                       <name>showAdminLinks</name>
+                       <description>Whether to show administrative links to other pages (default: true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>outputAdminMobilePanelGrid</tag-name>
+               <description>This tag renders a full h:panelGrid for administrative purposes for mobile data.</description>
+               <source>resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl</source>
+               <attribute>
+                       <name>isShowPage</name>
+                       <description>Whether this tag is used to show mobile data (default true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+               <attribute>
+                       <name>mobileNumber</name>
+                       <description>The mobile instance that provides the data for this tag.</description>
+                       <required>true</required>
+                       <type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</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>
+               <attribute>
+                       <name>showAdminLinks</name>
+                       <description>Whether to show administrative links to other pages (default: true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>outputFaxInputTableRow</tag-name>
+               <description>This tag renders a h:panelGroup with input fields for fax numbers.</description>
+               <source>resources/tags/table_rows/fax_input_table_row.tpl</source>
+               <attribute>
+                       <name>targetController</name>
+                       <description>A target backing bean (EL code resolving into it) extending at least BaseFacesBean where to set the data in.</description>
+                       <required>true</required>
+                       <!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
+                       <type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
+               </attribute>
+               <attribute>
+                       <name>labelMessage</name>
+                       <description>A localized message for the rendered label tag. You should use EL code here to add a label message from your bundle.</description>
+                       <required>true</required>
+                       <type>java.lang.String</type>
+               </attribute>
                <attribute>
-                       <name>formMode</name>
-                       <description>Mode of the form, can be one of "add" or "edit", defaulting to "add".</description>
+                       <name>rendered</name>
+                       <description>Whether this tag is being rendered by JSF engine.</description>
                        <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>outputLandLineInputTableRow</tag-name>
+               <description>This tag renders a h:panelGroup with input fields for land-line numbers.</description>
+               <source>resources/tags/table_rows/landline_input_table_row.tpl</source>
+               <attribute>
+                       <name>targetController</name>
+                       <description>A target backing bean (EL code resolving into it) extending at least BaseFacesBean where to set the data in.</description>
+                       <required>true</required>
+                       <!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
+                       <type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
+               </attribute>
+               <attribute>
+                       <name>labelMessage</name>
+                       <description>A localized message for the rendered label tag. You should use EL code here to add a label message from your bundle.</description>
+                       <required>true</required>
                        <type>java.lang.String</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>
+       <tag>
+               <tag-name>outputAdminFaxLinks</tag-name>
+               <description>This tag renders a full h:panelGroup for administrative links for fax data.</description>
+               <source>resources/tags/admin/links/fax/admin_fax_data.tpl</source>
+               <attribute>
+                       <name>isShowPage</name>
+                       <description>Whether this tag is used to show mobile data (default true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+               <attribute>
+                       <name>faxNumber</name>
+                       <description>The fax instance that provides the data for this tag.</description>
+                       <required>true</required>
+                       <type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</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>
+       <tag>
+               <tag-name>outputAdminLandLineLinks</tag-name>
+               <description>This tag renders a full h:panelGroup for administrative links for land-line data.</description>
+               <source>resources/tags/admin/panel_grids/landline/admin_landline_data.tpl</source>
+               <attribute>
+                       <name>isShowPage</name>
+                       <description>Whether this tag is used to show mobile data (default true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+               <attribute>
+                       <name>landLineNumber</name>
+                       <description>The fax instance that provides the data for this tag.</description>
+                       <required>true</required>
+                       <type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</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>
+       <tag>
+               <tag-name>outputAdminMobileLinks</tag-name>
+               <description>This tag renders a full h:panelGroup for administrative links for mobile data.</description>
+               <source>resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl</source>
+               <attribute>
+                       <name>isShowPage</name>
+                       <description>Whether this tag is used to show mobile data (default true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+               <attribute>
+                       <name>mobileNumber</name>
+                       <description>The mobile instance that provides the data for this tag.</description>
+                       <required>true</required>
+                       <type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</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 6cef9784adf4a9ec6a0a70b61178ce7d4bea76c4..6a219426921acd1c1c1f74bd865fca7d23b90574 100644 (file)
@@ -36,7 +36,7 @@
                                        <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                </div>
 
-                               <widgets:outputAdminContactDataFormFields formMode="edit" />
+                               <widgets:outputAdminContactDataFormFields />
 
                                <div class="table-footer">
                                        <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
index 0644b20ab613d69172bed77f41bbbf502b753c7e..857c1df397a22beb9afb5df9857609eedc65f910 100644 (file)
@@ -81,7 +81,7 @@
                                        <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
                                </div>
 
-                               <widgets:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
+                               <widgets:outputAdminContactDataFormFields />
 
                                <div class="table-footer">
                                        <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
index 2ac7ddb00bf8c781de2b5e3c8ae55068f91e4538..06712f0dbb98c6f45a45d2b463de0acf97114036 100644 (file)
                                </div>
 
                                <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                                               <ui:param name="isShowPage" value="#{false}" />
-                                               <ui:param name="showAdminLinks" value="#{false}" />
-                                       </ui:include>
+                                       <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" isShowPage="false" showAdminLinks="false" />
                                </div>
 
                                <div class="table-footer">
index fb5e086b4eb60deb84e44dd9c90e1c2388f71b1a..56fb32cfbbc92d511960d4978da2ce36d856b9ec 100644 (file)
        </ui:define>
 
        <ui:define name="content">
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+
                <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                </div>
 
                                <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-                                               <ui:param name="isShowPage" value="#{false}" />
-                                               <ui:param name="showAdminLinks" value="#{false}" />
-                                       </ui:include>
+                                       <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" isShowPage="false" showAdminLinks="false" />
                                </div>
 
                                <div class="table-footer">
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
                <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
                        <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                        <f:param value="#{beanHelper.contact.contactId}" />
index c6ac5964452db1b565a3b3e757c985d90e07e646..141c49f964826c1a4b935720b15114d03e41514d 100644 (file)
                                </div>
 
                                <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-                                               <ui:param name="isShowPage" value="#{false}" />
-                                               <ui:param name="showAdminLinks" value="#{false}" />
-                                       </ui:include>
+                                       <widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" isShowPage="false" showAdminLinks="false" />
                                </div>
 
                                <div class="table-footer">
index a1d048dba2b358a80c2a14c8763272e836fa2172..00fa4ff512871fad1fde34addc78f62ad1458f18 100644 (file)
                                </div>
 
                                <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                                               <ui:param name="isShowPage" value="#{false}" />
-                                               <ui:param name="showAdminLinks" value="#{false}" />
-                                       </ui:include>
+                                       <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" isShowPage="false" showAdminLinks="false" />
                                </div>
 
                                <div class="para">
index 80e06a10da171f7294f8a88cbb886b7c47104de2..a50aaa6dbc5856d27121158a2f2ccb09779016cb 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -21,9 +22,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                       <ui:param name="isShowPage" value="true" />
-               </ui:include>
+               <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" isShowPage="true" />
 
                <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
                        <f:facet name="header">
index 55ef8fa770eaa8702b238c169480e2c7f52fea82..9ac4368d73229d0c395bb12dc86ba34c26fa37be 100644 (file)
                                </div>
 
                                <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-                                               <ui:param name="isShowPage" value="#{false}" />
-                                               <ui:param name="showAdminLinks" value="#{false}" />
-                                       </ui:include>
+                                       <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" isShowPage="false" showAdminLinks="false" />
                                </div>
 
                                <div class="para">
index 8bcc57bc6f6b0ff16f1aa39748214207edcc0018..203da052dca40cf015c746991e6a4ed4f250f637 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -21,9 +22,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-                       <ui:param name="isShowPage" value="true" />
-               </ui:include>
+               <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" />
 
                <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
                        <f:facet name="header">
index 4a61ccc06ef3ad896fb1d655c815ee431835f844..a304bd9a01614dcf41429393fbcc24f26aac56a8 100644 (file)
                                </div>
 
                                <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-                                               <ui:param name="isShowPage" value="#{false}" />
-                                               <ui:param name="showAdminLinks" value="#{false}" />
-                                       </ui:include>
+                                       <widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" isShowPage="false" showAdminLinks="false" />
                                </div>
 
                                <div class="para">
index fdbbf0fd16464d61453c8c79596ce06248724f8c..8b14dbf758a8c952e4f4872d41d5b718513803d9 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -21,9 +22,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-                       <ui:param name="isShowPage" value="true" />
-               </ui:include>
+               <widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" isShowPage="true" />
 
                <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
                        <f:facet name="header">
index da9782324520c3b714ba443056c09c2e93addf1d..358bf719a9228441c2521eacf6cf059e00759dc3 100644 (file)
@@ -34,9 +34,7 @@
                                        <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                </div>
 
-                               <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
-                                       <ui:param name="mode" value="edit" />
-                               </ui:include>
+                               <widgets:outputAdminUserDataFormFields mode="edit" />
 
                                <div class="table-footer">
                                        <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
index 0332d854e24f871075d48702855c60118a90e9f5..f6b71d867b8861c3037f86c409f578aa06eed6f4 100644 (file)
@@ -26,9 +26,7 @@
                                                <h:outputText value="#{msg.USER_NAME}" />
                                        </f:facet>
 
-                                       <ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
-                                               <ui:param name="user" value="#{user}" />
-                                       </ui:include>
+                                       <widgets:outputUserProfileLink user="#{user}" />
                                </h:column>
 
                                <h:column>