Don't cherry-pick:

- added title attribute to PrimeFaces tag for receipt issue date

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 0a205e181a63294e0487ac69021a16116e204274..a1202f4d6af623bedf56f746aa0697163d2c4e69 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -807,3 +807,4 @@ ERROR_USER_PASSWORD_REPEAT_EMPTY=Sie muessen das eingegebene Passwort wiederhole
 GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_ALLOWED=Lassen Sie beide Passwortfelder leer, wird Ihnen ein Passwort per Zufall generiert.
 #@TODO Please fix German umlauts!
 GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED=Sie muessen selbst ein Passwort vergeben. Bitte geben Sie dies zur Bestaetigung zweimal ein.
+LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUED_TITLE=Geben oder suchen Sie hier das genaue Datum aus, wann die Rechnung/der Kassenbon erstellt wurde. Dadurch kann ein genauer Zeitverlauf generiert werden.

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index b57c0e5d70390501da52c38205fffd448af142ab..cd04d31048d5d146267d84ba4d3d509ebc3501e0 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -790,3 +790,4 @@ ERROR_USER_PASSWORD_EMPTY=You have to enter a password.
 ERROR_USER_PASSWORD_REPEAT_EMPTY=You have to repeat the entered password.
 GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_ALLOWED=If you left both password fields empty, a random password will generated for you.
 GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED=You have to enter an own password. Please enter it twice for confirmation.
+LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUED_TITLE=Please enter or select here the exact date when the receipt has been issue. Then an exact time-line can be generated.

diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml
index a81cd7f8ba3e5fb224d66505500efa9eb45b6983..48114f3d1055c5bce07eebd5f10dca40097bf13a 100644 (file)
--- a/web/user/financials/login_financials_add_income.xhtml
+++ b/web/user/financials/login_financials_add_income.xhtml
@@ -22,7 +22,7 @@
                                                <h:outputText value="#{msg.LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE}" />
                                        </div>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left_medium">
                                                        <h:outputLabel for="incomeTitle" value="#{msg.LOGIN_FINANCIAL_INCOME_TITLE}" />
                                                </div>
@@ -34,9 +34,9 @@
                                                </div>
 
                                                <div class="clear"></div>
-                                       </div>
+                                       </h:panelGroup>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left_medium">
                                                        <h:outputLabel for="incomeInterval" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
                                                </div>
@@ -49,9 +49,9 @@
                                                </div>
 
                                                <div class="clear"></div>
-                                       </div>
+                                       </h:panelGroup>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left_medium">
                                                        <h:outputLabel for="incomeSingleValue" value="#{msg.LOGIN_FINANCIAL_INCOME_SINGLE_VALUE}" />
                                                </div>
@@ -63,7 +63,7 @@
                                                </div>
 
                                                <div class="clear"></div>
-                                       </div>
+                                       </h:panelGroup>
 
                                        <div class="table_footer">
                                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />

diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml
index 341259fc1143b19757756c1ea340866d57ae800c..97d5482281833d31daab98451db848cf0ed62089 100644 (file)
--- a/web/user/financials/login_financials_add_receipt.xhtml
+++ b/web/user/financials/login_financials_add_receipt.xhtml
@@ -23,7 +23,7 @@
                                                <h:outputText value="#{msg.LOGIN_FINANCIAL_ADD_RECEIPT_FORM_TITLE}" />
                                        </div>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left_medium">
                                                        <h:outputLabel for="receiptCompany" value="#{msg.LOGIN_FINANCIAL_SELECT_RECEIPT_COMPANY}" />
                                                </div>
@@ -38,19 +38,19 @@
                                                <div class="clear"></div>
                                        </div>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left_medium">
                                                        <h:outputLabel for="receiptIssued" value="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_CREATED}" />
                                                </div>
 
                                                <div class="table_right_medium">
-                                                       <p:calendar id="receiptIssued" locale="#{localizationController.locale.displayCountry}" value="#{financialReceiptController.receiptIssued}" />
+                                                       <p:calendar id="receiptIssued" title="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUED_TITLE}" locale="#{localizationController.locale.displayCountry}" value="#{financialReceiptController.receiptIssued}" />
                                                </div>
 
                                                <div class="clear"></div>
                                        </div>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left_medium">
                                                        <h:outputLabel for="receiptNumber" value="#{msg.LOGIN_FINANCIAL_RECEIPT_NUMBER}" />
                                                </div>
@@ -64,13 +64,13 @@
                                                <div class="clear"></div>
                                        </div>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <h:outputText value="#{msg.LOGIN_FINANCIAL_COMPANY_NOT_FOUND}" />
                                                <h:outputText value="&nbsp;" />
                                                <h:link title="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY_TITLE}" outcome="login_add_receipt_company" value="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY}" />
                                        </div>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left_medium">
                                                        <h:outputLabel for="paymentType" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
                                                </div>