]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 1 Oct 2017 16:11:22 +0000 (18:11 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 1 Oct 2017 16:11:22 +0000 (18:11 +0200)
- no more "title" but "document_title" now
- also "document_<admin|guest|login>_title" which is for the <title> tag
- the extra title above the content is now moved into the page header tag which
  reduces redundant stuff (see content_header)
- converted admin_form_employee_data.tpl to new (more responsive) way
- added missing i18n strings
- got rid of "fieldset" CSS class

Signed-off-by: Roland Häder <roland@mxchange.org>
85 files changed:
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl
web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl
web/WEB-INF/templates.dist/admin_page.xhtml
web/WEB-INF/templates.dist/guest_login_page.xhtml
web/WEB-INF/templates.dist/guest_page.xhtml
web/WEB-INF/templates.dist/login_page.xhtml
web/WEB-INF/templates/admin/admin_base.tpl
web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
web/WEB-INF/templates/base.tpl
web/WEB-INF/templates/guest/guest_base.tpl
web/WEB-INF/templates/login/user/user_base.tpl
web/admin/admin_logout.xhtml
web/admin/basic_company_data/admin_basic_company_data_list.xhtml
web/admin/branch_office/admin_branch_office_list.xhtml
web/admin/contact/admin_contact_delete.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_export.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/contact/admin_contact_show.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_delete.xhtml
web/admin/country/admin_country_edit.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/employee/admin_employee_list.xhtml
web/admin/fax/admin_fax_delete.xhtml
web/admin/fax/admin_fax_edit.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/index.xhtml
web/admin/landline/admin_landline_delete.xhtml
web/admin/landline/admin_landline_edit.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_contact_mobile_list.xhtml
web/admin/mobile/admin_contact_mobile_unlink.xhtml
web/admin/mobile/admin_mobile_delete.xhtml
web/admin/mobile/admin_mobile_edit.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile/admin_mobile_show.xhtml
web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_show.xhtml
web/admin/user/admin_user_activity_log.xhtml
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_edit.xhtml
web/admin/user/admin_user_export.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_lock.xhtml
web/admin/user/admin_user_resend_confirmation_link.xhtml
web/admin/user/admin_user_show.xhtml
web/admin/user/admin_user_unlock.xhtml
web/exception.xhtml
web/guest/user/user_confirm_account.xhtml
web/guest/user/user_list.xhtml
web/guest/user/user_login.xhtml
web/guest/user/user_lost_password.xhtml
web/guest/user/user_profile.xhtml
web/guest/user/user_register.xhtml
web/guest/user/user_register_done.xhtml
web/guest/user/user_register_page2.xhtml
web/guest/user/user_resend_done.xhtml
web/guest/user/user_resend_link.xhtml
web/imprint.xhtml
web/index.xhtml
web/privacy.xhtml
web/resources/css/custom.css
web/terms.xhtml
web/user/login_contact_data_saved.xhtml
web/user/login_data_saved.xhtml
web/user/login_edit_user_data.xhtml
web/user/login_index.xhtml
web/user/login_logout.xhtml
web/user/login_user_change_email_address.xhtml
web/user/login_user_change_password.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 a00c7addf30109d68f0dfeef4ae8e992c7ea14c8..ce24a10589f1336f6d3d6b57f6354adb5e1e12af 100644 (file)
@@ -266,7 +266,7 @@ ADMIN_MENU_COUNTRY_TITLE=L\u00e4nderdaten
 ADMIN_LINK_LIST_COUNTRIES=L\u00e4nder auflisten
 ADMIN_LINK_LIST_COUNTRIES_TITLE=Bestehende L\u00e4nderdaten auflisten, neue hinzuf\u00fcgen, \u00e4ndern und l\u00f6schen.
 PAGE_TITLE_ADMIN_LIST_COUNTRY=L\u00e4nderdaten verwalten
-CONTENT_TITLE_ADMIN_LIST_COUNTRY=L\u00e4nderdaten verwalten:
+CONTENT_TITLE_ADMIN_LIST_COUNTRY=Auflisten von Laenderdaten:
 ADMIN_ADD_COUNTRY_TITLE=Neues Land hinzuf\u00fcgen
 ADMIN_COUNTRY_DATA_MINIMUM_NOTICE=Bitte geben Sie alle Felder an.
 ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE=Der Schl\u00fcssel f\u00fcr das Sprachpaket ist in Grossbuchstaben und Unterstrichen zu schreiben. Beispiel: COUNTRY_GERMANY f\u00fcr Deutschland
@@ -396,7 +396,7 @@ PAGE_TITLE_ADMIN_SHOW_CONTACT=Kontaktdaten anzeigen
 CONTENT_TITLE_ADMIN_SHOW_CONTACT=Kontaktdaten anzeigen:
 PAGE_TITLE_ADMIN_EDIT_CONTACT=Kontaktdaten editieren
 CONTENT_TITLE_ADMIN_EDIT_CONTACT=Kontaktdaten editieren:
-ADMIN_LINK_EDIT_CONTACT=Kontaktdaten editieren
+ADMIN_LINK_EDIT_CONTACT=Editieren von Kontaktdaten.
 ADMIN_LINK_EDIT_CONTACT_TITLE=Hier k\u00f6nnen Sie die Kontaktdaten editieren.
 BUTTON_ADMIN_EDIT_USER=Benutzerdaten \u00e4ndern
 ADMIN_EDIT_USER_TITLE=Benutzerdaten editieren
@@ -404,7 +404,7 @@ ADMIN_DATA_PASSWORD_EDIT_NOTICE=Wenn Sie das Passwort \u00e4ndern wollen, m\u00f
 ADMIN_EDIT_CONTACT_TITLE=Kontaktdaten editieren (Id-Nummer: {0})
 BUTTON_ADMIN_EDIT_CONTACT=Kontaktdaten \u00e4ndern
 PAGE_TITLE_ADMIN_LIST_CONTACT=Kotaktdaten auflisten
-CONTENT_TITLE_ADMIN_LIST_CONTACT=Kontaktdaten auflisten:
+CONTENT_TITLE_ADMIN_LIST_CONTACT=Auflisten von Kontaktdaten:
 PAGE_TITLE_LOGIN_AREA=Benutzerbereich
 ADMIN_SELECT_USER_CONTACT_LEGEND=Kontakt f\u00fcr neues Benutzeraccount ausw\u00e4hlen:
 ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE=W\u00e4hlen Sie entweder einen Kontakt aus, der mit dem neuen Benutzeraccount verkn\u00fcpft werden soll ...
@@ -569,7 +569,7 @@ CONTENT_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren:
 ERROR_BEAN_HELPER_USER_NOT_SET=Fehler: Instanz 'user' im Bean-Helper nicht gesetzt.
 ERROR_BEAN_HELPER_CONTACT_NOT_SET=Fehler: Instanz 'contact' im Bean-Helper nicht gesetzt.
 ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET=Fehler: Instanz 'mobile' in Bean-Helper nicht gesetzt.
-CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=Mobiltelefonnummern auflisten:
+CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=Auflisten von Mobiltelefonnummern:
 ADMIN_LIST_MOBILE_EMPTY=Es sind keine Mobilfunknummern gespeichert.
 ADMIN_MENU_PHONE_NUMBERS_TITLE=Telefonnummern:
 ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS=Handynummern ...
@@ -623,9 +623,9 @@ ADMIN_LINK_LIST_FAX_PHONE_NUMBERS=Faxnummern ...
 ADMIN_LINK_LIST_FAX_PHONE_NUMBERS_TITLE=Listet alle Faxnummern auf.
 ADMIN_LIST_FAX_NUMBER_EMPTY=Es sind keine Faxnummern gelistet.
 PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER=Faxnummern auflisten
-CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER=Faxnummern auflisten:
+CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER=Auflisten von Faxnummern:
 PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER=Festnetznummern auflisten
-CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER=Festnetznummern auflisten:
+CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER=Auflisten von Festnetznummern:
 ADMIN_SHOW_PHONE_NUMBER=Festnetznummer:
 PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER=Festnetznummer anzeigen
 CONTENT_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER=Festnetznummer anzeigen:
@@ -853,9 +853,9 @@ ADMIN_ENTER_DATA_STORE=Etage eingeben:
 ADMIN_ENTER_DATA_SUITE_NUMBER=Appartmentnummer eingeben:
 ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER=Benutzer einer Filiale zuweisen:
 ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE=Kontaktperson der Filiale zuweisen:
-ADMIN_BRANCH_OFFICE_LEGEND=Grunddaten der Filiale:
+ADMIN_BRANCH_OFFICE_DATA_LEGEND=Grunddaten der Filiale:
 #@TODO Please fix German umlauts!
-ADMIN_BRANCH_OFFICE_LEGEND_TITLE=Geben Sie hier die Grunddaten der Filiale ein.
+ADMIN_BRANCH_OFFICE_DATA_LEGEND_TITLE=Geben Sie hier die Grunddaten der Filiale ein.
 ADMIN_ASSIGN_BRANCH_OFFICE_COMPANY=Filiale einem Unternehmen zuweisen:
 PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES=Filialen auflisten
 CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES=Auflisten von Filialen:
@@ -907,7 +907,7 @@ ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE=Editieren der Mobilfunknummer.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_DELETE_FAX_NUMBER_TITLE=Loescht die Faxnummer.
 ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Editieren der Faxnummer.
-ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edieren von Grunddaten des Unternehmens.
+ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Editieren von Grunddaten des Unternehmens.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Loescht Grunddaten des Unternehmens.
 ADMIN_ACTION_LINKS=Aktionen:
@@ -994,3 +994,7 @@ ADMIN_ASSIGNED_BRANCH_OFFICE=Zugewiesene Filiale:
 LABEL_BRANCH_OFFICES=Filialen
 ADMIN_DATE_OF_ISSUE=Ausstellungsdatum:
 ADMIN_PAYMENT_TYPE=Zahlungsmethode:
+ADMIN_LINK_EDIT_BRANCH_OFFICE_TITLE=Editieren von Daten der Filiale.
+ADMIN_LINK_DELETE_BRANCH_OFFICE_TITLE=Loescht die Filiale.
+PAGE_TITLE_ADMIN_LIST_COMPANY_EMPLOYEE=Mitarbeiter auflisten
+CONTENT_TITLE_ADMIN_LIST_COMPANY_EMPLOYEE=Auflisten von Mitarbeitern:
index a744bd2ded90f42493096d07e8db5a3b8b9c1a91..e54b127699a2c20ba33b0ae0aecb37d533ead2ed 100644 (file)
@@ -248,7 +248,7 @@ ADMIN_MENU_COUNTRY_TITLE=Country data
 ADMIN_LINK_LIST_COUNTRIES=List countries
 ADMIN_LINK_LIST_COUNTRIES_TITLE=List existing countries, add new country, edit and delete.
 PAGE_TITLE_ADMIN_LIST_COUNTRY=Manage country data
-CONTENT_TITLE_ADMIN_LIST_COUNTRY=Manage country data:
+CONTENT_TITLE_ADMIN_LIST_COUNTRY=List country data:
 ADMIN_ADD_COUNTRY_TITLE=Add new country
 ADMIN_COUNTRY_DATA_MINIMUM_NOTICE=Please fill out all fields.
 ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE=The key for the language package must be in all upper-case and with underscores. Example: COUNTRY_USA for the U.S.A.
@@ -375,7 +375,7 @@ PAGE_TITLE_ADMIN_SHOW_CONTACT=Show contact data
 CONTENT_TITLE_ADMIN_SHOW_CONTACT=Show contact data:
 PAGE_TITLE_ADMIN_EDIT_CONTACT=Edit contact data
 CONTENT_TITLE_ADMIN_EDIT_CONTACT=Edit contact data:
-ADMIN_LINK_EDIT_CONTACT=Edit contact data
+ADMIN_LINK_EDIT_CONTACT=Edit contact data.
 ADMIN_LINK_EDIT_CONTACT_TITLE=Here you can edit contact data.
 BUTTON_ADMIN_EDIT_USER=Change user data
 ADMIN_EDIT_USER_TITLE=Edit user data
@@ -821,8 +821,8 @@ ADMIN_ENTER_DATA_STORE=Enter store:
 ADMIN_ENTER_DATA_SUITE_NUMBER=Enter suite number:
 ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER=Assign user to branch office:
 ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE=Assign contact person to branch office:
-ADMIN_BRANCH_OFFICE_LEGEND=Branch office basic data:
-ADMIN_BRANCH_OFFICE_LEGEND_TITLE=Enter branch office basic data here.
+ADMIN_BRANCH_OFFICE_DATA_LEGEND=Branch office basic data:
+ADMIN_BRANCH_OFFICE_DATA_LEGEND_TITLE=Enter branch office basic data here.
 ADMIN_ASSIGN_BRANCH_OFFICE_COMPANY=Assign branch office to company:
 PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES=List branch offices
 CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES=List branch offices:
@@ -932,3 +932,7 @@ ADMIN_ASSIGNED_BRANCH_OFFICE=Assigned branch office:
 LABEL_BRANCH_OFFICES=Branch offices
 ADMIN_DATE_OF_ISSUE=Issue date:
 ADMIN_PAYMENT_TYPE=Payment type:
+ADMIN_LINK_EDIT_BRANCH_OFFICE_TITLE=Edit of branch office data.
+ADMIN_LINK_DELETE_BRANCH_OFFICE_TITLE=Deletes branch office.
+PAGE_TITLE_ADMIN_LIST_COMPANY_EMPLOYEE=List employees
+CONTENT_TITLE_ADMIN_LIST_COMPANY_EMPLOYEE=List employees:
index 61e35727f6e990d5542f767e50e78637f69af278..5b9bfee209b7be03a6406b399ae1c34b954d9b7f 100644 (file)
                                <p:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
                                <widgets:outputCountrySelector id="country" value="#{adminContactController.contactCountry}" />
 
-                               <p:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
+                               <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
                                <widgets:inputLandLineNumberPanelGrid targetController="#{adminContactController}" />
 
-                               <p:outputLabel for="faxCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
+                               <p:outputLabel for="faxCountry" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
                                <widgets:inputFaxNumberPanelGrid targetController="#{adminContactController}" />
 
                                <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
index 5b281c78e429be84a7c82ef4e63a9fdb2dfb4bcb..05b17d67c4a023379144049d9339f3c3c624cd07 100644 (file)
                <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
                                <li class="navlink-mini">
-                                       <p:link outcome="admin_show_branch_office" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
+                                       <p:link outcome="admin_show_branch_office" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}">
                                                <f:param name="branchId" value="#{branchOffice.branchId}" />
                                        </p:link>
                                </li>
                        </ui:fragment>
 
                        <li class="navlink-mini">
