]> git.mxchange.org Git - jjobs-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Tue, 12 Mar 2019 13:08:51 +0000 (14:08 +0100)
committerRoland Häder <roland@mxchange.org>
Mon, 22 Jul 2019 00:28:15 +0000 (02:28 +0200)
- rewrote p:column and p:link to have each attribute in a separate line which
  helps reading JSF views/templates
- renamed ADMIN_ASSIGNED_USER_HEADER to ADMIN_USER_HEADER
- added more country i18n strings

Signed-off-by: Roland Häder <roland@mxchange.org>
50 files changed:
src/java/org/mxchange/localization/generic_de_DE.properties
src/java/org/mxchange/localization/generic_en_US.properties
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl
web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
web/WEB-INF/templates/admin/admin_footer.tpl
web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
web/WEB-INF/templates/guest/guest_footer.tpl
web/WEB-INF/templates/guest/guest_menu.tpl
web/WEB-INF/templates/guest/guest_privacy_terms.tpl
web/WEB-INF/templates/login/user/user_footer.tpl
web/WEB-INF/templates/login/user/user_menu.tpl
web/admin/basic_data/admin_basic_data_list.xhtml
web/admin/branch_office/admin_branch_office_list.xhtml
web/admin/contact/admin_contact_export.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/country/admin_country_list.xhtml
web/admin/department/admin_department_list.xhtml
web/admin/employee/admin_employee_list.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/headquarter/admin_headquarter_list.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile/admin_mobile_show.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/opening_time/admin_opening_time_list.xhtml
web/admin/user/admin_user_activity_log.xhtml
web/admin/user/admin_user_export.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_unlock.xhtml
web/guest/user/user_login.xhtml
web/guest/user/user_register.xhtml
web/guest/user/user_register_done.xhtml
web/guest/user/user_register_page2.xhtml
web/user/login_contact_data_saved.xhtml
web/user/login_edit_user_data.xhtml
web/user/login_index.xhtml
web/user/login_user_change_personal_data.xhtml
web/user/login_user_contact_data_saved.xhtml
web/user/login_user_data_saved.xhtml

index 2e1e662fe643cab1e6a669717364a4b06e9d59eb..989ad4aa906c460c4acebf321fe4d1d8903bc3cb 100644 (file)
@@ -126,9 +126,17 @@ GUEST_ALREADY_USER_CONTINUE_LOGIN_2=einloggen.
 PAGE_TITLE_USER_LOGIN_HOME=Willkommen zum Benutzerbereich
 CONTENT_TITLE_USER_LOGIN_HOME=\u00dcbersicht Ihrer Bewerbungen:
 LOGIN_LINK_LOGOUT=Ausloggen
+COUNTRY_AUSTRIA=\u00d6stereich
+#@TODO Please fix German umlauts!
+COUNTRY_DANMARK=Daenemark
+COUNTRY_FRANCE=Frankreich
 COUNTRY_GERMANY=Deutschland
+COUNTRY_GREECE=Griechenland
+COUNTRY_ITALIA=Italien
 COUNTRY_PHILIPPINES=Philippinen
 #@TODO Please fix German umlauts!
+COUNTRY_TURKEY=Tuerkei
+#@TODO Please fix German umlauts!
 NONE_SELECTED=Nichts ausgewaehlt
 ENTERED_HOUSE_NUMBER_INVALID=Die eingegebene Hausnummer ist ung\u00fcltig.
 ENTERED_ZIP_CODE_INVALID=Die eingegebene Postleitzahl ist ung\u00fcltig.
@@ -296,7 +304,6 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl ausserorts:
 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=Diese Tabelle listet alle bereits angelegten L\u00e4nderdaten auf.
-COUNTRY_GERMANY=Deutschland
 ADMIN_MENU_MOBILE_PROVIDER_TITLE=Handyanbieter
 ADMIN_LINK_LIST_MOBILE_PROVIDER_TITLE=Hinzuf\u00fcgen, auflisten, \u00e4ndern und l\u00f6schen von Handyanbietern.
 PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST=Handyanbieter verwalten
@@ -798,7 +805,7 @@ ADMIN_EMPTY_LIST_BASIC_DATA=Es befinden sich keine Stammdaten in der Datenbank.
 TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA=Diese Tabelle listet Stammdaten auf.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_SHOW_BASIC_DATA_TITLE=Stammdaten des Unternehmens anzeigen.
-ADMIN_ASSIGNED_USER_HEADER=Zugew. Benutzer:
+ADMIN_USER_HEADER=Benutzer:
 ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE=Benutzerprofil des der Filiale zugewiesenen Benutzers anzeigen.
 ADMIN_LINK_ASSIGN=Zuweisen
 #@TODO Please fix German umlauts!
@@ -999,7 +1006,7 @@ ADMIN_ASSIGN_EMPLOYEE_HEADQUARTER=Hauptsitz einem Mitarbeiter zuweisen:
 ADMIN_ENTER_EMPLOYEE_MOBILE_NUMBER=Geschaefliche Mobilfunknummer des Mitarbeiters eingeben:
 ADMIN_EMPLOYEE_GENERAL_LEGEND=Allgemeine Daten des Mitarbeiters:
 ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE=Geben Sie hier die generellen Daten des Mitarbeiters an.
-ADMIN_ASSIGNED_BRANCH_OFFICE=Zugewiesene Filiale:
+ADMIN_BRANCH_OFFICE_HEADER=Filiale:
 LABEL_BRANCH_OFFICES=Filialen
 ADMIN_DATE_OF_ISSUE=Ausstellungsdatum:
 ADMIN_PAYMENT_TYPE=Zahlungsmethode:
@@ -1160,7 +1167,6 @@ ADMIN_HEADQUARTER_COMPANY_NAME=Firmenname der Hauptstelle:
 ADMIN_HEADQUARTER_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen der Hauptstelle ein.
 #@TODO Please fix German umlauts!
 ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED=Bitte waehlen Sie das Land fuer diesen Kontakt aus.
-COUNTRY_ITALIA=Italien
 ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Bitte geben Sie das Geburtsdatum des Kontaktes ein.
 ADMIN_SELECT_USER_PROFILE_MODE=Profilmodus ausw\u00e4hlen:
 ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Filialbesitzer/-leiter
@@ -1231,3 +1237,7 @@ BACK=Zurueck
 OPTIONS=Optionen
 ADMIN_BASIC_DATA_COMPANY_SHORT_NAME=Kurzer Firmenname:
 ADMIN_BASIC_DATA_COMPANY_SHORT_NAME_HEADER=Kurzer Name:
+#@TODO Please fix German umlauts!
+AVAILABLE_HEADER=Verfuegbar:
+ADMIN_MANUFACTURER_HEADER=Hersteller:
+ADMIN_ASSIGNED_MANUFACTURER_LABEL=Zugewiesener Hersteller:
index dd5b371dcaa3cba760312b2553624ae3b0d9be54..46ac12446075e5d1f8a4f96f6057982ff57c0f52 100644 (file)
@@ -126,8 +126,14 @@ PAGE_TITLE_USER_LOGIN_HOME=Welcome to user area
 CONTENT_TITLE_USER_LOGIN_HOME=Overview of your applications:
 LOGIN_LINK_LOGOUT=Logout
 PAGE_TITLE_LOGIN_AREA=User area
+COUNTRY_AUSTRIA=Austria
+COUNTRY_DANMARK=Danmark
+COUNTRY_FRANCE=France
 COUNTRY_GERMANY=Germany
+COUNTRY_GREECE=Greece
+COUNTRY_ITALIA=Italia
 COUNTRY_PHILIPPINES=Philippines
+COUNTRY_TURKEY=Turkey
 NONE_SELECTED=None selected
 ENTERED_HOUSE_NUMBER_INVALID=The entered house number is invalid.
 ENTERED_ZIP_CODE_INVALID=The entered ZIP code is invalid.
@@ -279,7 +285,6 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Dial prefix outside:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Country:
 ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE=Edit or delete country
 TABLE_SUMMARY_ADMIN_LIST_COUNTRIES=This table lists all countries.
-COUNTRY_GERMANY=Germany
 ADMIN_MENU_MOBILE_PROVIDER_TITLE=Mobile providers
 ADMIN_LINK_LIST_MOBILE_PROVIDER=List mobile provider
 ADMIN_LINK_LIST_MOBILE_PROVIDER_TITLE=Add, list, edit and delete mobile providers.
@@ -782,7 +787,7 @@ CONTENT_TITLE_ADMIN_LIST_BASIC_DATA=Lists basic company data
 ADMIN_EMPTY_LIST_BASIC_DATA=There are no basic company data in database. Or your search criteria doesn't match anything.
 TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA=This table lists all basic company data.
 ADMIN_LINK_SHOW_BASIC_DATA_TITLE=Show details of this business contact.
-ADMIN_ASSIGNED_USER_HEADER=Assigned user:
+ADMIN_USER_HEADER=User:
 ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE=Shows branch office's assigned user profile.
 ADMIN_LINK_ASSIGN=Assign
 ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE=Assigns this business contact to a user account.
@@ -933,7 +938,7 @@ ADMIN_ASSIGN_EMPLOYEE_HEADQUARTER=Assign headquarter to employee:
 ADMIN_ENTER_EMPLOYEE_MOBILE_NUMBER=Enter business mobile number of employee:
 ADMIN_EMPLOYEE_GENERAL_LEGEND=General data of employee:
 ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE=You can enter here the general data of the employee.
