From: Roland Häder Date: Fri, 30 Mar 2018 17:42:20 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1f1f4cd5bf05c3395b0e1a1f0a208f120cf418ef;p=jfinancials-war.git Please cherry-pick: - on a p:dataTable it is recommneded (to avoid JavaScript errors) to have both id and widgetVar named the same - changed general font size to 0.8em Signed-off-by: Roland Häder --- diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml index db857280..66b62555 100644 --- a/web/admin/basic_data/admin_basic_data_list.xhtml +++ b/web/admin/basic_data/admin_basic_data_list.xhtml @@ -19,13 +19,13 @@ - + @@ -173,7 +173,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}" action="#{adminBasicCompanyDataController.addBusinessBasicData()}" - update=":master:form-list-basic-company-data:table-list-basic-company-data" + update=":master:form-list-basic-company-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 5c7d4bc4..58a045dc 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/branch_office/admin_branch_office_list.xhtml @@ -19,7 +19,7 @@ - + @@ -89,7 +89,7 @@ title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}" > - + @@ -172,7 +172,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}" action="#{adminBranchOfficeController.addBranchOffice()}" - update=":master:form-list-branch-offices:table-list-branch-offices" + update=":master:form-list-branch-offices:branchOfficeList" /> @@ -182,7 +182,7 @@ diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 23a8c17d..76e2b39d 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -19,7 +19,7 @@ diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index 3b7aff02..fff0ddc2 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -18,7 +18,7 @@ diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml index 612e2966..d42e6ff6 100644 --- a/web/admin/department/admin_department_list.xhtml +++ b/web/admin/department/admin_department_list.xhtml @@ -19,7 +19,7 @@ - + @@ -68,7 +68,7 @@ title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}" > - + @@ -191,7 +191,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_DEPARTMENT_DATA}" action="#{adminDepartmentController.addDepartment()}" - update=":master:form-list-department:table-list-department" + update=":master:form-list-department:departmentList" /> diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml index d8317bbb..3d3bf3c6 100644 --- a/web/admin/employee/admin_employee_list.xhtml +++ b/web/admin/employee/admin_employee_list.xhtml @@ -19,7 +19,7 @@ - + @@ -113,7 +113,7 @@ title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}" > - + @@ -167,7 +167,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_EMPLOYEE}" action="#{adminEmployeeController.addEmployee()}" - update=":master:form-list-company-employees:table-list-company-employees" + update=":master:form-list-company-employees:employeeList" /> diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml index 7aaf81c1..2efe6c15 100644 --- a/web/admin/headquarter/admin_headquarter_list.xhtml +++ b/web/admin/headquarter/admin_headquarter_list.xhtml @@ -18,7 +18,7 @@ - + @@ -149,7 +149,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER}" action="#{adminHeadquarterController.addHeadquarter()}" - update=":master:form-list-Headquarter:table-list-Headquarter" + update=":master:form-list-Headquarter:headquarterList" /> @@ -159,7 +159,7 @@ diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml index d1c6fef2..41d969e8 100644 --- a/web/admin/mobile/admin_mobile_list.xhtml +++ b/web/admin/mobile/admin_mobile_list.xhtml @@ -17,7 +17,7 @@ - + @@ -112,7 +112,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" - update=":master:form-list-mobile-provider:table-list-mobile-provider" + update=":master: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 420f0c60..b396bfec 100644 --- a/web/admin/opening_time/admin_opening_time_list.xhtml +++ b/web/admin/opening_time/admin_opening_time_list.xhtml @@ -19,7 +19,7 @@ - + @@ -130,7 +130,7 @@ type="submit" value="#{msg.BUTTON_ADMIN_ADD_OPENING_TIME}" action="#{adminOpeningTimeController.addOpeningTime()}" - update=":master:form-list-opening-time:table-list-opening-time" + update=":master:form-list-opening-time:openingTimeList" /> diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 1f8eb8ff..eab3af07 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -19,7 +19,7 @@ - + @@ -195,7 +195,7 @@ id="submit_add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" - update=":master:form-list-users:table-list-users" + update=":master:form-list-users:userList" /> diff --git a/web/resources/css/custom.css b/web/resources/css/custom.css index 0c03ee1a..ab78985e 100644 --- a/web/resources/css/custom.css +++ b/web/resources/css/custom.css @@ -1,6 +1,6 @@ body { background-color: white; - font-size: 12px; + font-size: 14px; font-family: sans-serif; color: black; margin: 0px;