-                               <p:link outcome="admin_edit_branch_office" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
+                               <p:link outcome="admin_edit_branch_office" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BRANCH_OFFICE_TITLE}">
                                        <f:param name="branchId" value="#{branchOffice.branchId}" />
                                </p:link>
                        </li>
 
                        <li class="navlink-mini">
                                <p:link outcome="admin_delete_branch_office">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE}" />
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BRANCH_OFFICE_TITLE}" />
                                        <f:param name="branchId" value="#{branchOffice.branchId}" />
                                </p:link>
                        </li>
index 913a609b6b1efb1790b75f8eea0be882610970a8..27d2c3dd88def9ab06f7c79171bac232087b6910 100644 (file)
@@ -7,7 +7,7 @@
        xmlns:p="http://primefaces.org/ui">
 
        <p:panelGrid layout="grid" columns="3" rendered="#{empty rendered or rendered == true}">
-               <widgets:outputCountrySelector id="faxCountryCode" styleClass="select divider-right" value="#{targetController.faxCountry}" />
+               <widgets:outputCountrySelector id="faxCountry" styleClass="select divider-right" value="#{targetController.faxCountry}" />
 
                <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
                        <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
index 14dbde0527ba8537796d882ea91642ab7393d358..945493b4a6c3ad47478362316b93fe44faf6b61d 100644 (file)
@@ -7,7 +7,7 @@
        xmlns:p="http://primefaces.org/ui">
 
        <p:panelGrid layout="grid" columns="3" rendered="#{empty rendered or rendered == true}">
