From 9070ac6a63aebee29a779a9c2a72694d9b2a3f92 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 10 Apr 2020 06:05:27 +0200 Subject: [PATCH] Please cherry-pick: - upgraded PrimeFaces to 8.0 - there is no more pm:x available in latest PrimeFaces, so ":master:foo:bar" doesn't work but "foo:bar" does - also the language selector may work now? MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...LICENSE.txt => primefaces-8.0_LICENSE.txt} | 0 web/WEB-INF/templates/admin/admin_footer.tpl | 21 ++- web/WEB-INF/templates/master.tpl | 149 +++++++++--------- .../widgets/locale_change_widget.tpl | 9 +- .../basic_data/admin_basic_data_list.xhtml | 4 +- .../admin_branch_office_list.xhtml | 6 +- web/admin/contact/admin_contact_list.xhtml | 4 +- web/admin/country/admin_country_list.xhtml | 4 +- .../department/admin_department_list.xhtml | 4 +- web/admin/employee/admin_employee_list.xhtml | 2 +- .../headquarter/admin_headquarter_list.xhtml | 6 +- .../admin_mobile_provider_list.xhtml | 2 +- .../admin_opening_time_list.xhtml | 2 +- web/admin/user/admin_user_list.xhtml | 2 +- 14 files changed, 106 insertions(+), 109 deletions(-) rename lib/primefaces/{primefaces-6.2_LICENSE.txt => primefaces-8.0_LICENSE.txt} (100%) diff --git a/lib/primefaces/primefaces-6.2_LICENSE.txt b/lib/primefaces/primefaces-8.0_LICENSE.txt similarity index 100% rename from lib/primefaces/primefaces-6.2_LICENSE.txt rename to lib/primefaces/primefaces-8.0_LICENSE.txt diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl index 13b195c0..3ec61fd8 100644 --- a/web/WEB-INF/templates/admin/admin_footer.tpl +++ b/web/WEB-INF/templates/admin/admin_footer.tpl @@ -1,19 +1,18 @@ + > - -
    -
    • -
- + + + + + diff --git a/web/WEB-INF/templates/master.tpl b/web/WEB-INF/templates/master.tpl index 0f8ebc58..9575f146 100644 --- a/web/WEB-INF/templates/master.tpl +++ b/web/WEB-INF/templates/master.tpl @@ -5,7 +5,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:p="http://primefaces.org/ui" - xmlns:pm="http://primefaces.org/mobile" > - - - - - - -

- - - - - -

- - - - - - - + + + + +

+ + + + + +

+ - - - + + + + + - - - - - - + + - - - - - - - + + + + + + - - - + + + + - - - - - - - - - -
- - -
- -
- - -
- -
- -
- - + + + + - + + + + + + + + + + +
+ + +
+ +
+ + +
+ +
+ +
+ + + + diff --git a/web/WEB-INF/templates/widgets/locale_change_widget.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl index f02b18a2..f9ca568d 100644 --- a/web/WEB-INF/templates/widgets/locale_change_widget.tpl +++ b/web/WEB-INF/templates/widgets/locale_change_widget.tpl @@ -11,9 +11,11 @@ - - - + diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml index dc05e52a..7eca15cf 100644 --- a/web/admin/basic_data/admin_basic_data_list.xhtml +++ b/web/admin/basic_data/admin_basic_data_list.xhtml @@ -84,7 +84,7 @@ @@ -344,7 +344,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}" action="#{adminBasicCompanyDataController.addBusinessBasicData()}" - update=":master:form-list-basic-data:basicDataList" + update="form-list-basic-data:basicDataList" /> diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml index bbcb0893..c3a94b05 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/branch_office/admin_branch_office_list.xhtml @@ -85,7 +85,7 @@ @@ -464,7 +464,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}" action="#{adminBranchOfficeController.addBranchOffice()}" - update=":master:form-list-branch-offices:branchOfficeList" + update="form-list-branch-offices:branchOfficeList" oncomplete="PF('branchOfficeList').filter()" /> @@ -512,7 +512,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME}" action="#{adminBranchOfficeController.addOpeningTime()}" - update=":master:form-list-branch-opening-time:branchOpeningTimeList" + update="form-list-branch-opening-time:branchOpeningTimeList" oncomplete="" /> diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index f7c2d4ed..83bfb78f 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -85,7 +85,7 @@ @@ -235,7 +235,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" - update=":master:form-list-contacts:contactList" + update="form-list-contacts:contactList" /> diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index eb34ffc2..8f1e91cc 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -84,7 +84,7 @@ @@ -241,7 +241,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" - update=":master:form-list-countries:countryList" + update="form-list-countries:countryList" /> diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml index 70dcbde4..f149368e 100644 --- a/web/admin/department/admin_department_list.xhtml +++ b/web/admin/department/admin_department_list.xhtml @@ -84,7 +84,7 @@ @@ -354,7 +354,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_DEPARTMENT_DATA}" action="#{adminDepartmentController.addDepartment()}" - update=":master:form-list-departments:departmentList" + update="form-list-departments:departmentList" /> diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml index c3aef03f..79f47bac 100644 --- a/web/admin/employee/admin_employee_list.xhtml +++ b/web/admin/employee/admin_employee_list.xhtml @@ -262,7 +262,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_EMPLOYEE}" action="#{adminEmployeeController.addEmployee()}" - update=":master:form-list-company-employees:employeeList" + update="form-list-company-employees:employeeList" /> diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml index 32d08e85..a31f77d2 100644 --- a/web/admin/headquarter/admin_headquarter_list.xhtml +++ b/web/admin/headquarter/admin_headquarter_list.xhtml @@ -84,7 +84,7 @@ @@ -290,7 +290,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER}" action="#{adminHeadquarterController.addHeadquarter()}" - update=":master:form-list-headquarters:headquarterList" + update="form-list-headquarters:headquarterList" /> @@ -371,7 +371,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME}" action="#{adminHeadquarterController.addOpeningTime()}" - update=":master:form-list-headquarter-opening-time:headquarterOpeningTimeList" + update="form-list-headquarter-opening-time:headquarterOpeningTimeList" /> diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index f56d61dc..8487edd6 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -147,7 +147,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" - update=":master:form-list-mobile-provider:mobileProviderList" + update="form-list-mobile-provider:mobileProviderList" /> diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml index 2e88e35c..21f9d6d1 100644 --- a/web/admin/opening_time/admin_opening_time_list.xhtml +++ b/web/admin/opening_time/admin_opening_time_list.xhtml @@ -179,7 +179,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_OPENING_TIME}" action="#{adminOpeningTimeController.addOpeningTime()}" - update=":master:form-list-opening-time:openingTimeList" + update="form-list-opening-time:openingTimeList" /> diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index f99488b0..71a39725 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -262,7 +262,7 @@ id="submit_add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" - update=":master:form-list-users:userList" + update="form-list-users:userList" /> -- 2.39.5