Don't cherry-pick:

- renamed CSS classes

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

diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml
index a61b00c5f7f421fc5cd58c0102f83c2b67c1579c..50712a6b471a83b1d7843139aea47aab328b4535 100644 (file)
--- a/web/user/financials/login_financials_add_income.xhtml
+++ b/web/user/financials/login_financials_add_income.xhtml
@@ -15,50 +15,50 @@
 
        <ui:define name="content">
                <h:form id="form_add_financials_income">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE}" />
                                </div>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="incomeTitle" value="#{msg.LOGIN_FINANCIAL_INCOME_TITLE}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:inputText styleClass="input" id="incomeTitle" size="2" maxlength="10" value="#{financialIncomeController.incomeTitle}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_TITLE_REQUIRED}">
                                                        <f:validator validatorId="IncomeTitleValidator" />
                                                </h:inputText>
                                        </div>
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="incomeInterval" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:selectOneMenu styleClass="select" id="incomeInterval" value="#{financialIncomeController.incomeInterval}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
-                                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
+                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
                                                        <f:selectItems value="#{financialIncomeController.allIncomeIntervals()}" var="incomeInterval" itemValue="#{incomeInterval}" itemLabel="#{msg[incomeInterval.concat('_INTERVAL')]}" />
                                                </h:selectOneMenu>
                                        </div>
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="incomeSingleValue" value="#{msg.LOGIN_FINANCIAL_INCOME_SINGLE_VALUE}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:inputText styleClass="input" id="incomeSingleValue" size="5" maxlength="20" value="#{financialIncomeController.incomeSingleAmount}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED}">
                                                        <f:validator validatorId="CurrencyAmountValidator" />
                                                </h:inputText>
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                        <h:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialIncomeController.addIncome()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
                                </div>

diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml
index a7f118fec99fab496a0098fcea3259ba078b1d85..24d14ab521ced2435e441031dc08bb8fae21e8e9 100644 (file)
--- a/web/user/financials/login_financials_add_receipt.xhtml
+++ b/web/user/financials/login_financials_add_receipt.xhtml
@@ -16,66 +16,66 @@
 
        <ui:define name="content">
                <h:form id="form_add_financials_receipt">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.LOGIN_FINANCIAL_ADD_RECEIPT_FORM_TITLE}" />
                                </div>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="receiptCompany" value="#{msg.LOGIN_FINANCIAL_SELECT_RECEIPT_COMPANY}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:selectOneMenu styleClass="select" id="receiptCompany" value="#{financialReceiptController.receiptCompany}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_RECEIPT_COMPANY_REQUIRED}" converter="BusinessContactConverter">
-                                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
+                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
                                                        <f:selectItems value="#{companyDataController.allCompanyBasicData()}" var="receiptCompany" itemValue="#{receiptCompany}" itemLabel="#{receiptCompany.companyName}" />
                                                </h:selectOneMenu>
                                        </div>
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <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">
+                                       <div class="table-right-medium">
                                                <p:calendar id="receiptIssued" title="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUED_TITLE}" locale="#{localizationController.locale.displayCountry}" value="#{financialReceiptController.receiptIssued}" />
                                        </div>
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="receiptNumber" value="#{msg.LOGIN_FINANCIAL_RECEIPT_NUMBER}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:inputText styleClass="input" id="receiptNumber" size="2" maxlength="10" value="#{financialReceiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
                                                        <f:validateLongRange minimum="1" maximum="20" />
                                                </h:inputText>
                                        </div>
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
+                               <h:panelGroup styleClass="table-row" layout="block">
                                        <h:outputText value="#{msg.LOGIN_FINANCIAL_COMPANY_NOT_FOUND} " />
                                        <h:link title="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY_TITLE}" outcome="login_add_receipt_company" value="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY}" />
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="paymentType" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:selectOneMenu styleClass="select" id="paymentType" value="#{financialReceiptController.paymentType}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
-                                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
+                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
                                                        <f:selectItems value="#{financialReceiptController.allPaymentTypes()}" var="paymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType]}" />
                                                </h:selectOneMenu>
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                        <h:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialReceiptController.addReceipt()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
                                </div>