-               <widgets:outputCountrySelector id="landLineCountryCode" styleClass="select divider-right" value="#{targetController.landLineCountry}" />
+               <widgets:outputCountrySelector id="landLineCountry" styleClass="select divider-right" value="#{targetController.landLineCountry}" />
 
                <p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
                        <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
index e42352cd4ee925c26d5ef04b0b78ea684d837135..b35960739e5e26bbff612c223a2dba4643e17349 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_FOO}" />
        </ui:define>
 
index 6bbae12b0c89c17e0327ab9967fb8b4fe332e018..e436b93f8177604b7a33138d9cde370892e62da4 100644 (file)
@@ -5,7 +5,11 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
+       </ui:define>
+
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
        </ui:define>
 
index 5844811cb56498860d7be27135ac02e891c98730..8e9942a29bf635b2e3a70cccfb21c5de6b2af0e1 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
        </ui:define>
 
index c21917a5c9c661f7ea4b0e1c0b6cc6ed409dc9fc..8de2f750f02d4cebb79cbcef8a2f76c8bb1138c2 100644 (file)
@@ -5,11 +5,11 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_FOO}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_FOO}" />
        </ui:define>
 
index 81cb7e1ce7a0479498f67cb17404e16e4bfaf36f..ebdd14ecd8816afb1bd9a6ef3e2bb3b3e2e27766 100644 (file)
@@ -8,9 +8,10 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">
+       <ui:define name="document_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_AREA} - " />
-               <ui:insert name="admin_title">
+
+               <ui:insert name="document_admin_title">
                        <h:outputText value="Default admin title" />
                </ui:insert>
        </ui:define>