-ADMIN_ASSIGNED_BRANCH_OFFICE=Assigned branch office:
+ADMIN_BRANCH_OFFICE_HEADER=Branch office:
 LABEL_BRANCH_OFFICES=Branch offices
 ADMIN_DATE_OF_ISSUE=Issue date:
 ADMIN_PAYMENT_TYPE=Payment type:
@@ -1054,7 +1059,6 @@ ADMIN_CONTACT_DATA_FAMILY_NAME_REQUIRED=Please enter family name. If unknown, ju
 ADMIN_HEADQUARTER_COMPANY_NAME=Headquarter's company name:
 ADMIN_HEADQUARTER_COMPANY_NAME_REQUIRED=Please enter headquarter's company name.
 ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED=Please select a country for this contact.
-COUNTRY_ITALIA=Italia
 ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Please enter birthday of contact.
 ADMIN_SELECT_USER_PROFILE_MODE=Select profile mode:
 ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Branch office owner/leader
@@ -1122,3 +1126,6 @@ BACK=Back
 OPTIONS=Options
 ADMIN_BASIC_DATA_COMPANY_SHORT_NAME=Company's short name
 ADMIN_BASIC_DATA_COMPANY_SHORT_NAME_HEADER=Short name:
+AVAILABLE_HEADER=Available:
+ADMIN_MANUFACTURER_HEADER=Manufacturer:
+ADMIN_ASSIGNED_MANUFACTURER_LABEL=Assigned manufacturer:
index 3aba308bf876cb63ea0aa88471531e1ac2c64716..9b7c204a3758dd587b1a032df8394eb009426344 100644 (file)
        <p:column>
                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+               <p:link
+                       id="contactEmailAddress"
+                       styleClass="table-data-field"
+                       href="mailto:#{beanHelper.contact.contactEmailAddress}"
+                       >
                        <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
                </h:outputLink>
        </p:column>
index a5a39ef6df0e4a9c37cd5879ce7ffc30f7053aac..698eac9f4fc76274383069c858a760f3f21fc52a 100644 (file)
        <p:column>
                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+               <p:link
+                       id="contactEmailAddress"
+                       styleClass="table-data-field"
+                       href="mailto:#{beanHelper.contact.contactEmailAddress}"
+                       >
                        <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
                </h:outputLink>
        </p:column>
index e9e31185d7598d3b8038ddf895cb00afa71c8efb..d4b2725a4d5fcadb04122e7f531fdc2749faa8d8 100644 (file)
                        <ul>
                                <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
                                        <li>
-                                               <p:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_USER}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
+                                               <p:link
+                                                       outcome="admin_show_user"
+                                                       value="#{msg.ADMIN_LINK_SHOW_USER}"
+                                                       title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                                       >
                                                        <f:param name="userId" value="#{user.userId}" />
                                                </p:link>
                                        </li>
                                </ui:fragment>
 
                                <li>
-                                       <p:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+                                       <p:link
+                                               outcome="admin_edit_user"
+                                               value="#{msg.ADMIN_LINK_EDIT_USER}"
+                                               title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}"
+                                               >
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
                                </li>
 
                                <ui:fragment rendered="#{not empty renderContactLinks and renderContactLinks}">
                                        <li>
-                                               <p:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
+                                               <p:link
+                                                       outcome="admin_edit_contact"
+                                                       value="#{msg.ADMIN_LINK_EDIT_CONTACT}"
+                                                       title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}"
+                                                       >
                                                        <f:param name="contactId" value="#{user.userContact.contactId}" />
                                                </p:link>
                                        </li>
                                </ui:fragment>
 
                                <li>
-                                       <p:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
+                                       <p:link
+                                               outcome="admin_resend_user_confirm_link"
+                                               value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}"
+                                               title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}"
+                                               rendered="#{user.userAccountStatus == 'UNCONFIRMED'}"
+                                               >
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
+                                       <p:link
+                                               outcome="admin_unlock_user"
+                                               value="#{msg.ADMIN_LINK_UNLOCK_USER}"
+                                               title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}"
+                                               rendered="#{user.userAccountStatus == 'LOCKED'}"
+                                               >
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_lock_user">
+                                       <p:link
+                                               outcome="admin_lock_user"
+                                               >
                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_USER}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
                                </li>
 
                                <li>
-                                       <p:link outcome="admin_delete_user">
+                                       <p:link
+                                               outcome="admin_delete_user"
+                                               >
                                                <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_USER}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
 
                                <ui:fragment rendered="#{not empty renderContactLinks and renderContactLinks}">
                                        <li>
-                                               <p:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}">
+                                               <p:link
+                                                       outcome="admin_show_contact"
+                                                       value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}"
+                                                       title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+                                                       >
                                                        <f:param name="contactId" value="#{user.userContact.contactId}" />
                                                </p:link>
                                        </li>
                                </ui:fragment>
 
                                <li>
-                                       <p:link outcome="admin_show_user_activity_log" value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}" title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}">
+                                       <p:link
+                                               outcome="admin_show_user_activity_log"
+                                               value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}"
+                                               title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}"
+                                               >
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
                                </li>
index 9dba453440099ccb5ac6f2115aa7cc4acc25595d..d50ff5e5091c2fc58782a06d91ff77fa7f4c61f1 100644 (file)
@@ -51,7 +51,9 @@
                        </h:outputText>
                </p:column>
 
-               <p:column rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}">
+               <p:column
+                       rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}"
+                       >
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
index 12ba2049104eddcb83dfac6bd8aba07e3e55c612..87e719749b15ca4bf3bd9bfb0e3adbdfcc0bdc2d 100644 (file)
@@ -51,7 +51,9 @@
                        </h:outputText>
                </p:column>
 
-               <p:column rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}">
+               <p:column
+                       rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}"
+                       >
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
index ba492542da8c2ea4700aaffca7cde656bb7a4c12..a5c6bfb2c8a60a3fbf7f859dbe07f02641497130 100644 (file)
                <p:column>
                        <p:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 
-                       <p:link id="mobileProvider" outcome="admin_show_mobile_provider">
+                       <p: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}" />
                        </p:link>
@@ -56,7 +59,9 @@
                        </h:outputText>
                </p:column>
 
-               <p:column rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}">
+               <p:column
+                       rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}"
+                       >
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
index 87118f511120aec1c97058d0219e0992f7b6f2c6..03b2b65af2baddea5c0d750f5f820d6727652ddb 100644 (file)
                        <h:outputText value="#{headerMessage}" />
                </f:facet>
 
-               <p:column headerText="#{msg.ADMIN_START_WEEK_DAY}">
+               <p:column
+                       headerText="#{msg.ADMIN_START_WEEK_DAY}"
+                       >
                        <h:outputText value="#{openingTime.openingStartDay.toString()}" />
                </p:column>
 
-               <p:column headerText="#{msg.ADMIN_END_WEEK_DAY}">
+               <p:column
+                       headerText="#{msg.ADMIN_END_WEEK_DAY}"
+                       >
                        <h:outputText value="#{openingTime.openingEndDay.toString()}" />
                </p:column>
 
-               <p:column headerText="#{msg.ADMIN_START_TIME}">
+               <p:column
+                       headerText="#{msg.ADMIN_START_TIME}"
+                       >
                        <h:outputText value="#{openingTime.openingStartTime}">
                                <f:convertDateTime type="time" timeStyle="short" />
                        </h:outputText>
                </p:column>
 
-               <p:column headerText="#{msg.ADMIN_END_TIME}">
+               <p:column
+                       headerText="#{msg.ADMIN_END_TIME}"
+                       >
                        <h:outputText value="#{openingTime.openingEndTime}">
                                <f:convertDateTime type="time" timeStyle="short" />
                        </h:outputText>
index adcd8f2c0626b68345336877d1c54269ef115ced..f691140a66e96662f0633d088a55926f2ef85a5a 100644 (file)
 
        <core:outputMessageBox panelGroupId="nonPublicUserProfile" message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
-       <p:link outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
+       <p: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}" />
        </p:link>
index e5a3b6e94d947ecb6e53e6a7d28d0cb28e7454fd..13b195c02a20734e9673b4e6e514f8dc74d6d3fa 100644 (file)
@@ -9,7 +9,11 @@
 
        <pm:footer id="footer" fixed="true" tapToggle="false">
                <ul class="navbar-horizontal">
-                       <li><p:link outcome="index" value="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE}" title="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE_TITLE}" /></li>
+                       <li><p:link
+                                       outcome="index"
+                                       value="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE}"
+                                       title="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE_TITLE}"
+                                       /></li>
                </ul>
        </pm:footer>
 </ui:composition>
index 2f836bb6d2f08248133d9f2ae09e79fd075f3c8c..367fd3413d46fbeb657e27a6c54f7bd6ad3e1bfd 100644 (file)
                        <p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
-                               <p:link id="userId" outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+                               <p:link
+                                       id="userId"
+                                       outcome="admin_show_user"
+                                       title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                       value="#{beanHelper.user.userId}"
+                                       >
                                        <f:param name="userId" value="#{beanHelper.user.userId}" />
                                </p:link>
                        </h:panelGroup>
index 1b9e3559d4a68b9b081976b774405a642e6a5c4f..d8c9600f5833d84928f9d6f0dd9f8a2d71c9d3fd 100644 (file)
        <div class="footer">
                <ul class="navbar-horizontal">
                        <li class="navlink-horizontal">
