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 <roland@mxchange.org>

diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml
index db8572808feb0fb47c049853326f5f45f5eff4b1..66b62555f810dbf3554f66381ab5fdcf7573af4f 100644 (file)
--- a/web/admin/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/basic_data/admin_basic_data_list.xhtml
@@ -19,13 +19,13 @@
        <ui:define name="content">
                <h:form id="form-list-basic-company-data">
                        <p:dataTable
-                               id="table-list-basic-company-data"
+                               id="basicDataList"
                                var="basicData"
-                               value="#{basicCompanyDataController.allBasicData()}"
+                               value="#{basicDataListController.allBasicData}"
                                tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                               filteredValue="#{basicCompanyDataController.filteredBasicCompanyData}"
+                               filteredValue="#{basicDataListController.filteredBasicData}"
                                rows="10"
                                reflow="true"
                                resizableColumns="true"
@@ -42,7 +42,7 @@
 
                                                <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-basic-company-data" trigger="toggler" />
+                                                       <p:columnToggler datasource="basicDataList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
                                </f:facet>
@@ -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"
                                                        />
                                        </p:panelGrid>
                                </f:facet>

diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index 5c7d4bc43f5fadf526ff9a3fb4a0ccf95a5a0877..58a045dce068d499a7bddc209270c20747121274 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -19,7 +19,7 @@
        <ui:define name="content">
                <h:form id="form-list-branch-offices">
                        <p:dataTable
-                               id="table-list-branch-offices"
+                               id="branchOfficeList"
                                var="branchOffice"
                                value="#{branchOfficeController.allBranchOffices()}"
                                tableStyleClass="table table-full"
@@ -42,7 +42,7 @@
 
                                                <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-branch-offices" trigger="toggler" />
+                                                       <p:columnToggler datasource="branchOfficeList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
                                </f:facet>
@@ -89,7 +89,7 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
                                                        >
                                                        <f:converter converterId="BasicCompanyDataConverter" />
-                                                       <f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+                                                       <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -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"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
@@ -182,7 +182,7 @@
                <h:form id="form-list-branch-opening-time">
                        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIMES_LEGEND}">
                                <p:dataTable
-                                       id="table-list-branch-opening-time"
+                                       id="branchOpeningTimeList"
                                        var="openingTime"
                                        value="#{adminBranchOfficeController.branchOpeningTimes}"
                                        tableStyleClass="table table-full"
@@ -245,7 +245,7 @@
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME}"
                                                        action="#{adminBranchOfficeController.addOpeningTime()}"
-                                                       update=":master:form-list-branch-opening-time:table-list-branch-opening-time"
+                                                       update=":master:form-list-branch-opening-time:branchOpeningTimeList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 23a8c17d7d6d3e4de6b5495ba4f6b2570f726f60..76e2b39dbc44d8a2aa9a978c8e94ee80cff03d72 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -19,7 +19,7 @@
        <ui:define name="content">
                <h:form id="form-list-contacts">
                        <p:dataTable
-                               id="table-list-contacts"
+                               id="contactList"
                                var="contact"
                                value="#{contactController.allContacts()}"
                                tableStyleClass="table table-full"
@@ -112,7 +112,7 @@
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_ADD_CONTACT}"
                                                action="#{adminContactController.addContact()}"
-                                               update=":master:form-list-contacts:table-list-contacts"
+                                               update=":master:form-list-contacts:contactList"
                                                />
                                </f:facet>
                        </p:panelGrid>

diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 3b7aff02f4e0d5411229e9d9bb9c5cbb9aa8268e..fff0ddc2d95bdbc180c0d3f7d0a1ad4aff745c57 100644 (file)
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -18,7 +18,7 @@
        <ui:define name="content">
                <h:form id="form-list-countries">
                        <p:dataTable
-                               id="table-list-countries"
+                               id="countryList"
                                var="country"
                                value="#{countryController.allCountries()}"
                                tableStyleClass="table table-full"
@@ -91,7 +91,7 @@
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}"
                                                action="#{adminCountryController.addCountry()}"
-                                               update=":master:form-list-countries:table-list-countries"
+                                               update=":master:form-list-countries:countryList"
                                                />
                                </div>
                        </h:panelGroup>

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index 612e2966a6141d0069c1e0a26d2b0365e830824d..d42e6ff69168d3653af92f578a77c2669887d402 100644 (file)
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -19,7 +19,7 @@
        <ui:define name="content">
                <h:form id="form-list-department">
                        <p:dataTable
-                               id="table-list-department"
+                               id="departmentList"
                                var="department"
                                value="#{departmentController.allDepartments()}"
                                tableStyleClass="table table-full"
@@ -42,7 +42,7 @@
 
                                                <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-department" trigger="toggler" />
+                                                       <p:columnToggler datasource="departmentList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
                                </f:facet>
@@ -68,7 +68,7 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
                                                        >
                                                        <f:converter converterId="BasicCompanyDataConverter" />
-                                                       <f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+                                                       <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -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"
                                                        />
                                        </p:panelGrid>
                                </f:facet>

diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index d8317bbb0312b8e555056f09a0c1496e2742eaac..3d3bf3c66642c0483fa465d97d2c2545d81b2861 100644 (file)
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -19,7 +19,7 @@
        <ui:define name="content">
                <h:form id="form-list-company-employees">
                        <p:dataTable