index 44abe1f085f9c0042103d27c38b76966f421928d..55036f4330ebc379224d1568eb892e7b4fc705c7 100644 (file)
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset">
-                       <legend title="#{msg.ADMIN_BRANCH_OFFICE_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_LEGEND}" />
-                       </legend>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchCompany" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_COMPANY}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu
-                                               id="branchCompany"
-                                               value="#{adminBranchOfficeController.branchCompany}"
-                                               filter="true"
-                                               filterMatchMode="contains"
-                                               required="true"
-                                               requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}"
-                                               >
-                                               <f:converter converterId="BasicCompanyDataConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-                                               <f:selectItems value="#{basicCompanyDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchCompany" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu
-                                               id="branchContactEmployee"
-                                               value="#{adminBranchOfficeController.branchContactEmployee}"
-                                               filter="true"
-                                               filterMatchMode="contains"
-                                               >
-                                               <f:converter converterId="CompanyEmployeeConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchContactEmployee" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu
-                                               id="branchUserOwner"
-                                               value="#{adminBranchOfficeController.branchUserOwner}"
-                                               filter="true"
-                                               filterMatchMode="contains"
-                                               >
-                                               <f:converter converterId="UserConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchUserOwner" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                                               <f:validator validatorId="EmailAddressValidator" />
-                                               <f:attribute name="allowEmptyValue" value="true" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchEmailAddress" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <widgets:outputCountrySelector id="landLineCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.landLineCountry}" />
-
-                                       <p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
-                                               <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-
-                                       <p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.landLineNumber}">
-                                               <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="landLineCountry" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="landLineAreaCode" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="landLineNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <widgets:outputCountrySelector id="faxCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.faxCountry}" />
-
-                                       <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
-                                               <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-
-                                       <p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.faxNumber}">
-                                               <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="faxCountry" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="faxAreaCode" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="faxNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchNumber" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchNumber" size="2" maxlength="10" value="#{adminBranchOfficeController.branchNumber}" />
-                               </div>
-                       </h:panelGroup>
-               </fieldset>
-
-               <fieldset class="fieldset" id="admin_branch_office_address">
-                       <legend title="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}" />
-                       </legend>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchStreet" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
-                                               <f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchHouseNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-                                               <f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchStore" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-                                               <f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchSuiteNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
-                                               <f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchZipCode" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchCity" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <widgets:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeController.branchCountry}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchCountry" />
-                       </h:panelGroup>
-               </fieldset>
-       </h:panelGroup>
+       <!--
+       @TODO: title="#{msg.ADMIN_BRANCH_OFFICE_LEGEND_TITLE}"
+       -->
+       <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_LEGEND}">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+                       <p:outputLabel for="branchCompany" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_COMPANY}" />
+                       <p:selectOneMenu
+                               id="branchCompany"
+                               value="#{adminBranchOfficeController.branchCompany}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               required="true"
+                               requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}"
+                               >
+                               <f:converter converterId="BasicCompanyDataConverter" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
+                               <f:selectItems value="#{basicCompanyDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+                       </p:selectOneMenu>
+
+                       <p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
+                       <p:selectOneMenu
+                               id="branchContactEmployee"
+                               value="#{adminBranchOfficeController.branchContactEmployee}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               >
+                               <f:converter converterId="CompanyEmployeeConverter" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+                       </p:selectOneMenu>
+
+                       <p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER}" />
+                       <p:selectOneMenu
+                               id="branchUserOwner"
+                               value="#{adminBranchOfficeController.branchUserOwner}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               >
+                               <f:converter converterId="UserConverter" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                               <f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
+                       </p:selectOneMenu>
+
+                       <p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
+                       <p:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                               <f:validator validatorId="EmailAddressValidator" />
+                               <f:attribute name="allowEmptyValue" value="true" />
+                       </p:inputText>
+
+                       <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
+                       <widgets:inputLandLineNumberPanelGrid targetController="#{adminBranchOfficeController}" />
+
+                       <p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
+                       <widgets:inputFaxNumberPanelGrid targetController="#{adminBranchOfficeController}" />
+
+                       <p:outputLabel for="branchNumber" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_NUMBER}" />
+                       <p:inputText styleClass="input" id="branchNumber" size="2" maxlength="10" value="#{adminBranchOfficeController.branchNumber}" />
+               </p:panelGrid>
+       </p:fieldset>
+
+       <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+                       <p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
+                       <p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
+
+                       <p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
+                       <p:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
+                               <f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
+                       </p:inputText>
+
+                       <p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
+                       <p:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
+                               <f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
+                       </p:inputText>
+
+                       <p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
+                       <p:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
+                               <f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
+                       </p:inputText>
+
+                       <p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
+                       <p:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
+                               <f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
+                       </p:inputText>
+
+                       <p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
+                       <p:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
+
+                       <p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
+                       <widgets:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeController.branchCountry}" />
+               </p:panelGrid>
+       </p:fieldset>
 </ui:composition>
index 762efd04802bc81f2191fc152a2e59df7de409da..5576e031e96acdf8f70c9f83483908cad74d4e83 100644 (file)
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <p:row>
-               <fieldset class="fieldset">
-                       <legend title="#{msg.ADMIN_COMPANY_EMPLOYEE_GENERAL_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_COMPANY_EMPLOYEE_GENERAL_LEGEND}" />
-                       </legend>
+       <!--
+       @TODO title="#{msg.ADMIN_COMPANY_EMPLOYEE_GENERAL_LEGEND_TITLE}"
+       -->
+       <p:fieldset legend="#{msg.ADMIN_COMPANY_EMPLOYEE_GENERAL_LEGEND}">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+                       <p:outputLabel for="employeeCompany" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_COMPANY}" />
+                       <p:selectOneMenu
+                               id="employeeCompany"
+                               value="#{adminCompanyEmployeeController.employeeCompany}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               required="true"
+                               requiredMessage="#{msg.ADMIN_COMPANY_EMPLOYEE_COMPANY_REQUIRED}"
+                               >
+                               <f:converter converterId="BasicCompanyDataConverter" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
+                               <f:selectItems value="#{basicCompanyDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+                       </p:selectOneMenu>
 
-                       <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
-                               <p:outputLabel for="employeeCompany" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_COMPANY}" />
-                               <p:selectOneMenu
-                                       id="employeeCompany"
-                                       value="#{adminCompanyEmployeeController.employeeCompany}"
-                                       filter="true"
-                                       filterMatchMode="contains"
-                                       required="true"
-                                       requiredMessage="#{msg.ADMIN_COMPANY_EMPLOYEE_COMPANY_REQUIRED}"
-                                       >
-                                       <f:converter converterId="BasicCompanyDataConverter" />
-                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-                                       <f:selectItems value="#{basicCompanyDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
-                               </p:selectOneMenu>
-                               <p:message for="employeeCompany" />
+                       <p:outputLabel for="employeeBranchOffice" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_BRANCH_OFFICE}" />
+                       <p:selectOneMenu
+                               id="employeeBranchOffice"
+                               value="#{adminCompanyEmployeeController.employeeBranchOffice}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               >
+                               <f:converter converterId="BranchOfficeConverter" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
+                               <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+                       </p:selectOneMenu>
 
-                               <p:outputLabel for="employeeBranchOffice" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_BRANCH_OFFICE}" />
-                               <p:selectOneMenu
-                                       id="employeeBranchOffice"
-                                       value="#{adminCompanyEmployeeController.employeeBranchOffice}"
-                                       filter="true"
-                                       filterMatchMode="contains"
-                                       >
-                                       <f:converter converterId="BranchOfficeConverter" />
-                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-                                       <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
-                               </p:selectOneMenu>
-                               <p:message for="employeeBranchOffice" />
+                       <p:outputLabel for="employeePersonalContact" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_PERSONAL_DATA}" />
+                       <p:selectOneMenu
+                               id="employeePersonalContact"
+                               value="#{adminCompanyEmployeeController.employeePersonalContact}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               >
+                               <f:converter converterId="ContactConverter" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                               <f:selectItems value="#{contactController.allContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{beanHelper.renderContact(contact)}" />
+                       </p:selectOneMenu>
 