-                               <p:link outcome="index" title="#{msg.GUEST_LINK_HOME_TITLE}" value="#{msg.GUEST_LINK_HOME}" />
+                               <p:link
+                                       outcome="index"
+                                       value="#{msg.GUEST_LINK_HOME}"
+                                       title="#{msg.GUEST_LINK_HOME_TITLE}"
+                                       />
                        </li>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="user_resend_link" title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}" value="#{msg.GUEST_LINK_RESEND_LINK}" />
+                                       <p:link
+                                               outcome="user_resend_link"
+                                               value="#{msg.GUEST_LINK_RESEND_LINK}"
+                                               title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="imprint" title="#{msg.GUEST_LINK_IMPRINT_TITLE}" value="#{msg.GUEST_LINK_IMPRINT}" />
+                                       <p:link
+                                               outcome="imprint"
+                                               value="#{msg.GUEST_LINK_IMPRINT}"
+                                               title="#{msg.GUEST_LINK_IMPRINT_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="terms" title="#{msg.GUEST_LINK_TERMS_TITLE}" value="#{msg.GUEST_LINK_TERMS}" />
+                                       <p:link
+                                               outcome="terms"
+                                               value="#{msg.GUEST_LINK_TERMS}"
+                                               title="#{msg.GUEST_LINK_TERMS_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="privacy" title="#{msg.GUEST_LINK_PRIVACY_TITLE}" value="#{msg.GUEST_LINK_PRIVACY}" />
+                                       <p:link
+                                               outcome="privacy"
+                                               value="#{msg.GUEST_LINK_PRIVACY}"
+                                               title="#{msg.GUEST_LINK_PRIVACY_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
index c58beb5821ee9265ba8a6eaa37dbd79f7cfb9cd0..61136ff466f7c0a7db5ebfd7876246f8ecd6724c 100644 (file)
 
                        <ul>
                                <li>
-                                       <p:link title="#{msg.GUEST_LINK_HOME_TITLE}" outcome="index" value="#{msg.GUEST_LINK_HOME}" />
+                                       <p:link
+                                               outcome="index"
+                                               value="#{msg.GUEST_LINK_HOME}"
+                                               title="#{msg.GUEST_LINK_HOME_TITLE}"
+                                               />
                                </li>
                        </ul>
 
                        <ul>
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                        <li>
-                                               <p:link title="#{msg.GUEST_LOGIN_LINK_TITLE}" outcome="user_login" value="#{msg.GUEST_LINK_LOGIN}" />
+                                               <p:link
+                                                       outcome="user_login"
+                                                       value="#{msg.GUEST_LINK_LOGIN}"
+                                                       title="#{msg.GUEST_LOGIN_LINK_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
                                        <li>
-                                               <p:link title="#{msg.GUEST_LINK_REGISTER_TITLE}" outcome="user_register" value="#{msg.GUEST_LINK_REGISTER}" />
+                                               <p:link
+                                                       outcome="user_register"
+                                                       value="#{msg.GUEST_LINK_REGISTER}"
+                                                       title="#{msg.GUEST_LINK_REGISTER_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
                                        <li>
-                                               <p:link title="#{msg.GUEST_LINK_PASSWORD_TITLE}" outcome="user_lost_password" value="#{msg.GUEST_LINK_PASSWORD}" />
+                                               <p:link
+                                                       outcome="user_lost_password"
+                                                       value="#{msg.GUEST_LINK_PASSWORD}"
+                                                       title="#{msg.GUEST_LINK_PASSWORD_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
                                        <li>
-                                               <p:link title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.GUEST_LINK_RESEND_LINK}" />
+                                               <p:link
+                                                       outcome="user_resend_link"
+                                                       value="#{msg.GUEST_LINK_RESEND_LINK}"
+                                                       title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
                        </ul>
index ca95206b893d3bd85e37199fc1b6f803fcfb29b8..f57ca4a74e55a6fba9ec9121d77fc781374382fc 100644 (file)
                                        <!-- @TODO Find something better //-->
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
                                        <h:outputText value="&#160;" />
-                                       <p:link outcome="privacy" target="_blank" value="#{msg.GUEST_LINK_PRIVACY_STATEMENTS}" />
+                                       <p:link
+                                               outcome="privacy"
+                                               target="_blank"
+                                               value="#{msg.GUEST_LINK_PRIVACY_STATEMENTS}"
+                                               />
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
                                </div>
                        </h:panelGroup>
                                        <!-- @TODO Find something better //-->
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
                                        <h:outputText value="&#160;" />
-                                       <p:link outcome="terms" target="_blank" value="#{msg.GUEST_LINK_TERMS_CONDITIONS}" />
+                                       <p:link
+                                               outcome="terms"
+                                               target="_blank"
+                                               value="#{msg.GUEST_LINK_TERMS_CONDITIONS}"
+                                               />
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
                                </div>
                        </h:panelGroup>
index d9f177d85a061c571c78c33f8f114bbd0b8c6e9d..c3e71d5ac57b4bb63d3b587e6859668bbdc2bd23 100644 (file)
        <div class="footer">
                <ul class="navbar-horizontal">
                        <li class="navlink-horizontal">
-                               <p:link outcome="login_index" title="#{msg.LOGIN_LINK_HOME_TITLE}" value="#{msg.LOGIN_LINK_HOME}" />
+                               <p:link
+                                       outcome="login_index"
+                                       value="#{msg.LOGIN_LINK_HOME}"
+                                       title="#{msg.LOGIN_LINK_HOME_TITLE}"
+                                       />
                        </li>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="imprint" title="#{msg.GUEST_LINK_IMPRINT_TITLE}" value="#{msg.GUEST_LINK_IMPRINT}" />
+                                       <p:link
+                                               outcome="imprint"
+                                               value="#{msg.GUEST_LINK_IMPRINT}"
+                                               title="#{msg.GUEST_LINK_IMPRINT_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="terms" title="#{msg.GUEST_LINK_TERMS_TITLE}" value="#{msg.GUEST_LINK_TERMS}" />
+                                       <p:link
+                                               outcome="terms"
+                                               value="#{msg.GUEST_LINK_TERMS}"
+                                               title="#{msg.GUEST_LINK_TERMS_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="privacy" title="#{msg.GUEST_LINK_PRIVACY_TITLE}" value="#{msg.GUEST_LINK_PRIVACY}" />
+                                       <p:link
+                                               outcome="privacy"
+                                               value="#{msg.GUEST_LINK_PRIVACY}"
+                                               title="#{msg.GUEST_LINK_PRIVACY_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
index f707404a332d0a2b2d2bd0ee239731350d844e6d..43e4cb62371e3907ca16d6635e27bb793cbbd450 100644 (file)
 
                        <ul>
                                <li>
-                                       <p:link title="#{msg.LOGIN_LINK_HOME_TITLE}" outcome="user_index" value="#{msg.LOGIN_LINK_HOME}" />
+                                       <p:link
+                                               outcome="user_index"
+                                               value="#{msg.LOGIN_LINK_HOME}"
+                                               title="#{msg.LOGIN_LINK_HOME_TITLE}"
+                                               />
                                </li>
 
                                <li>
-                                       <p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+                                       <p:link
+                                               outcome="user_list"
+                                               value="#{msg.LINK_USER_LIST}"
+                                               title="#{msg.LINK_USER_LIST_TITLE}"
+                                               />
                                </li>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_list')}">
                                        <li>
-                                               <p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+                                               <p:link
+                                                       outcome="user_list"
+                                                       value="#{msg.LINK_USER_LIST}"
+                                                       title="#{msg.LINK_USER_LIST_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
                        </ul>
                                <ul>
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data')}">
                                                <li>
-                                                       <p:link title="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA}" />
+                                                       <p:link
+                                                               outcome="login_change_personal_data"
+                                                               value="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA}"
+                                                               title="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_change_email_address')}">
                                                <li>
-                                                       <p:link title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}" />
+                                                       <p:link
+                                                               outcome="login_change_email_address"
+                                                               value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}"
+                                                               title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword() or featureController.isFeatureEnabled('change_user_password')}">
                                                <li>
-                                                       <p:link title="#{msg.LOGIN_LINK_CHANGE_PASSWORD_TITLE}" outcome="user_change_password" value="#{msg.LOGIN_LINK_CHANGE_PASSWORD}" />
+                                                       <p:link
+                                                               outcome="user_change_password"
+                                                               value="#{msg.LOGIN_LINK_CHANGE_PASSWORD}"
+                                                               title="#{msg.LOGIN_LINK_CHANGE_PASSWORD_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
                                </ul>
 
                        <ul>
                                <li>
-                                       <p:link title="#{msg.LOGIN_LINK_ALL_APPLICATIONS_TITLE}" outcome="user_all_applications" value="#{msg.LOGIN_LINK_ALL_APPLICATIONS}" />
+                                       <p:link
+                                               outcome="user_all_applications"
+                                               value="#{msg.LOGIN_LINK_ALL_APPLICATIONS}"
+                                               title="#{msg.LOGIN_LINK_ALL_APPLICATIONS_TITLE}"
+                                               />
                                </li>
                        </ul>
 
 
                        <ul>
                                <li>
-                                       <p:link title="#{msg.GUEST_LINK_HOME_TITLE}" outcome="index" value="#{msg.GUEST_LINK_HOME}" />
+                                       <p:link
+                                               outcome="index"
+                                               value="#{msg.GUEST_LINK_HOME}"
+                                               title="#{msg.GUEST_LINK_HOME_TITLE}"
+                                               />
                                </li>
 
                                <li>
