From: Roland Häder Date: Sun, 1 Oct 2017 16:11:22 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c869f18177c92c69e42f960015f680a5614e15e;p=jfinancials-war.git Please cherry-pick: - no more "title" but "document_title" now - also "document__title" which is for the 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> --- diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index a00c7add..ce24a105 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -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: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index a744bd2d..e54b1276 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -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: diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl index 61e35727..5b9bfee2 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl @@ -48,10 +48,10 @@ <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}" /> diff --git a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl index 5b281c78..05b17d67 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl @@ -10,21 +10,21 @@ <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> diff --git a/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl index 913a609b..27d2c3dd 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl @@ -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" /> diff --git a/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl index 14dbde05..945493b4 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl @@ -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" /> diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml index e42352cd..b3596073 100644 --- a/web/WEB-INF/templates.dist/admin_page.xhtml +++ b/web/WEB-INF/templates.dist/admin_page.xhtml @@ -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> diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml index 6bbae12b..e436b93f 100644 --- a/web/WEB-INF/templates.dist/guest_login_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml @@ -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> diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml index 5844811c..8e9942a2 100644 --- a/web/WEB-INF/templates.dist/guest_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_page.xhtml @@ -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> diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index c21917a5..8de2f750 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -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> diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl index 81cb7e1c..ebdd14ec 100644 --- a/web/WEB-INF/templates/admin/admin_base.tpl +++ b/web/WEB-INF/templates/admin/admin_base.tpl @@ -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> diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl index 44abe1f0..55036f43 100644 --- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl +++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl @@ -7,281 +7,96 @@ 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> diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl index 762efd04..5576e031 100644 --- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl +++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl @@ -7,126 +7,106 @@ 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> diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index 0cafd0a4..186aacdc 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -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> @@ -43,7 +43,7 @@

- +

@@ -64,14 +64,6 @@ - -

- - - -

- - diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index 16077409..a16aa525 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -5,8 +5,8 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://xmlns.jcp.org/jsf/html"> - - + + diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl index 510d485e..003c28b1 100644 --- a/web/WEB-INF/templates/login/user/user_base.tpl +++ b/web/WEB-INF/templates/login/user/user_base.tpl @@ -6,10 +6,10 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://xmlns.jcp.org/jsf/html"> - + - + diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index f4500ba1..49427083 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -6,7 +6,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml index 9ae28c2d..6cc45a2d 100644 --- a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml +++ b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml index 8ff058ba..f1fb5c35 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/branch_office/admin_branch_office_list.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + @@ -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" @@ -38,9 +37,15 @@ > - - - + + + + + + + + + @@ -143,7 +148,7 @@ - + - + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index f441f10c..11692efc 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index 93266aef..d4fac88e 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 589df6b6..6ca9c357 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index 6e0efd04..43922232 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml index 4ff90cb0..3a9d7c2a 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -16,7 +16,7 @@ - + diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml index 9bfdc30e..6401f764 100644 --- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml index e424bcd0..142e660a 100644 --- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml index d4acc07a..b6e0c25d 100644 --- a/web/admin/country/admin_country_delete.xhtml +++ b/web/admin/country/admin_country_delete.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml index e1977eca..795e272e 100644 --- a/web/admin/country/admin_country_edit.xhtml +++ b/web/admin/country/admin_country_edit.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index bcba909a..cf21667f 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml index 98e0f362..0c7368a5 100644 --- a/web/admin/employee/admin_employee_list.xhtml +++ b/web/admin/employee/admin_employee_list.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml index 9999e6de..3155f28e 100644 --- a/web/admin/fax/admin_fax_delete.xhtml +++ b/web/admin/fax/admin_fax_delete.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index b8788529..cc54be0e 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml index 325e20c3..dfde39ef 100644 --- a/web/admin/fax/admin_fax_list.xhtml +++ b/web/admin/fax/admin_fax_list.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index 1d5407b9..f863e94c 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml index 55ae8066..1dbb4db7 100644 --- a/web/admin/index.xhtml +++ b/web/admin/index.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml index df6cfa44..0dd8b0cd 100644 --- a/web/admin/landline/admin_landline_delete.xhtml +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index 02d2fbb1..e940b233 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml index c93a80a0..09b9fd6b 100644 --- a/web/admin/landline/admin_landline_list.xhtml +++ b/web/admin/landline/admin_landline_list.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml index 052f450b..834857e9 100644 --- a/web/admin/landline/admin_landline_show.xhtml +++ b/web/admin/landline/admin_landline_show.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml index 5d02a85d..7220f222 100644 --- a/web/admin/mobile/admin_contact_mobile_list.xhtml +++ b/web/admin/mobile/admin_contact_mobile_list.xhtml @@ -6,7 +6,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml index fbf12d95..934ecdd7 100644 --- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml +++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml @@ -12,7 +12,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index c1226824..16ac074d 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index 78541334..6566ed63 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml index 26d03a54..a364b76b 100644 --- a/web/admin/mobile/admin_mobile_list.xhtml +++ b/web/admin/mobile/admin_mobile_list.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index 68e532e1..8d3a7845 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml index 9758398b..c79d8f37 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml index 0ccf4124..2e125019 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index 4be14da1..ead7f778 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml index c4733e30..8ab17cab 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml index 877ab542..e4e1a512 100644 --- a/web/admin/user/admin_user_activity_log.xhtml +++ b/web/admin/user/admin_user_activity_log.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml index 133e5be2..6362f636 100644 --- a/web/admin/user/admin_user_delete.xhtml +++ b/web/admin/user/admin_user_delete.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index eb421792..da2ca724 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index 7f4221b3..338ed0af 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 4f86b237..ec9b05a3 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index 0c60f757..ca05f222 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml index 503cb3a8..70bc155a 100644 --- a/web/admin/user/admin_user_resend_confirmation_link.xhtml +++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index b29b1353..7875b457 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index b796c348..b4c39a49 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/exception.xhtml b/web/exception.xhtml index bdd0c230..4b2f57d0 100644 --- a/web/exception.xhtml +++ b/web/exception.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml index 2582c349..25602df1 100644 --- a/web/guest/user/user_confirm_account.xhtml +++ b/web/guest/user/user_confirm_account.xhtml @@ -13,7 +13,7 @@ - + diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index 2848da62..6007a755 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -8,7 +8,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml index 586f65e6..2696ed3f 100644 --- a/web/guest/user/user_login.xhtml +++ b/web/guest/user/user_login.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml index a181a29a..25eaeb72 100644 --- a/web/guest/user/user_lost_password.xhtml +++ b/web/guest/user/user_lost_password.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index ef4cd227..09b933b8 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -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"> @@ -13,11 +14,11 @@ - + - + @@ -34,14 +35,12 @@ -
- - - - - - -
+ + + + + + diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml index 7364c6ab..9297195a 100644 --- a/web/guest/user/user_register.xhtml +++ b/web/guest/user/user_register.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml index fc43fc13..5d6e39fa 100644 --- a/web/guest/user/user_register_done.xhtml +++ b/web/guest/user/user_register_done.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml index f8bf7a6b..5036fa4e 100644 --- a/web/guest/user/user_register_page2.xhtml +++ b/web/guest/user/user_register_page2.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml index a0f18d0f..863fdd54 100644 --- a/web/guest/user/user_resend_done.xhtml +++ b/web/guest/user/user_resend_done.xhtml @@ -6,7 +6,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml index 69f7ae52..0ea6f187 100644 --- a/web/guest/user/user_resend_link.xhtml +++ b/web/guest/user/user_resend_link.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + diff --git a/web/imprint.xhtml b/web/imprint.xhtml index 20310140..fa3b32bf 100644 --- a/web/imprint.xhtml +++ b/web/imprint.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/index.xhtml b/web/index.xhtml index 130236ee..e123ece4 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/privacy.xhtml b/web/privacy.xhtml index d0430b03..9190029f 100644 --- a/web/privacy.xhtml +++ b/web/privacy.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/resources/css/custom.css b/web/resources/css/custom.css index a9674742..e44286f8 100644 --- a/web/resources/css/custom.css +++ b/web/resources/css/custom.css @@ -262,10 +262,6 @@ ul.navbar-horizontal li.footer-copyright { border-bottom-left-radius: 8px; } -.fieldset { - padding: 5px; -} - #menu-content-wrapper { overflow: auto; } diff --git a/web/terms.xhtml b/web/terms.xhtml index 7263f4ae..52f6cd3d 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index 0ce16dad..d924c275 100644 --- a/web/user/login_contact_data_saved.xhtml +++ b/web/user/login_contact_data_saved.xhtml @@ -7,11 +7,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + - + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index 7af8f136..95c9bf78 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -6,11 +6,11 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + - + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index 658794c6..74eea351 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -6,11 +6,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + - + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index 63f89090..3ace4854 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -6,11 +6,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + - + diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml index d0eee5cb..24b4cd59 100644 --- a/web/user/login_logout.xhtml +++ b/web/user/login_logout.xhtml @@ -6,11 +6,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + - + diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml index 6a75ad0c..6455414e 100644 --- a/web/user/login_user_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -7,11 +7,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + - + diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index 44a3fd1a..b5b03ba6 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -7,11 +7,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + - + diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml index 8688b949..62dc3ce8 100644 --- a/web/user/login_user_change_personal_data.xhtml +++ b/web/user/login_user_change_personal_data.xhtml @@ -7,11 +7,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + - + diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml index ab88c830..1ff50157 100644 --- a/web/user/login_user_contact_data_saved.xhtml +++ b/web/user/login_user_contact_data_saved.xhtml @@ -7,11 +7,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + - + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index 531068f4..fe3b0160 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -7,11 +7,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:p="http://primefaces.org/ui"> - + - +