-                               <p:outputLabel for="employeePersonalContact" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_PERSONAL_DATA}" />
-                               <p:selectOneMenu
-                                       id="employeePersonalContact"
-                                       value="#{adminCompanyEmployeeController.employeePersonalContact}"
-                                       filter="true"
-                                       filterMatchMode="contains"
-                                       >
-                                       <f:converter converterId="ContactConverter" />
-                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                       <f:selectItems value="#{contactController.allContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{beanHelper.renderContact(contact)}" />
-                               </p:selectOneMenu>
-                               <p:message for="employeePersonalContact" />
+                       <p:outputLabel for="employeeUserOwner" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_USER_OWNER}" />
+                       <p:selectOneMenu
+                               id="employeeUserOwner"
+                               value="#{adminCompanyEmployeeController.employeeUserOwner}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               >
+                               <f:converter converterId="UserConverter" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                               <f:selectItems value="#{userController.allUsers()}" var="employeeUserOwner" itemValue="#{employeeUserOwner}" itemLabel="#{employeeUserOwner.userContact.contactFirstName} #{employeeUserOwner.userContact.contactFamilyName} (#{employeeUserOwner.userName})" />
+                       </p:selectOneMenu>
 
-                               <p:outputLabel for="employeeUserOwner" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_USER_OWNER}" />
-                               <p:selectOneMenu
-                                       id="employeeUserOwner"
-                                       value="#{adminCompanyEmployeeController.employeeUserOwner}"
-                                       filter="true"
-                                       filterMatchMode="contains"
-                                       >
-                                       <f:converter converterId="UserConverter" />
-                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                       <f:selectItems value="#{userController.allUsers()}" var="employeeUserOwner" itemValue="#{employeeUserOwner}" itemLabel="#{employeeUserOwner.userContact.contactFirstName} #{employeeUserOwner.userContact.contactFamilyName} (#{employeeUserOwner.userName})" />
-                               </p:selectOneMenu>
-                               <p:message for="employeeUserOwner" />
+                       <p:outputLabel for="employeeEmailAddress" value="#{msg.ADMIN_ENTER_COMPANY_EMPLOYEE_EMAIL_ADDRESS}" />
+                       <p:inputText styleClass="input" id="employeeEmailAddress" size="20" maxlength="255" value="#{adminCompanyEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                               <f:validator validatorId="EmailAddressValidator" />
+                               <f:attribute name="allowEmptyValue" value="true" />
+                       </p:inputText>
 
-                               <p:outputLabel for="employeeEmailAddress" value="#{msg.ADMIN_ENTER_COMPANY_EMPLOYEE_EMAIL_ADDRESS}" />
-                               <p:inputText styleClass="input" id="employeeEmailAddress" size="20" maxlength="255" value="#{adminCompanyEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                                       <f:validator validatorId="EmailAddressValidator" />
-                                       <f:attribute name="allowEmptyValue" value="true" />
-                               </p:inputText>
-                               <p:message for="employeeEmailAddress" />
+                       <p:outputLabel for="employeeStaffNumber" value="#{msg.ADMIN_ENTER_COMPANY_EMPLOYEE_STAFF_NUMBER}" />
+                       <p:inputText styleClass="input" id="employeeStaffNumber" size="2" maxlength="10" value="#{adminCompanyEmployeeController.employeeStaffNumber}" />
+               </p:panelGrid>
+       </p:fieldset>
 
-                               <p:outputLabel for="employeeStaffNumber" value="#{msg.ADMIN_ENTER_COMPANY_EMPLOYEE_STAFF_NUMBER}" />
-                               <p:inputText styleClass="input" id="employeeStaffNumber" size="2" maxlength="10" value="#{adminCompanyEmployeeController.employeeStaffNumber}" />
-                               <p:message for="employeeStaffNumber" />
-                       </p:panelGrid>
-               </fieldset>
-       </p:row>
+       <!--
+       @TODO title="#{msg.ADMIN_COMPANY_EMPLOYEE_OTHER_LEGEND_TITLE}"
+       -->
+       <p:fieldset legend="#{msg.ADMIN_COMPANY_EMPLOYEE_OTHER_LEGEND}">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
+                       <p:outputLabel for="employeePhoneExtension" value="#{msg.ADMIN_ENTER_PHONE_EXTENSION}" />
+                       <p:inputText styleClass="input" id="employeePhoneExtension" size="2" maxlength="10" value="#{adminCompanyEmployeeController.employeePhoneExtension}" />
 
-       <p:row>
-               <fieldset class="fieldset">
-                       <legend title="#{msg.ADMIN_COMPANY_EMPLOYEE_OTHER_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_COMPANY_EMPLOYEE_OTHER_LEGEND}" />
-                       </legend>
+                       <p:outputLabel for="employeeDepartment" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_DEPARTMENT}" />
+                       <p:selectOneMenu
+                               id="employeeDepartment"
+                               value="#{adminCompanyEmployeeController.employeeDepartment}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               >
+                               <f:converter converterId="CompanyDepartmentConverter" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
+                               <f:selectItems value="#{companyDepartmentController.allDepartments()}" var="department" itemValue="#{department}" itemLabel="#{beanHelper.renderDepartment(department)}" />
+                       </p:selectOneMenu>
 
-                       <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
-                               <p:outputLabel for="employeePhoneExtension" value="#{msg.ADMIN_ENTER_PHONE_EXTENSION}" />
-                               <p:inputText styleClass="input" id="employeePhoneExtension" size="2" maxlength="10" value="#{adminCompanyEmployeeController.employeePhoneExtension}" />
-                               <p:message for="employeePhoneExtension" />
+                       <p:outputLabel for="employeeHeadquarters" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_HEADQUARTERS}" />
+                       <p:selectOneMenu
+                               id="employeeHeadquarters"
+                               value="#{adminCompanyEmployeeController.employeeHeadquarters}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               >
+                               <f:converter converterId="CompanyHeadquartersConverter" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
+                               <f:selectItems value="#{companyHeadquartersController.allHeadquarterss()}" var="headquarters" itemValue="#{headquarters}" itemLabel="#{beanHelper.renderHeadquarters(headquarters)}" />
+                       </p:selectOneMenu>
 