-                                       <p:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
+                                       <p:link
+                                               outcome="logout"
+                                               value="#{msg.LINK_CLOSE_SESSION}"
+                                               title="#{msg.LINK_CLOSE_SESSION_TITLE}"
+                                               />
                                </li>
                        </ul>
                </h:panelGroup>
index 54ef06335aae93ffdf1f07f3429cff9cbaa714eb..8ee0448a33d5c97bfc018006731e073ef0e2f097 100644 (file)
                                        oncomplete="PF('basicDataDialog').show()"
                                        />
 
-                               <p:column headerText="#{msg.ID_HEADER}" sortBy="#{basicData.basicDataId}" filterable="false">
-                                       <p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}" value="#{basicData.basicDataId}">
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{basicData.basicDataId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_basic_data"
+                                               value="#{basicData.basicDataId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+                                               >
                                                <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_SHORT_NAME_HEADER}" sortBy="#{basicData.companyShortName}" filterBy="#{basicData.companyShortName}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_SHORT_NAME_HEADER}"
+                                       sortBy="#{basicData.companyShortName}"
+                                       filterBy="#{basicData.companyShortName}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputLink value="#{basicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty basicData.companyWebsiteUrl}">
                                                <h:outputText value="#{basicData.companyShortName}" />
                                        </h:outputLink>
                                        <h:outputText value="#{basicData.companyShortName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty basicData.companyWebsiteUrl}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{basicData.companyName}" filterBy="#{basicData.companyName}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}"
+                                       sortBy="#{basicData.companyName}"
+                                       filterBy="#{basicData.companyName}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{basicData.companyName}" rendered="#{not empty basicData.companyName}" />
 
                                        <h:outputText value="-" rendered="#{empty basicData.companyName}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}" sortBy="#{basicData.companyContactEmployee}" filterBy="#{basicData.companyContactEmployee}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}"
+                                       sortBy="#{basicData.companyContactEmployee}"
+                                       filterBy="#{basicData.companyContactEmployee}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(basicData.companyContactEmployee)}" rendered="#{not empty basicData.companyContactEmployee}">
+                                       <p:link
+                                               outcome="admin_show_employee"
+                                               value="#{beanHelper.renderEmployee(basicData.companyContactEmployee)}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE}"
+                                               rendered="#{not empty basicData.companyContactEmployee}"
+                                               >
                                                <f:param name="employeeId" value="#{basicData.companyContactEmployee.employeeId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_basic_data_employee" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON}" rendered="#{empty basicData.companyContactEmployee}">
+                                       <p:link
+                                               outcome="admin_assign_basic_data_employee"
+                                               value="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON_TITLE}"
+                                               rendered="#{empty basicData.companyContactEmployee}"
+                                               >
                                                <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_FOUNDER_HEADER}" sortBy="#{basicData.companyFounder}" filterBy="#{basicData.companyFounder}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_FOUNDER_HEADER}"
+                                       sortBy="#{basicData.companyFounder}"
+                                       filterBy="#{basicData.companyFounder}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{beanHelper.renderEmployee(basicData.companyFounder)}" rendered="#{not empty basicData.companyFounder}">
+                                       <p:link
+                                               outcome="admin_show_employee"
+                                               value="#{beanHelper.renderEmployee(basicData.companyFounder)}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE}"
+                                               rendered="#{not empty basicData.companyFounder}"
+                                               >
                                                <f:param name="employeeId" value="#{basicData.companyFounder.employeeId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_basic_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyFounder}">
+                                       <p:link
+                                               outcome="admin_assign_basic_data_contact"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_COMPANY_FOUNDER_TITLE}"
+                                               rendered="#{empty basicData.companyFounder}"
+                                               >
                                                <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{basicData.companyUserOwner}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_HEADER}"
+                                       sortBy="#{basicData.companyUserOwner}"
+                                       filterBy="#{basicData.companyUserOwner}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(basicData.companyUserOwner)}" rendered="#{not empty basicData.companyUserOwner}">
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{beanHelper.renderUser(basicData.companyUserOwner)}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE}"
+                                               rendered="#{not empty basicData.companyUserOwner}"
+                                               >
                                                <f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_basic_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
+                                       <p:link
+                                               outcome="admin_assign_basic_data_owner"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE}"
+                                               rendered="#{empty basicData.companyUserOwner}"
+                                               >
                                                <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.TAX_NUMBER_HEADER}" sortBy="#{basicData.companyTaxNumber}" filterBy="#{basicData.companyTaxNumber}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.TAX_NUMBER_HEADER}"
+                                       sortBy="#{basicData.companyTaxNumber}"
+                                       filterBy="#{basicData.companyTaxNumber}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{basicData.companyTaxNumber}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{basicData.companyCreated}">
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{basicData.companyCreated}"
+                                       >
                                        <h:outputText id="companyCreated" value="#{basicData.companyCreated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
                                        <links:outputBasicDataAdminDropdownMenu basicData="#{basicData}" />
                                </p:column>
                        </p:dataTable>
index b7abea680c0b1ee040da5afad7fb9485ee7147a0..f155a9a3e1f0a6847e38e9fa2c65b696d9c81099 100644 (file)
                                        oncomplete="PF('branchOfficeDialog').show()"
                                        />
 
-                               <p:column headerText="#{msg.ID_HEADER}" sortBy="#{branchOffice.branchId}" filterable="false">
-                                       <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{branchOffice.branchId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_branch_office"
+                                               value="#{branchOffice.branchId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
+                                               >
                                                <f:param name="branchId" value="#{branchOffice.branchId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.BRANCH_OFFICE_NUMBER_HEADER}"
+                                       sortBy="#{branchOffice.branchNumber}"
+                                       filterBy="#{branchOffice.branchNumber}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{branchOffice.branchNumber}" rendered="#{not empty branchOffice.branchNumber}" />
+                                       <h:outputText value="-" rendered="#{empty branchOffice.branchNumber}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}"
+                                       sortBy="#{branchOffice.branchCompany}"
+                                       filterBy="#{branchOffice.branchCompany}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{branchOffice.branchUserOwner}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_HEADER}"
+                                       sortBy="#{branchOffice.branchUserOwner}"
+                                       filterBy="#{branchOffice.branchUserOwner}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(branchOffice.branchUserOwner)}" rendered="#{not empty branchOffice.branchUserOwner}">
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{beanHelper.renderUser(branchOffice.branchUserOwner)}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}"
+                                               rendered="#{not empty branchOffice.branchUserOwner}"
+                                               >
                                                <f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
+                                       <p:link
+                                               outcome="admin_assign_branch_office_owner"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}"
+                                               rendered="#{empty branchOffice.branchUserOwner}"
+                                               >
                                                <f:param name="branchId" value="#{branchOffice.branchId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{branchOffice.branchEmailAddress}" filterBy="#{branchOffice.branchEmailAddress}" filterMatchMode="contains">
-                                       <p:link href="mailto:#{branchOffice.branchEmailAddress}" value="#{branchOffice.branchEmailAddress}" rendered="#{not empty branchOffice.branchEmailAddress}" />
+                               <p:column
+                                       headerText="#{msg.DATA_EMAIL_ADDRESS}"
+                                       sortBy="#{branchOffice.branchEmailAddress}"
+                                       filterBy="#{branchOffice.branchEmailAddress}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <p:link
+                                               href="mailto:#{branchOffice.branchEmailAddress}"
+                                               value="#{branchOffice.branchEmailAddress}"
+                                               rendered="#{not empty branchOffice.branchEmailAddress}"
+                                               />
 
                                        <h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty branchOffice.branchEmailAddress}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.DATA_ADDRESS}" sortBy="#{branchOffice.branchCity}" filterBy="#{branchOffice.branchCity}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.DATA_ADDRESS}"
+                                       sortBy="#{branchOffice.branchCity}"
+                                       filterBy="#{branchOffice.branchCity}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{beanHelper.renderBranchOffice(branchOffice)}" title="#{beanHelper.renderBranchOffice(branchOffice)}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}" sortBy="#{branchOffice.branchContactEmployee}" filterBy="#{branchOffice.branchContactEmployee}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}"
+                                       sortBy="#{branchOffice.branchContactEmployee}"
+                                       filterBy="#{branchOffice.branchContactEmployee}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(branchOffice.branchContactEmployee)}" rendered="#{not empty branchOffice.branchContactEmployee}">
+                                       <p:link
+                                               outcome="admin_show_employee"
+                                               value="#{beanHelper.renderEmployee(branchOffice.branchContactEmployee)}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}"
+                                               rendered="#{not empty branchOffice.branchContactEmployee}"
+                                               >
                                                <f:param name="employeeId" value="#{branchOffice.branchContactEmployee.employeeId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_branch_office_employee" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchContactEmployee}">
+                                       <p:link
+                                               outcome="admin_assign_branch_office_employee"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}"
+                                               rendered="#{empty branchOffice.branchContactEmployee}"
+                                               >
                                                <f:param name="branchId" value="#{branchOffice.branchId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{branchOffice.branchCreated}" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{branchOffice.branchCreated}"
+                                       filterable="false"
+                                       >
                                        <h:outputText id="branchCreated" value="#{branchOffice.branchCreated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
                                        <links:outputBranchOfficeAdminDropdownMenu branchOffice="#{branchOffice}" />
                                </p:column>
                        </p:dataTable>
                                                                </p:link>
 
                                                                <p:outputLabel value="#{msg.ASSIGNED_CONTACT_PERSON_HEADER}" title="#{msg.ASSIGNED_CONTACT_PERSON_TO_BRANCH_OFFICE_TITLE}" />
