Don't cherry-pick:

- converted admin_receipt_list view into proper way (now working and more
  responsive)
- renamed i18n string
- removed divider-right CSS class
- added ui-noborder CSS class where needed

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index b6d57db4ef8e8dfc277c8e7b8c794545a0a42956..e456b70354c331c1cb9fbbdd56277f5162dfad6d 100644 (file)
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -41,7 +41,7 @@ PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Kassenbons auflisten
 CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Listet Kassenbons auf:
 TABLE_SUMMARY_ADMIN_LIST_FINANCIAL_RECEIPTS=Diese Tabelle listet bereits registrierte Kassenbons auf.
 #@TODO Please fix German umlauts!
-ADMIN_FINANCIAL_RECEIPT_LIST_EMPTY=Es befinden sich keine Kassenbons in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
+ADMIN_EMPTY_LIST_FINANCIAL_RECEIPT=Es befinden sich keine Kassenbons in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
 #@TODO Please fix German umlauts!
 ADMIN_ADD_FINANCIAL_RECEIPT_TITLE=Neuen Kassenbon hinzufuegen
 #@TODO Please fix German umlauts!

diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index b262f73381df00b6d223316c1332ef4d210dd541..d4aa072cd55c236c10262eafdcde491f8544622b 100644 (file)
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -31,7 +31,7 @@ LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUE_DATE_TITLE=Please enter or select here the e
 PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=List receipts
 CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Lists receipts:
 TABLE_SUMMARY_ADMIN_LIST_FINANCIAL_RECEIPTS=This table lists already registered receipts.
-ADMIN_FINANCIAL_RECEIPT_LIST_EMPTY=There are no receipts in database. Or your search criteria doesn't match anything.
+ADMIN_EMPTY_LIST_FINANCIAL_RECEIPT=There are no receipts in database. Or your search criteria doesn't match anything.
 ADMIN_ADD_FINANCIAL_RECEIPT_TITLE=Add new receipt
 BUTTON_ADMIN_ADD_FINANCIAL_RECEIPT=Add receipt
 ADMIN_FINANCIAL_RECEIPT_ISSUE_DATE_REQUIRED=Please enter date of issue of receipt.

diff --git a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
index 2e003413079dc430e77904fcd09209f4893c4e1e..9e7b4340904996cdec520559049af73c0023c863 100644 (file)
--- a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
@@ -83,7 +83,7 @@
                <!--
                @TODO: title="#{project.ADMIN_FINANCIAL_RECEIPT_OTHER_LEGEND_TITLE}">
                -->
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="receiptNumber" value="#{project.ENTER_FINANCIAL_RECEIPT_NUMBER}" />
                        <p:inputText styleClass="input" id="receiptNumber" size="10" maxlength="20" value="#{adminReceiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
                                <f:validateLongRange minimum="1" maximum="9999999999" />

diff --git a/web/admin/financials/receipts/admin_receipt_list.xhtml b/web/admin/financials/receipts/admin_receipt_list.xhtml
index 4dc92c482f3ea3d5fafa6fe60405e155f354f81b..b2a54a24bfde8e10517fefed9a199fbeeb4d98a6 100644 (file)
--- a/web/admin/financials/receipts/admin_receipt_list.xhtml
+++ b/web/admin/financials/receipts/admin_receipt_list.xhtml
@@ -33,19 +33,18 @@
                                rowsPerPageTemplate="5,10,20,50,100"
                                sortMode="multiple"
                                summary="#{project.TABLE_SUMMARY_ADMIN_LIST_FINANCIAL_RECEIPTS}"
-                               emptyMessage="#{project.ADMIN_FINANCIAL_RECEIPT_LIST_EMPTY}"
+                               emptyMessage="#{project.ADMIN_EMPTY_LIST_FINANCIAL_RECEIPT}"
                                widgetVar="receiptList"
                                >
                                <f:facet name="header">
-                                       <p:row>
-                                               <p:column>
-                                                       <h:outputText value="#{project.ADMIN_LIST_FINANCIAL_RECEIPTS_HEADER}" />
-                                               </p:column>
-                                               <p:column>
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10, ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                               <h:outputText value="#{project.ADMIN_LIST_FINANCIAL_RECEIPTS_HEADER}" />
+
+                                               <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
                                                        <p:columnToggler datasource="table-list-financial-receipt" trigger="toggler" />
-                                               </p:column>
-                                       </p:row>
+                                               </h:panelGroup>
+                                       </p:panelGrid >
                                </f:facet>
 
                                <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{receipt.receiptId}" filterBy="#{receipt.receiptId}">
@@ -167,7 +166,7 @@
 
                                <p:panelGrid columns="2" styleClass="table-footer" layout="grid">
                                        <p:commandButton
-                                               styleClass="reset divider-right"
+                                               styleClass="reset"
                                                type="reset"
                                                value="#{msg.BUTTON_RESET_FORM}"
                                                />

diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml
index 793699db8b8ab3242dfa6d5347d4b590f515eb00..610d67331de184294b9d41c6bb14b221674fb7e7 100644 (file)
--- a/web/user/financials/login_financials_add_income.xhtml
+++ b/web/user/financials/login_financials_add_income.xhtml
@@ -66,7 +66,7 @@
                                </h:panelGroup>
 
                                <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                        <p:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialIncomeController.addIncome()}" value="#{project.BUTTON_LOGIN_FINANCIAL_ADD_INCOME}" />
                                </div>

diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml
index e08d73854aa8258b6170da2a14c081704e5a12d5..e60a27af42d5fdadc1b2bc25aeaf36c27b0fc337 100644 (file)
--- a/web/user/financials/login_financials_add_receipt.xhtml
+++ b/web/user/financials/login_financials_add_receipt.xhtml
@@ -26,7 +26,7 @@
                                </p:column>
 
                                <f:facet name="footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <p:commandButton styleClass="submit" type="submit" id="submit_add_financial_receipt" value="#{project.BUTTON_LOGIN_ADD_FINANCIAL_RECEIPT}" action="#{receiptController.addReceipt()}" />
                                </f:facet>
                        </p:panelGrid>