-                               <p:outputLabel for="employeeDepartment" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_DEPARTMENT}" />
-                               <p:selectOneMenu
-                                       id="employeeDepartment"
-                                       value="#{adminCompanyEmployeeController.employeeDepartment}"
-                                       filter="true"
-                                       filterMatchMode="contains"
-                                       >
-                                       <f:converter converterId="CompanyDepartmentConverter" />
-                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-                                       <f:selectItems value="#{companyDepartmentController.allDepartments()}" var="department" itemValue="#{department}" itemLabel="#{beanHelper.renderDepartment(department)}" />
-                               </p:selectOneMenu>
-                               <p:message for="employeeDepartment" />
-
-                               <p:outputLabel for="employeeHeadquarters" value="#{msg.ADMIN_ASSIGN_COMPANY_EMPLOYEE_HEADQUARTERS}" />
-                               <p:selectOneMenu
-                                       id="employeeHeadquarters"
-                                       value="#{adminCompanyEmployeeController.employeeHeadquarters}"
-                                       filter="true"
-                                       filterMatchMode="contains"
-                                       >
-                                       <f:converter converterId="CompanyHeadquartersConverter" />
-                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-                                       <f:selectItems value="#{companyHeadquartersController.allHeadquarterss()}" var="headquarters" itemValue="#{headquarters}" itemLabel="#{beanHelper.renderHeadquarters(headquarters)}" />
-                               </p:selectOneMenu>
-                               <p:message for="employeeHeadquarters" />
-
-                               <p:column>
-                                       <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_ENTER_COMPANY_EMPLOYEE_MOBILE_NUMBER}" />
-                               </p:column>
-
-                               <p:column colspan="2">
-                                       <widgets:inputMobileNumberPanelGrid targetController="#{adminCompanyEmployeeController}" />
-                               </p:column>
-                       </p:panelGrid>
-               </fieldset>
-       </p:row>
+                       <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_ENTER_COMPANY_EMPLOYEE_MOBILE_NUMBER}" />
+                       <widgets:inputMobileNumberPanelGrid targetController="#{adminCompanyEmployeeController}" />
+               </p:panelGrid>
+       </p:fieldset>
 </ui:composition>
index 0cafd0a465b91d60b497ab1cc22c1e966bf304c0..186aacdc12bd134cf98a204ad1e7d2a07eda9a5e 100644 (file)
@@ -28,7 +28,7 @@
                        <title>
                                <h:outputText value="#{initParam['project_title']} - " />
 
-                               <ui:insert name="title">
+                               <ui:insert name="document_title">
                                        <h:outputText value="Default document title" />
                                </ui:insert>
                        </title>
@@ -43,7 +43,7 @@
                                                                <h1>
                                                                        <h:outputText value="#{initParam['project_title']} - " />
 
-                                                                       <ui:insert name="title">
+                                                                       <ui:insert name="content_header">
                                                                                <h:outputText value="Default header title" />
                                                                        </ui:insert>
                                                                </h1>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="ui-g-12 ui-md-10 ui-g-nopad" layout="block">
-                                                       <h:panelGroup styleClass="ui-g-12">
-                                                               <h2>
-                                                                       <ui:insert name="content_header">
-                                                                               <h:outputText value="Default content header" />
-                                                                       </ui:insert>
-                                                               </h2>
-                                                       </h:panelGroup>
-
                                                        <h:panelGroup styleClass="ui-g-12 ui-g-nopad">
                                                                <ui:insert name="content">
                                                                        <h:outputText value="Default content" />
index 160774092da8db61f026c2b919790f012f3e034f..a16aa52579e3df8e9751278577165125e514f573 100644 (file)
@@ -5,8 +5,8 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">
-               <ui:insert name="guest_title">
+       <ui:define name="document_title">
+               <ui:insert name="document_guest_title">
                        <h:outputText value="Default guest title" />
                </ui:insert>
        </ui:define>
index 510d485edb80f88fffa01fa9adb0666d884afd10..003c28b15143c72e2688735b1203b4949390b022 100644 (file)
@@ -6,10 +6,10 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">
+       <ui:define name="document_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA} - " />
 
-               <ui:insert name="login_title">
+               <ui:insert name="document_login_title">
                        <h:outputText value="Default login title" />
                </ui:insert>
        </ui:define>
index f4500ba156b65e716a6b2a8e0414979ab21804bf..494270833e29b7ac4e9e9215e5c13bf19206a00a 100644 (file)
@@ -6,7 +6,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
        </ui:define>
 
index 9ae28c2d9423e6de4e9451d1efa96772419508b6..6cc45a2d5290f4e9ff1f571487d5e4873665a264 100644 (file)
@@ -8,7 +8,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA}" />
        </ui:define>
 
index 8ff058ba13e2fabf0bbcb828b60b1b8aba096ce5..f1fb5c354da38534b15857bb6316ac6be87c0341 100644 (file)
@@ -8,7 +8,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES}" />
        </ui:define>
 
@@ -25,7 +25,6 @@
                                tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                               widgetVar="branchOfficeTable"
                                filteredValue="#{branchOfficeController.filteredBranchOffices}"
                                rows="10"
                                reflow="true"
                                >
 
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICES_HEADER}" />
-                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                       <p:columnToggler datasource="table-list-branch-offices" trigger="toggler" />
+                                       <p:row>
+                                               <p:column>
+                                                       <h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICES_HEADER}" />
+                                               </p:column>
+                                               <p:column>
+                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                                       <p:columnToggler datasource="table-list-branch-offices" trigger="toggler" />
+                                               </p:column>
+                                       </p:row>
                                </f:facet>
 
                                <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{branchOffice.branchId}" filterBy="#{branchOffice.branchId}">
 
                                <ui:include src="/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl" />
 
-                               <p:panelGrid columns="2" styleClass="table-footer" layout="block">
+                               <p:panelGrid columns="2" styleClass="table-footer" layout="grid">
                                        <p:commandButton
                                                styleClass="reset divider-right"
                                                type="reset"
index 13dc4a0abdec56a60820c4d9fa788f0720879dad..2be5d7ff0aac0f56b1ef82f4a7286b5fed2ddf07 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
        </ui:define>
 
index f441f10cd586920e120c67e16941409c2693b9d8..11692efc90df7c987b71a63d5c2592ed142b47ce 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
        </ui:define>
 
index 93266aef0cf48278754d6d7f2b7a02a53df6464a..d4fac88e7d77f200c6adffdc1fb020d6d575af94 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
        </ui:define>
 