-                                                               <p:link outcome="admin_show_employee" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchContactEmployee)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}">
+                                                               <p:link
+                                                                       outcome="admin_show_employee"
+                                                                       target="_blank"
+                                                                       value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchContactEmployee)}"
+                                                                       title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}"
+                                                                       rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}"
+                                                                       >
                                                                        <f:param name="employeeId" value="#{branchOfficeListController.selectedBranchOffice.branchContactEmployee.employeeId}" />
                                                                </p:link>
                                                                <h:outputText value="#{msg.NO_CONTACT_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}" />
 
                                                                <p:outputLabel value="#{msg.ASSIGNED_OWNER_EMPLOYEE_HEADER}" title="#{msg.ASSIGNED_OWNER_EMPLOYEE_TO_BRANCH_OFFICE_TITLE}" />
-                                                               <p:link outcome="admin_show_employee" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_EMPLOYEE_TITLE}" value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchOwnerEmployee)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}">
+                                                               <p:link
+                                                                       outcome="admin_show_employee"
+                                                                       target="_blank"
+                                                                       value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchOwnerEmployee)}"
+                                                                       title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_EMPLOYEE_TITLE}"
+                                                                       rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}"
+                                                                       >
                                                                        <f:param name="employeeId" value="#{branchOfficeListController.selectedBranchOffice.branchContactEmployee.employeeId}" />
                                                                </p:link>
                                                                <h:outputText value="#{msg.NO_OWNER_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}" />
 
                                                                <p:outputLabel value="#{msg.ASSIGNED_USER_OWNER_HEADER}" title="#{msg.ASSIGNED_USER_OWNER_TO_BRANCH_OFFICE_TITLE}" />
-                                                               <p:link outcome="admin_show_user" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(branchOfficeListController.selectedBranchOffice.branchUserOwner)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchUserOwner}">
+                                                               <p:link
+                                                                       outcome="admin_show_user"
+                                                                       target="_blank"
+                                                                       value="#{beanHelper.renderUser(branchOfficeListController.selectedBranchOffice.branchUserOwner)}"
+                                                                       title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}"
+                                                                       rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchUserOwner}"
+                                                                       >
                                                                        <f:param name="userId" value="#{branchOfficeListController.selectedBranchOffice.branchUserOwner.userId}" />
                                                                </p:link>
                                                                <h:outputText value="#{msg.NO_USER_ASSIGNED_AS_OWNER_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchUserOwner}" />
index 9cae3468f535ab9cf8ed7ce608de39c863143562..9f308c5916c8c2209f8f4ff856ef8dcb5f338639 100644 (file)
                                emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}"
                                >
-                               <p:column exportable="false">
+                               <p:column
+                                       exportable="false"
+                                       >
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+                                       <p:link
+                                               outcome="admin_show_contact"
+                                               value="#{contact.contactId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+                                               >
                                                <f:param name="contactId" value="#{contact.contactId}" />
                                        </p:link>
                                </p:column>
index 648aadc6ce61c46161760c75f8b20261afaf2193..eec56139a8cbc0ca5906853d78d6bc267a725b0d 100644 (file)
                                                <h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+                                       <p:link
+                                               outcome="admin_show_contact"
+                                               value="#{contact.contactId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+                                               >
                                                <f:param name="contactId" value="#{contact.contactId}" />
                                        </p:link>
                                </p:column>
index e1d307dcdc5680573f6a41bcad1ecbb0bfb4c7b2..6f6b2402a1de14c3cd5851ecf4c2ccb570f78e7f 100644 (file)
                                </div>
 
                                <div class="para">
-                                       <p:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+                                       <p:link
+                                               outcome="admin_show_contact"
+                                               value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+                                               title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+                                               >
                                                <f:param name="contactId" value="#{adminContactPhoneController.contact.contactId}" />
                                        </p:link>
                                </div>
index 1845f997454525bd7a335e5cbc02d0ee14867484..55026b33ce2fef2b49bf0b99f2a57fc1e7bcc7fc 100644 (file)
                                </div>
 
                                <div class="para">
-                                       <p:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+                                       <p:link
+                                               outcome="admin_show_contact"
+                                               value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+                                               title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+                                               >
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </p:link>
                                </div>
index ed91cacfd764305a1992c6ee6f265727a7316eb9..aa699eb71d94f5662fb53667aa11e1f46dd6add6 100644 (file)
                                </div>
 
                                <div class="para">
-                                       <p:link outcome="admin_show_contact" title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+                                       <p:link
+                                               outcome="admin_show_contact"
+                                               value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+                                               title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+                                               >
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </p:link>
                                </div>
index 5a97cdf8b2adc13440de9cb578d1e4109ed6a05d..e394f038d8c84493d900a9cfb789b7dbd8dc0b51 100644 (file)
                                                <h:outputText value="#{msg.ID_HEADER}" />
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_country" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}" value="#{country.countryId}">
+                                       <p:link
+                                               outcome="admin_show_country"
+                                               value="#{country.countryId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}"
+                                               >
                                                <f:param name="countryId" value="#{country.countryId}" />
                                        </p:link>
                                </p:column>
index f9df8cc0a65b5e9ea6d585a9717b732fb1e2d2f4..a52836bcf73060ca9852019417bf30135d92eb70 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ID_HEADER}" sortBy="#{department.departmentId}" filterable="false">
-                                       <p:link outcome="admin_show_department" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" value="#{department.departmentId}">
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{department.departmentId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_department"
+                                               value="#{department.departmentId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}"
+                                               >
                                                <f:param name="departmentId" value="#{department.departmentId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_I18N_KEY_HEADER}" sortBy="#{local[department.departmentI18nKey]}" filterBy="#{local[department.departmentI18nKey]}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.ADMIN_I18N_KEY_HEADER}"
+                                       sortBy="#{local[department.departmentI18nKey]}"
+                                       filterBy="#{local[department.departmentI18nKey]}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{local[department.departmentI18nKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}"
+                                       sortBy="#{department.departmentCompany}"
+                                       filterBy="#{department.departmentCompany}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{department.departmentBranchOffice}" filterBy="#{department.departmentBranchOffice}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_BRANCH_OFFICE_HEADER}"
+                                       sortBy="#{department.departmentBranchOffice}"
+                                       filterBy="#{department.departmentBranchOffice}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(department.departmentBranchOffice)}" rendered="#{not empty department.departmentBranchOffice}">
+                                       <p:link
+                                               outcome="admin_show_branch_office"
+                                               value="#{beanHelper.renderBranchOffice(department.departmentBranchOffice)}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
+                                               rendered="#{not empty department.departmentBranchOffice}"
+                                               >
                                                <f:param name="branchId" value="#{department.departmentBranchOffice.branchId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_department_branch_office" title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENT_BRANCH_OFFICE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentBranchOffice}">
+                                       <p:link
+                                               outcome="admin_assign_department_branch_office"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENT_BRANCH_OFFICE_TITLE}"
+                                               rendered="#{empty department.departmentBranchOffice}"
+                                               >
                                                <f:param name="departmentId" value="#{department.departmentId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_DEPARTMENT_LEAD_EMPLOYEE}" sortBy="#{department.departmentLead.employeePersonalData.contactFamilyName}" filterBy="#{department.departmentLead}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_DEPARTMENT_LEAD_EMPLOYEE}"
+                                       sortBy="#{department.departmentLead.employeePersonalData.contactFamilyName}"
+                                       filterBy="#{department.departmentLead}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_LEAD_EMPLOYEE_TITLE}" value="#{department.departmentLead.employeeId}" rendered="#{not empty department.departmentLead}">
+                                       <p:link
+                                               outcome="admin_show_employee"
+                                               value="#{department.departmentLead.employeeId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_LEAD_EMPLOYEE_TITLE}"
+                                               rendered="#{not empty department.departmentLead}"
+                                               >
                                                <f:param name="employeeId" value="#{department.departmentLead.employeeId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_department_employee" title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENTS_LEAD_EMPLOYEE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentLead}">
+                                       <p:link
+                                               outcome="admin_assign_department_employee"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENTS_LEAD_EMPLOYEE_TITLE}"
+                                               rendered="#{empty department.departmentLead}"
+                                               >
                                                <f:param name="departmentId" value="#{department.departmentId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{department.departmentUserOwner}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_HEADER}"
+                                       sortBy="#{department.departmentUserOwner}"
+                                       filterBy="#{department.departmentUserOwner}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_OWNER_USER_TITLE}" value="#{department.departmentUserOwner.userId}" rendered="#{not empty department.departmentUserOwner}">
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{department.departmentUserOwner.userId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_OWNER_USER_TITLE}"
+                                               rendered="#{not empty department.departmentUserOwner}"
+                                               >
                                                <f:param name="userId" value="#{department.departmentUserOwner.userId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_department_user" title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENTS_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentUserOwner}">
+                                       <p:link
+                                               outcome="admin_assign_department_user"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENTS_OWNER_USER_TITLE}"
+                                               rendered="#{empty department.departmentUserOwner}"
+                                               >
                                                <f:param name="departmentId" value="#{department.departmentId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{department.departmentCreated}" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{department.departmentCreated}"
+                                       filterable="false"
+                                       >
                                        <h:outputText id="departmentCreated" value="#{department.departmentCreated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
                                        <links:outputDepartmentAdminDropdownMenu department="#{department}" />
                                </p:column>
                        </p:dataTable>