-                               id="table-list-company-employees"
+                               id="employeeList"
                                var="employee"
                                value="#{employeeController.allEmployees()}"
                                filteredValue="#{employeeController.filteredEmployees}"
@@ -42,7 +42,7 @@
 
                                                <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-company-employees" trigger="toggler" />
+                                                       <p:columnToggler datasource="employeeList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
                                </f:facet>
@@ -113,7 +113,7 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
                                                        >
                                                        <f:converter converterId="BasicCompanyDataConverter" />
-                                                       <f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+                                                       <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -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"
                                                        />
                                        </p:panelGrid>
                                </f:facet>

diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index 7aaf81c1b22b315d7cee73ecf3f291dcb2f88c6b..2efe6c1543d7a053e9a545bbcdd343aab7996bb5 100644 (file)
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -18,7 +18,7 @@
        <ui:define name="content">
                <h:form id="form-list-Headquarter">
                        <p:dataTable
-                               id="table-list-Headquarter"
+                               id="headquarterList"
                                var="headquarter"
                                value="#{headquarterController.allHeadquarter()}"
                                tableStyleClass="table table-full"
@@ -41,7 +41,7 @@
 
                                                <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-Headquarter" trigger="toggler" />
+                                                       <p:columnToggler datasource="headquarterList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
                                </f:facet>
@@ -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"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
@@ -159,7 +159,7 @@
                <h:form id="form-list-headquarter-opening-time">
                        <p:fieldset legend="#{msg.ADMIN_HEADQUARTER_OPENING_TIMES_LEGEND}">
                                <p:dataTable
-                                       id="table-list-headquarter-opening-time"
+                                       id="headquarterOpeningTimeList"
                                        var="openingTime"
                                        value="#{adminHeadquarterController.headquarterOpeningTimes}"
                                        tableStyleClass="table table-full"
@@ -222,7 +222,7 @@
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME}"
                                                        action="#{adminHeadquarterController.addOpeningTime()}"
-                                                       update=":master:form-list-headquarter-opening-time:table-list-headquarter-opening-time"
+                                                       update=":master:form-list-headquarter-opening-time:headquarterOpeningTimeList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>

diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index d1c6fef232942a646fbce0b1c362c7c3fcf18346..41d969e84f86fd05aa06626fecc2308b6f2d3f22 100644 (file)
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -17,7 +17,7 @@
 
        <ui:define name="content">
                <p:dataTable
-                       id="table-list-mobile-provider"
+                       id="mobileNumberList"
                        var="mobileNumber"
                        value="#{phoneController.allMobileNumbers()}"
                        tableStyleClass="table table-full"

diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 89752965501976b6adbd5405faae915c5165c9b0..1fabd811018d6e940e98f051db309d3d07b00c4d 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -18,7 +18,7 @@
        <ui:define name="content">
                <h:form id="form-list-mobile-provider">
                        <p:dataTable
-                               id="table-list-mobile-provider"
+                               id="mobileProviderList"
                                var="mobileProvider"
                                value="#{mobileProviderController.allMobileProviders()}"
                                tableStyleClass="table table-full"
@@ -40,7 +40,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDERS_HEADER}" />
 
                                                <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                               <p:columnToggler datasource="table-list-mobile-provider" trigger="toggler" />
+                                               <p:columnToggler datasource="mobileProviderList" trigger="toggler" />
                                        </p:panelGrid>
                                </f:facet>
 
@@ -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"
                                                />
                                </div>
                        </h:panelGroup>

diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml
index 420f0c6099d5899c46574ae37d1657db77b02a20..b396bfecfff7aab9cd91c339d223b4c13af1e56e 100644 (file)
--- a/web/admin/opening_time/admin_opening_time_list.xhtml
+++ b/web/admin/opening_time/admin_opening_time_list.xhtml
@@ -19,7 +19,7 @@
        <ui:define name="content">
                <h:form id="form-list-opening-time">
                        <p:dataTable
-                               id="table-list-opening-time"
+                               id="openingTimeList"
                                var="openingTime"
                                value="#{openingTimeController.allOpeningTimes()}"
                                tableStyleClass="table table-full"
@@ -42,7 +42,7 @@
 
                                                <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-opening-time" trigger="toggler" />
+                                                       <p:columnToggler datasource="openingTimeList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
                                </f:facet>
@@ -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"
                                                        />
                                        </p:panelGrid>
                                </f:facet>

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 1f8eb8ff0a112ae870f2e7f3d5834bcd29ffceb0..eab3af0762706696b24ab9022d3f01d99697fedb 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -19,7 +19,7 @@
        <ui:define name="content">
                <h:form id="form-list-users">
                        <p:dataTable
-                               id="table-list-users"
+                               id="userList"
                                var="user"
                                value="#{userController.allUsers()}"
                                tableStyleClass="table table-full"
@@ -41,7 +41,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_USERS_HEADER}" />
 
                                                <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                               <p:columnToggler datasource="table-list-users" trigger="toggler" />
+                                               <p:columnToggler datasource="userList" trigger="toggler" />
                                        </p:panelGrid>
                                </f:facet>
 
@@ -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"
                                                        />
                                        </p:panelGrid>
                                </f:facet>

diff --git a/web/resources/css/custom.css b/web/resources/css/custom.css
index 0c03ee1aa56836162984bd0fdebc301c9c932629..ab78985e70c9054bb49ca71b756dd45fbd57df63 100644 (file)
--- 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;