index 589df6b6bcc978ff1239cab68246b95c1f2fb5ee..6ca9c35761a1c24df95208f11e0515969cc0bda5 100644 (file)
@@ -8,7 +8,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
        </ui:define>
 
index 6e0efd048c4dc1e2388227d2a76159e53006a0e3..4392223208aae4f4d59c468ae64f1cf56fd8af5f 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
        </ui:define>
 
index 4ff90cb06159db4e07ab4ca5138ed4d8ba529145..3a9d7c2a4d7d5ad9b3a3bd7b2f3a8222af94a283 100644 (file)
@@ -16,7 +16,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
        </ui:define>
 
index 9bfdc30e900b72839cbf021a0c2d03091f7b660b..6401f76401ab95b496275ec2541fbfa9aaa3c47d 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
        </ui:define>
 
index e424bcd0d34bfbcfacb62253fe6a4ea1f8e06946..142e660ad7d5f0c9a540d1acbf4bbea4f630941d 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
        </ui:define>
 
index d4acc07a1e323c244ce373e5517c32fc16e1a078..b6e0c25d1e56e8cb2f7f8a0e419ef4793cdeca49 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}" />
        </ui:define>
 
index e1977eca00abb16f018ab4132fa7d3c636f9ad1e..795e272e7ac33704d4bddb326aa744dfc4898553 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}" />
        </ui:define>
 
index bcba909a0d14a68a1600f1a1f4101e6fd95ae682..cf21667f5dcb64579d7a02a8fc2dd2d802f8fbb4 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
        </ui:define>
 
index 98e0f362e7725141d9ba725ff5b3e77c67441704..0c7368a5e69a473743d7a7a98f44f22b6520257d 100644 (file)
@@ -8,7 +8,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COMPANY_EMPLOYEE}" />
        </ui:define>
 
index 9999e6debe52dc8199075abb662a6279fcbba92e..3155f28e99f7b733348c13bdf1b0e3924949209d 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
        </ui:define>
 
index b8788529bc8b5caa282b0eb7fa2ba286ecc2dd9d..cc54be0edeb2a0558bdf1e4465a541eb862fe629 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
        </ui:define>
 
index 325e20c30353fbdf2f9e1bbf04b8fff1a6fa9269..dfde39efdc509526899147f08fb9d41b3f8db243 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
        </ui:define>
 
index 1d5407b961c1d2a2f0c0070145dfd55efba09438..f863e94cd841108593542d7671adb0eb50b126a1 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
        </ui:define>
 
index 55ae806681345a3220d2e29dbb5a6600f1c367a1..1dbb4db726c97efe0e02fe06fe77c2852f2d61a4 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_WELCOME}" />
        </ui:define>
 
index df6cfa44dc1fd5426214a08a8f10d11e81210ce0..0dd8b0cd0d88cedf1dc1fd126d315663aa52d9fb 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
        </ui:define>
 
index 02d2fbb1e604ca824dbe5a50e98159a1ae6251aa..e940b2333011ef05dc7959589195cd1c1245c1f4 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
        </ui:define>
 
index c93a80a00b4c8c0c2e961eff95e95e8cdefb588a..09b9fd6b0efbd6e1b552d1e150b89354841b2f5c 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
        </ui:define>
 
index 052f450b48e2ea9d97e0e684b632801fde1cdba8..834857e90539996562f5615d15b797f28ffad61d 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
        </ui:define>
 
index 5d02a85d642ea94a08493281b6f5430a3e6a0992..7220f222a854a8e6098d7afbbb5c7d886eb4c321 100644 (file)
@@ -6,7 +6,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
        </ui:define>
 
index fbf12d958a04373e16a915555e2a4c5b90ff78e2..934ecdd7762553beb0c0a8f02dbe19bf8408e036 100644 (file)
@@ -12,7 +12,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
        </ui:define>
 
index c1226824deff3c6f52448429c8882ff9f8c31f28..16ac074d1fa6bbc0bd52ca5f7cfe3fe80c47595c 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
        </ui:define>
 
index 78541334fd8005aa63ef46cc73050540b7e9e706..6566ed63c5c01c1bc35f2f6d471b5b502e5c5493 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
        </ui:define>
 
index 26d03a54bfd9d5ae77ee607f3aabfa9be1f19e1d..a364b76b35eb162205bac4499ff20be239f14c66 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
        </ui:define>
 
index 68e532e17169786e7253e95c5801cf7759b257a7..8d3a78458d6af1c40988d5b2fb31fffbd32e1541 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
        </ui:define>
 
index 9758398ba064e81d5b52458d6930898ca2325ef6..c79d8f37357df391f02a85c4bbd0c32fd1d3617d 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
        </ui:define>
 
index 0ccf412418bfec0890847ce89ac7769ef30596e1..2e1250196e256fa4b9fd406944cb7b7d88c099a2 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
        </ui:define>
 
index 4be14da150f8f6ad33425017e304fd7808eb2218..ead7f7780ee8d659d80c6d5946e7fe9dbe4c1e3c 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
        </ui:define>
 
index c4733e30c429368f142762261a87b8358a28b984..8ab17cab9f158a279700486b9da4c70c6f411b1a 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
        </ui:define>
 
index 877ab54276b52c1dba1c841ff558f54f124db2fb..e4e1a512049687b1981e338ff3894f9a4e671ed8 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
        </ui:define>
 
index 133e5be267813d449c376981f47136c4db99ac30..6362f63668de159fe9a7687a5c0851b1703b7648 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
        </ui:define>
 
index eb4217926dfd05e3dfb7c19e43f419e5ea6caa80..da2ca724dc3d29a69fe2e81676816f3324711a8a 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
        </ui:define>
 
index 7f4221b36abf12a86647e9cfcb3b29e93f26c908..338ed0afc020645dd6e37aee86dff7d36b43d345 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
        </ui:define>
 
index 4f86b237cbc9f98c453241d51a2193072885c5a3..ec9b05a39504574640185a974b0d141c1cba2081 100644 (file)
@@ -8,7 +8,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
        </ui:define>
 
index 0c60f75796e70164c668021be954e669384dff62..ca05f2229d53e28eb4504b29ecb8dbb022ff3c31 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
        </ui:define>
 
index 503cb3a86d8b5e244a52b3475f725b6d86ec6b18..70bc155a996c7dbb3918b8cb94799bc41059403b 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK}" />
        </ui:define>
 
index b29b13532e00c45ad4b7223cd7774c961378d0c9..7875b4572a4797510648051245bc1165bfc6dc70 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
        </ui:define>
 