index 5d16be5f687562eb028a503c5379573b8b8736b2..c3aef03fb14ba20a90753f14ce29d1f53c0551c9 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ID_HEADER}" sortBy="#{employee.employeeId}" filterable="false">
-                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEE_TITLE}" value="#{employee.employeeId}">
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{employee.employeeId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_employee"
+                                               value="#{employee.employeeId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_EMPLOYEE_TITLE}"
+                                               >
                                                <f:param name="employeeId" value="#{employee.employeeId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{employee.employeeBranchOffice}" filterBy="#{employee.employeeBranchOffice}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.EMPLOYEE_NUMBER_HEADER}"
+                                       sortBy="#{employee.employeeNumber}"
+                                       filterBy="#{employee.employeeNumber}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{employee.employeeNumber}" rendered="#{not empty employee.employeeNumber}" />
+                                       <h:outputText value="-" rendered="#{empty employee.employeeNumber}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_BRANCH_OFFICE_HEADER}"
+                                       sortBy="#{employee.employeeBranchOffice}"
+                                       filterBy="#{employee.employeeBranchOffice}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}" rendered="#{not empty employee.employeeBranchOffice}">
+                                       <p:link
+                                               outcome="admin_show_branch_office"
+                                               value="#{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
+                                               rendered="#{not empty employee.employeeBranchOffice}"
+                                               >
                                                <f:param name="branchId" value="#{employee.employeeBranchOffice.branchId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_branch_office" title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEE_BRANCH_OFFICE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeBranchOffice}">
+                                       <p:link
+                                               outcome="admin_assign_branch_office"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEE_BRANCH_OFFICE_TITLE}"
+                                               rendered="#{empty employee.employeeBranchOffice}"
+                                               >
                                                <f:param name="employeeId" value="#{employee.employeeId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{employee.employeeUserOwner}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_HEADER}"
+                                       sortBy="#{employee.employeeUserOwner}"
+                                       filterBy="#{employee.employeeUserOwner}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEES_OWNER_USER_TITLE}" value="#{employee.employeeUserOwner.userId}" rendered="#{not empty employee.employeeUserOwner}">
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{employee.employeeUserOwner.userId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_EMPLOYEES_OWNER_USER_TITLE}"
+                                               rendered="#{not empty employee.employeeUserOwner}"
+                                               >
                                                <f:param name="userId" value="#{employee.employeeUserOwner.userId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_user_owner" title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeUserOwner}">
+                                       <p:link
+                                               outcome="admin_assign_user_owner"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEES_OWNER_USER_TITLE}"
+                                               rendered="#{empty employee.employeeUserOwner}"
+                                               >
                                                <f:param name="employeeId" value="#{employee.employeeId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{employee.employeeBasicData}" filterBy="#{employee.employeeBasicData}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}"
+                                       sortBy="#{employee.employeeBasicData}"
+                                       filterBy="#{employee.employeeBasicData}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{employee.employeeEmailAddress}" filterBy="#{employee.employeeEmailAddress}" filterMatchMode="contains">
-                                       <p:link href="mailto:#{employee.employeeEmailAddress}" value="#{employee.employeeEmailAddress}" rendered="#{not empty employee.employeeEmailAddress}" />
+                               <p:column
+                                       headerText="#{msg.DATA_EMAIL_ADDRESS}"
+                                       sortBy="#{employee.employeeEmailAddress}"
+                                       filterBy="#{employee.employeeEmailAddress}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <p:link
+                                               href="mailto:#{employee.employeeEmailAddress}"
+                                               value="#{employee.employeeEmailAddress}"
+                                               rendered="#{not empty employee.employeeEmailAddress}"
+                                               />
 
                                        <h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty employee.employeeEmailAddress}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{employee.employeeCreated}" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{employee.employeeCreated}"
+                                       filterable="false"
+                                       >
                                        <h:outputText id="employeeCreated" value="#{employee.employeeCreated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
                                        <links:outputEmployeeAdminDropdownMenu employee="#{employee}" />
                                </p:column>
                        </p:dataTable>
index 580844c7d22086000d991aeca01c0a6dfc6682c0..ded3715245eb8831ba7acbc33c8348c0113e6fd5 100644 (file)
                                        <h:outputText value="#{msg.ID_HEADER}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
+                               <p:link
+                                       outcome="admin_show_fax"
+                                       value="#{faxNumber.phoneId}"
+                                       title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
+                                       >
                                        <f:param name="phoneId" value="#{faxNumber.phoneId}" />
                                </p:link>
                        </p:column>
index 028f6359b9ec2b294c058c0a8d655df30cc6a138..18c9ada8dfb2c2a4ddfa82a22841a01f8b32b852 100644 (file)
                        <p:column>
                                <p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                               <p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+                               <p:link
+                                       id="contactId"
+                                       styleClass="table-data-field"
+                                       outcome="admin_show_contact"
+                                       value="#{contact.contactId}"
+                                       >
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </p:link>
                        </p:column>
                        <p:column>
                                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+                               <p:link
+                                       id="contactEmailAddress"
+                                       styleClass="table-data-field"
+                                       href="mailto:#{contact.contactEmailAddress}"
+                                       >
                                        <h:outputText value="#{contact.contactEmailAddress}" />
                                </h:outputLink>
                        </p:column>
@@ -85,7 +94,9 @@
                                <div class="table-data-field">
                                        <ul class="navbar-mini">
                                                <li class="navlink-mini">
-                                                       <p:link outcome="admin_unlink_contact_fax">
+                                                       <p:link
+                                                               outcome="admin_unlink_contact_fax"
+                                                               >
                                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
                                                                <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
index a6528673017831d46f6793ae922f025a241286d5..bc94fcd92452102a22d58237d9f09766c3e27689 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ID_HEADER}" sortBy="#{headquarter.headquarterId}" filterable="false">
-                                       <p:link outcome="admin_show_headquarter" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}" value="#{headquarter.headquarterId}">
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{headquarter.headquarterId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_headquarter"
+                                               value="#{headquarter.headquarterId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}"
+                                               >
                                                <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{headquarter.headquarterUserOwner}" filterBy="#{headquarter.headquarterUserOwner}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_HEADER}"
+                                       sortBy="#{headquarter.headquarterUserOwner}"
+                                       filterBy="#{headquarter.headquarterUserOwner}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_OWNER_USER_TITLE}" value="#{headquarter.headquarterUserOwner.userId}" rendered="#{not empty headquarter.headquarterUserOwner}">
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{headquarter.headquarterUserOwner.userId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_OWNER_USER_TITLE}"
+                                               rendered="#{not empty headquarter.headquarterUserOwner}"
+                                               >
                                                <f:param name="userId" value="#{headquarter.headquarterUserOwner.userId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_headquarter_owner" title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty headquarter.headquarterUserOwner}">
+                                       <p:link
+                                               outcome="admin_assign_headquarter_owner"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_OWNER_USER_TITLE}"
+                                               rendered="#{empty headquarter.headquarterUserOwner}"
+                                               >
                                                <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{headquarter.headquarterEmailAddress}" filterBy="#{headquarter.headquarterEmailAddress}" filterMatchMode="contains">
-                                       <p:link href="mailto:#{headquarter.headquarterEmailAddress}" value="#{headquarter.headquarterEmailAddress}" rendered="#{not empty headquarter.headquarterEmailAddress}" />
+                               <p:column
+                                       headerText="#{msg.DATA_EMAIL_ADDRESS}"
+                                       sortBy="#{headquarter.headquarterEmailAddress}"
+                                       filterBy="#{headquarter.headquarterEmailAddress}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <p:link
+                                               href="mailto:#{headquarter.headquarterEmailAddress}"
+                                               value="#{headquarter.headquarterEmailAddress}"
+                                               rendered="#{not empty headquarter.headquarterEmailAddress}"
+                                               />
 
                                        <h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty headquarter.headquarterEmailAddress}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.DATA_ADDRESS}" sortBy="#{headquarter.headquarterCity}" filterBy="#{headquarter.headquarterCity}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.DATA_ADDRESS}"
+                                       sortBy="#{headquarter.headquarterCity}"
+                                       filterBy="#{headquarter.headquarterCity}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{beanHelper.renderHeadquarter(headquarter)}" title="#{beanHelper.renderHeadquarter(headquarter)}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}" sortBy="#{headquarter.headquarterContactEmployee}" filterBy="#{headquarter.headquarterContactEmployee}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}"
+                                       sortBy="#{headquarter.headquarterContactEmployee}"
+                                       filterBy="#{headquarter.headquarterContactEmployee}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(headquarter.headquarterContactEmployee)}" rendered="#{not empty headquarter.headquarterContactEmployee}">
+                                       <p:link
+                                               outcome="admin_show_employee"
+                                               value="#{beanHelper.renderEmployee(headquarter.headquarterContactEmployee)}"
+                                               title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_CONTACT_PERSON_TITLE}"
+                                               rendered="#{not empty headquarter.headquarterContactEmployee}"
+                                               >
                                                <f:param name="employeeId" value="#{headquarter.headquarterContactEmployee.employeeId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_headquarter_employee" title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty headquarter.headquarterContactEmployee}">
+                                       <p:link
+                                               outcome="admin_assign_headquarter_employee"
+                                               value="#{msg.ADMIN_LINK_ASSIGN}"
+                                               title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_CONTACT_PERSON_TITLE}"
+                                               rendered="#{empty headquarter.headquarterContactEmployee}"
+                                               >
                                                <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{headquarter.headquarterCreated}" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{headquarter.headquarterCreated}"
+                                       filterable="false"
+                                       >
                                        <h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
                                        <links:outputHeadquarterAdminDropdownMenu headquarter="#{headquarter}" />
                                </p:column>
                        </p:dataTable>
                                                <h:outputText value="#{msg.ADMIN_LIST_HEADQUARTER_OPENING_TIMES_HEADER}" />
                                        </f:facet>
 
-                                       <p:column headerText="#{msg.ADMIN_START_WEEK_DAY}">
+                                       <p:column
+                                               headerText="#{msg.ADMIN_START_WEEK_DAY}"
+                                               >
                                                <h:outputText value="#{openingTime.openingStartDay.toString()}" />
                                        </p:column>
 
-                                       <p:column headerText="#{msg.ADMIN_END_WEEK_DAY}">
+                                       <p:column
+                                               headerText="#{msg.ADMIN_END_WEEK_DAY}"
+                                               >
                                                <h:outputText value="#{openingTime.openingEndDay.toString()}" />
                                        </p:column>
 
-                                       <p:column headerText="#{msg.ADMIN_START_TIME}">
+                                       <p:column
+                                               headerText="#{msg.ADMIN_START_TIME}"
+                                               >
                                                <h:outputText value="#{openingTime.openingStartTime}">
                                                        <f:convertDateTime type="time" timeStyle="short" />
                                                </h:outputText>
                                        </p:column>
 
-                                       <p:column headerText="#{msg.ADMIN_END_TIME}">
+                                       <p:column
+                                               headerText="#{msg.ADMIN_END_TIME}"
+                                               >
                                                <h:outputText value="#{openingTime.openingEndTime}">
                                                        <f:convertDateTime type="time" timeStyle="short" />
                                                </h:outputText>
index 18d517fe7844ddea27628d646ff34aa584623b11..7685a861c31e603ffc6b8a40555e1945e4bb738c 100644 (file)
                                        <h:outputText value="#{msg.ID_HEADER}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
+                               <p:link
+                                       outcome="admin_show_landline"
+                                       value="#{landLineNumber.phoneId}"
+                                       title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
+                                       >
                                        <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
                                </p:link>
                        </p:column>
index 34704153df56ced3add255727c20f1b149926b3f..fdf288d54c64ca7eec8c977f3386b7e0ae13fa1a 100644 (file)
                        <p:column>
                                <p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                               <p:link id="contactId" outcome="admin_show_contact">
+                               <p:link
+                                       id="contactId"
+                                       outcome="admin_show_contact"
+                                       >
                                        <h:outputText styleClass="table-data-field" value="#{contact.contactId}" />
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </p:link>
                        <p:column>
                                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+                               <p:link
+                                       id="contactEmailAddress"
+                                       styleClass="table-data-field"
+                                       href="mailto:#{contact.contactEmailAddress}"
+                                       >
                                        <h:outputText value="#{contact.contactEmailAddress}" />
                                </h:outputLink>
                        </p:column>
                                <div class="table-data-field">
                                        <ul class="navbar-mini">
                                                <li class="navlink-mini">
-                                                       <p:link outcome="admin_unlink_contact_landline">
-                                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
+                                                       <p:link
+                                                               outcome="admin_unlink_contact_landline"
+                                                               >
+                                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}" />
                                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </p:link>
index 3545df05554df1a5f477a7e855e3a856adf66281..db23ca344e4cf321699b7c9615fd92b19aaf044e 100644 (file)
                                        <h:outputText value="#{msg.ID_HEADER}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_mobile" value="#{mobileNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+                               <p:link
+                                       outcome="admin_show_mobile"
+                                       value="#{mobileNumber.phoneId}"
+                                       title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}"
+                                       >
                                        <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
                                </p:link>
                        </p:column>
                                        <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_mobile_provider" value="#{mobileNumber.mobileProvider.providerName}">
+                               <p:link
+                                       outcome="admin_show_mobile_provider"
+                                       value="#{mobileNumber.mobileProvider.providerName}"
+                                       title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+                                       >
                                        <f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
                                </p:link>
                        </p:column>
index a17d75fe6a09eab625e6989e1687fffc6fc22c72..e4e4068e0293408c8d8313bdc4c4f6ba3fa29abf 100644 (file)
                        <p:column>
                                <p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                               <p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+                               <p:link
+                                       id="contactId"
+                                       styleClass="table-data-field"
+                                       outcome="admin_show_contact"
+                                       value="#{contact.contactId}"
+                                       >
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </p:link>
                        </p:column>
                        <p:column>
                                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+                               <p:link
+                                       id="contactEmailAddress"
+                                       styleClass="table-data-field"
+                                       href="mailto:#{contact.contactEmailAddress}"
+                                       >
                                        <h:outputText value="#{contact.contactEmailAddress}" />
                                </h:outputLink>
                        </p:column>
@@ -85,7 +94,9 @@
                                <div class="table-data-field">
                                        <ul class="navbar-mini">
                                                <li class="navlink-mini">
-                                                       <p:link outcome="admin_unlink_contact_mobile">
+                                                       <p:link
+                                                               outcome="admin_unlink_contact_mobile"
+                                                               >
                                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
                                                                <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
index b4ab0f2004fbf91051ea182cf150a99011434acf..444cbce9f5d9280144ee80c35b48e96c25640202 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ID_HEADER}" sortBy="#{mobileProvider.providerId}" filterBy="#{mobileProvider.providerId}">
-                                       <p:link outcome="admin_show_mobile_provider" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{mobileProvider.providerId}"
+                                       filterBy="#{mobileProvider.providerId}"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_mobile_provider"
+                                               value="#{mobileProvider.providerId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+                                               >
                                                <f:param name="providerId" value="#{mobileProvider.providerId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" sortBy="#{mobileProvider.providerName}" filterBy="#{mobileProvider.providerName}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}"
+                                       sortBy="#{mobileProvider.providerName}"
+                                       filterBy="#{mobileProvider.providerName}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{mobileProvider.providerName}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" sortBy="#{mobileProvider.providerDialPrefix}" filterBy="#{mobileProvider.providerDialPrefix}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}"
+                                       sortBy="#{mobileProvider.providerDialPrefix}"
+                                       filterBy="#{mobileProvider.providerDialPrefix}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{mobileProvider.providerDialPrefix}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" sortBy="#{mobileProvider.providerCountry.countryPhoneCode}" filterBy="#{mobileProvider.providerCountry}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}"
+                                       sortBy="#{mobileProvider.providerCountry.countryPhoneCode}"
+                                       filterBy="#{mobileProvider.providerCountry}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        <h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{mobileProvider.providerEntryCreated}">
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{mobileProvider.providerEntryCreated}"
+                                       >
                                        <h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       >
                                        <links:outputMobileProviderAdminDropdownMenu mobileProvider="#{mobileProvider}" />
                                </p:column>
                        </p:dataTable>
index 85619b94c397f7b8f8b7a9cd095ea54bc5130d72..2e88e35ced72125af3b6ac0470bb208b08b93505 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ID_HEADER}" sortBy="#{openingTime.openingId}" filterable="false">
-                                       <p:link outcome="admin_show_opening_time" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" value="#{openingTime.openingId}">
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{openingTime.openingId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_opening_time"
+                                               value="#{openingTime.openingId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}"
+                                               >
                                                <f:param name="openingId" value="#{openingTime.openingId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_START_WEEK_DAY}" sortBy="#{openingTime.openingStartDay}" filterBy="#{openingTime.openingStartDay}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_START_WEEK_DAY}"
+                                       sortBy="#{openingTime.openingStartDay}"
+                                       filterBy="#{openingTime.openingStartDay}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        label="#{msg.LABEL_WEEK_DAYS}"
                                        <h:outputText value="#{openingTime.openingStartDay.toString()}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_END_WEEK_DAY}" sortBy="#{openingTime.openingEndDay}" filterBy="#{openingTime.openingEndDay}" filterMatchMode="in">
+                               <p:column
+                                       headerText="#{msg.ADMIN_END_WEEK_DAY}"
+                                       sortBy="#{openingTime.openingEndDay}"
+                                       filterBy="#{openingTime.openingEndDay}"
+                                       filterMatchMode="in"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        label="#{msg.LABEL_WEEK_DAYS}"
                                        <h:outputText value="#{openingTime.openingEndDay.toString()}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_START_TIME}" sortBy="#{openingTime.openingStartTime}" filterBy="#{openingTime.openingStartTime}" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_START_TIME}"
+                                       sortBy="#{openingTime.openingStartTime}"
+                                       filterBy="#{openingTime.openingStartTime}"
+                                       filterable="false"
+                                       >
                                        <h:outputText value="#{openingTime.openingStartTime}">
                                                <f:convertDateTime type="time" timeStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_END_TIME}" sortBy="#{openingTime.openingEndTime}" filterBy="#{openingTime.openingEndTime}" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_END_TIME}"
+                                       sortBy="#{openingTime.openingEndTime}"
+                                       filterBy="#{openingTime.openingEndTime}"
+                                       filterable="false"
+                                       >
                                        <h:outputText value="#{openingTime.openingEndTime}">
                                                <f:convertDateTime type="time" timeStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
                                        <links:outputOpeningTimeAdminDropdownMenu openingTime="#{openingTime}" />
                                </p:column>
                        </p:dataTable>