index b796c34813acd267c7fd271000f645ae86b7e47b..b4c39a4987f7dfdf939895658695e4cbb2c20454 100644 (file)
@@ -14,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
        </ui:define>
 
index bdd0c2308a71beea76af206bce71efd5666ac361..4b2f57d03813aed3780134813501846c725bda5f 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
        </ui:define>
 
index 2582c34965a47bc4a219fac60cdbac6ca10e4701..25602df1f983a40a16965f1081e7ec8572d49bc4 100644 (file)
@@ -13,7 +13,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
        </ui:define>
 
index 2848da6229edf99de49346ab332184e1cf872631..6007a75514f3ba7a3873a1d85e41b37b7c665031 100644 (file)
@@ -8,7 +8,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
        </ui:define>
 
index 586f65e62e7abadd52e3599362ec731cea8969da..2696ed3f45192018768e0aae258b39b83d2da0b1 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
        </ui:define>
 
index a181a29a13f2135beb6cdc3af75d90f1e64a57b7..25eaeb728fc173e9ec43894f961a00483b543553 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
        </ui:define>
 
index ef4cd227e41dd4f6bfcb766d7bbb46d403250af6..09b933b8ecf8d6649a15ec6d9739626fd8f7b412 100644 (file)
@@ -4,7 +4,8 @@
                                xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+                               xmlns:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
 
        <ui:define name="metadata">
                <f:metadata>
                </f:metadata>
        </ui:define>
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
        </ui:define>
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_USER_PROFILE}" />
        </ui:define>
 
                        <widgets:outputMessageBox id="error-user-profile-hidden" message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
 
                        <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
-                               <div align="center">
-                                       <p:panelGrid styleClass="table" headerClass="table-header" footerClass="table-footer">
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
-                                               </f:facet>
-                                               <!-- @TODO Unfinished -->
-                                       </p:panelGrid>
-                               </div>
+                               <p:panelGrid styleClass="table table-full">
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
+                                       </f:facet>
+                                       <!-- @TODO Unfinished -->
+                               </p:panelGrid>
                        </ui:fragment>
                </ui:fragment>
        </ui:define>
index 7364c6ab712ebe11996b26b40ed552a3f3f4db8d..9297195a325ff1a075a22bfa4af4f85eac85002b 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
        </ui:define>
 
index fc43fc132d08c40cd829c012546d216d6b2cb4d3..5d6e39fa197ceea5d0dda37469c467ca604401dc 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
        </ui:define>
 
index f8bf7a6be15c493ad80c9fcaca3ab9efdb390703..5036fa4e2d95866e24a526b9f1cc4eba5ba710ed 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
        </ui:define>
 
index a0f18d0ff0ede68e9157db1fa40305d96ead8892..863fdd54fc4024efd6b9812622dbfc04449e803e 100644 (file)
@@ -6,7 +6,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
        </ui:define>
 
index 69f7ae529830d2b8127959efbd8ad657b38bfad4..0ea6f187053f5e1b4ca0cd5876cb21df9dd0d983 100644 (file)
@@ -7,7 +7,7 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
        </ui:define>
 
index 203101401b49ca41186027c121ec584c667a55cf..fa3b32bf78688da2d9659e86d06ae3b4b31d08fa 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
        </ui:define>
 
index 130236ee5ce8c4fd5fe1f7119b2e5fce18d03d44..e123ece41b9920acd7d4a4b5f0d7546c3d3f9d68 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
        </ui:define>
 
index d0430b030d456d31892b3903fcf048fea72bd609..9190029fccd4c95363c22ce803bf536c32eb1366 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
        </ui:define>
 
index a96747428b3a0a9575953116759ea20e03ee9652..e44286f8c2c6e2dc43ebe7fd743b3d0237a4c330 100644 (file)
@@ -262,10 +262,6 @@ ul.navbar-horizontal li.footer-copyright {
        border-bottom-left-radius: 8px;
 }
 
-.fieldset {
-       padding: 5px;
-}
-
 #menu-content-wrapper {
        overflow: auto;
 }
index 7263f4ae296ee30e9fd5d585f2b26d2cca3f7789..52f6cd3dfcf7be2443d6a2c31e3157eda0db6b57 100644 (file)
@@ -5,7 +5,7 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
        </ui:define>
 
index 0ce16dad16861a7ba90436b870c55965eedc954b..d924c2754be506439dff0764edb3aa0a726be4b3 100644 (file)
@@ -7,11 +7,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
index 7af8f136ccc8652b89826bff2e7dc6d3a7415cc2..95c9bf78670c28760f8d8a62c86900fa8eb33a72 100644 (file)
@@ -6,11 +6,11 @@
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_DATA_SAVED}" />
        </ui:define>
 
index 658794c685ea3d0a12bc414895efb8d494d456ba..74eea351eea386d7fe6c2caacecdf67657e75045 100644 (file)
@@ -6,11 +6,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}" />
        </ui:define>
 
index 63f89090a2ee540e8390f8de15fea87d08fad659..3ace4854aa39c506a5407e333947ed9874a9d6ef 100644 (file)
@@ -6,11 +6,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_HOME}" />
        </ui:define>
 
index d0eee5cb63d3b9abe9e1d69ff9dd56160ab949dd..24b4cd59efc96045f644fec10d13f5f5d0cd2893 100644 (file)
@@ -6,11 +6,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT}" />
        </ui:define>
 
index 6a75ad0c1a0b7515b1d88146e427dd2f14f8a149..6455414e1bfa4ef34a6486d81748041e57fc862b 100644 (file)
@@ -7,11 +7,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
        </ui:define>
 
index 44a3fd1a1c526d14930af8d43d795c018b9c5cf7..b5b03ba6b09d6012031f8a43930a1b85fb275a7d 100644 (file)
@@ -7,11 +7,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD}" />
        </ui:define>
 
index 8688b94940a5cf1405111d24ef7eef4448fc9f14..62dc3ce82b26878819bd6e18d154bdaa3100b87e 100644 (file)
@@ -7,11 +7,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
        </ui:define>
 
index ab88c830476999c5e0bb8679e82128a6731cb3fe..1ff50157901d86a50018a7d6f6049a9853391cda 100644 (file)
@@ -7,11 +7,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
index 531068f43ee0119bca66a1052d0e22c561cbee5a..fe3b016072c92f82031f100b69b3d85fd18a89c2 100644 (file)
@@ -7,11 +7,11 @@
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
                                xmlns:p="http://primefaces.org/ui">
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}" />
        </ui:define>