index 6291832ec8370e83e34bfd9b0f592116c84225fd..09745ae4d95e9c9742b1defa82414935985b651a 100644 (file)
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
+                               <p:link
+                                       outcome="admin_show_user"
+                                       value="#{userActivity.activityUser.userId}"
+                                       title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                       >
                                        <f:param name="userId" value="#{userActivity.activityUser.userId}" />
                                </p:link>
                        </p:column>
index a673634bcbb07c2057bfe01c99f85ab44da2009d..3de869ddc153200c0ea96fb23a989568fdbd1a3d 100644 (file)
                                                <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{user.userId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                               >
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
                                </p:column>
index 41ec650e1f501e15cb91dacb28f59f2ec9c46a3b..eeda9a552b22ddf9a9aa802c6a2f673fb9ebc90c 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_USER_ID}" sortBy="#{user.userId}" filterBy="#{user.userId}" filterMatchMode="contains">
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_ID}"
+                                       sortBy="#{user.userId}"
+                                       filterBy="#{user.userId}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{user.userId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                               >
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_USER_NAME}" sortBy="#{user.userName}" filterBy="#{user.userName}" filterMatchMode="contains" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+                               <p:column
+                                       headerText="#{msg.ADMIN_LIST_USER_NAME}"
+                                       sortBy="#{user.userName}"
+                                       filterBy="#{user.userName}"
+                                       filterMatchMode="contains"
+                                       rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}"
+                                       >
                                        <h:outputText value="#{user.userName}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" sortBy="#{user.userContact.contactPersonalTitle}" filterBy="#{user.userContact.contactPersonalTitle}" filterMatchMode="exact">
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}"
+                                       sortBy="#{user.userContact.contactPersonalTitle}"
+                                       filterBy="#{user.userContact.contactPersonalTitle}"
+                                       filterMatchMode="exact"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectOneMenu
                                                        filter="true"
                                        <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}" sortBy="#{user.userContact.contactFirstName}" filterBy="#{user.userContact.contactFirstName}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}"
+                                       sortBy="#{user.userContact.contactFirstName}"
+                                       filterBy="#{user.userContact.contactFirstName}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{user.userContact.contactFirstName}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}" sortBy="#{user.userContact.contactFamilyName}" filterBy="#{user.userContact.contactFamilyName}" filterMatchMode="contains">
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}"
+                                       sortBy="#{user.userContact.contactFamilyName}"
+                                       filterBy="#{user.userContact.contactFamilyName}"
+                                       filterMatchMode="contains"
+                                       >
                                        <h:outputText value="#{user.userContact.contactFamilyName}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_USER_ACCOUNT_STATUS}" sortBy="#{user.userAccountStatus}" filterBy="#{user.userAccountStatus}" filterMatchMode="exact">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_ACCOUNT_STATUS}"
+                                       sortBy="#{user.userAccountStatus}"
+                                       filterBy="#{user.userAccountStatus}"
+                                       filterMatchMode="exact"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectOneMenu
                                                        filter="true"
                                        <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_USER_PROFILE_MODE}" sortBy="#{user.userProfileMode}" filterBy="#{user.userProfileMode}" filterMatchMode="exact">
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_PROFILE_MODE}"
+                                       sortBy="#{user.userProfileMode}"
+                                       filterBy="#{user.userProfileMode}"
+                                       filterMatchMode="exact"
+                                       >
                                        <f:facet name="filter">
                                                <p:selectOneMenu
                                                        filter="true"
                                        <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{user.userCreated}" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{user.userCreated}"
+                                       filterable="false"
+                                       >
                                        <h:outputText id="userCreated" value="#{user.userCreated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
                                        <links:outputUserAdminDropdownMenu user="#{user}" />
                                </p:column>
                        </p:dataTable>
index 7ca8a10f56ebb4fb9dc05c833674e2348b1a7933..3cee469f7a1477111fb3635782803d0104ccfcfd 100644 (file)
                                        </div>
 
                                        <div class="table-data-field">
-                                               <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+                                               <p:link
+                                                       outcome="admin_show_user"
+                                                       title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                                       value="#{beanHelper.user.userId}"
+                                                       >
                                                        <f:param name="userId" value="#{beanHelper.user.userId}" />
                                                </p:link>
                                        </div>
index e8a391fa51c74b6db4e8da74a2eeeb593888fad0..e954485e069eda1c5d84aba13c8d99958f797caa 100644 (file)
 
                                <h:outputText value="&#160;" />
 
-                               <p:link id="user_register" outcome="user_register" title="#{msg.GUEST_LINK_USER_NO_ACCOUNT_TITLE}" value="#{msg.GUEST_LINK_USER_NO_ACCOUNT_YET}" />
+                               <p:link
+                                       outcome="user_register"
+                                       value="#{msg.GUEST_LINK_USER_NO_ACCOUNT_YET}"
+                                       title="#{msg.GUEST_LINK_USER_NO_ACCOUNT_TITLE}"
+                                       />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block">
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
-                               <p:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.GUEST_LINK_USER_LOST_PASSWORD}" />
+                               <p:link
+                                       outcome="user_lost_password"
+                                       value="#{msg.GUEST_LINK_USER_LOST_PASSWORD}"
+                                       title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}"
+                                       />
                        </h:panelGroup>
                </ui:fragment>
        </ui:define>
index c3b1dc1521a15f0c28bf5eaaa6fbec425984232f..1da89b76f3b3b5932940ee0245c14ef7b49e613c 100644 (file)
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <h:panelGroup styleClass="para" layout="block">
                                        <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} " />
-                                       <p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                                       <p:link
+                                               outcome="user_login"
+                                               value="#{msg.CLICK_HERE}"
+                                               />
                                        <h:outputText value=" #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
                                </h:panelGroup>
                        </ui:fragment>
index 8e764edc3a0ec0100003a2d6d3df05b8124bf7ce..fa04cf53b0adf630d2687ad4d1a7c73251c48389 100644 (file)
                </h:panelGroup>
 
                <h:panelGroup layout="block" styleClass="registration_form">
-                       <p:link id="resend_link" styleClass="resend_link" value="#{msg.GUEST_LINK_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+                       <p:link
+                               outcome="user_resend_link"
+                               value="#{msg.GUEST_LINK_RESEND_CONFIRMATION_LINK}"
+                               rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}"
+                               styleClass="resend_link"
+                               />
                </h:panelGroup>
        </ui:define>
 </ui:composition>
index 73b3abe96247cbf2bb925c149d6acadde34cfa0d..32e1901b50e5ec6cd18c502d45ffb6d40a00eb1c 100644 (file)
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <h:panelGroup styleClass="para" layout="block">
                                        <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
-                                       <p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                                       <p:link
+                                               outcome="user_login"
+                                               value="#{msg.CLICK_HERE}"
+                                               />
                                        <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
                                </h:panelGroup>
                        </ui:fragment>
index cdfdb6085d6c54092ee2d77edb7d906a5b8e65db..354e7a2e9931f01b5599e7013f609cd590ae0ce7 100644 (file)
                <core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       <p:link
+                               outcome="user_change_password"
+                               value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                               />
                </ui:fragment>
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
index 5620a3b4cd925c60b5a7db0fe2ca2d918c98fd02..1686beddcb6d0afbae3630d8e9079ecd5b288f26 100644 (file)
                                <ul>
                                        <ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
                                                <li>
-                                                       <p:link title="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA}" />
+                                                       <p:link
+                                                               outcome="login_user_change_personal_data"
+                                                               value="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA}"
+                                                               title="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
                                                <li>
-                                                       <p:link title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}" />
+                                                       <p:link
+                                                               outcome="login_user_change_email_address"
+                                                               value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}"
+                                                               title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
 
                                        <li>
-                                               <p:link title="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD}" />
+                                               <p:link
+                                                       outcome="login_user_change_password"
+                                                       value="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD}"
+                                                       title="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD_TITLE}"
+                                                       />
                                        </li>
                                </ul>
                        </h:panelGroup>
index 8d6cac9e7d1f99b33790cb8d6f5d974b1f865f42..76e5055eb18b25a69ae9e8d6fe62151ac35023f8 100644 (file)
                        <!-- @TODO Here goes your content. //-->
                </ui:fragment>
 
-               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-               </ui:fragment>
+               <p:link
+                       outcome="user_change_password"
+                       value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                       rendered="#{userLoginController.ifUserMustChangePassword()}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index 6eff3bdb71bcfaff09e6b8dcda7844a433c91db5..27f83c814f2ccad7a0d26ffb91f0037f12b7483f 100644 (file)
        <ui:define name="content">
                <core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
-               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-               </ui:fragment>
+               <p:link
+                       outcome="user_change_password"
+                       value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                       rendered="#{userLoginController.ifUserMustChangePassword()}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index 0e5da1fd1d6b74069e76b45d0e06fff090d03302..b19c5b920584062a96b4116809ae5c8ceaa658ef 100644 (file)
 
                <core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
-               <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" rendered="#{userLoginController.ifUserMustChangePassword()}" />
+               <p:link
+                       outcome="user_change_password"
+                       value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                       rendered="#{userLoginController.ifUserMustChangePassword()}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index 365372114811e6e549d5f6c891024586c8beb4cf..4c0b9e1d50dc8834667f62a2bd4a6cf724718ff2 100644 (file)
        <ui:define name="content">
                <core:outputMessageBox panelGroupId="loginUserDataSaved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-               </ui:fragment>
+               <p:link
+                       outcome="user_change_password"
+                       value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                       rendered="#{userLoginController.ifUserMustChangePassword()}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />