From e9edb18cd080687b07c2200d1770899ab86105d8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 29 Jul 2017 02:06:18 +0200
Subject: [PATCH] Don't cherry-pick: - also have here moved to proper way
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland HÃ¤der <roland@mxchange.org>
---
 .../login_financials_add_income.xhtml         | 123 +++++++-------
 .../login_financials_add_receipt.xhtml        | 153 +++++++++---------
 .../login_financials_overview.xhtml           | 125 +++++++-------
 3 files changed, 196 insertions(+), 205 deletions(-)
diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml
index 48114f3d..44293553 100644
--- a/web/user/financials/login_financials_add_income.xhtml
+++ b/web/user/financials/login_financials_add_income.xhtml
@@ -1,77 +1,74 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	  lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	  xmlns:ui="http://java.sun.com/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+				xmlns="http://www.w3.org/1999/xhtml"
+				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:h="http://xmlns.jcp.org/jsf/html"
+				xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">
-			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
-		</ui:define>
+	<ui:define name="login_title">
+		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
+	</ui:define>
 
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.SUB_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
-		</ui:define>
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.SUB_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
+	</ui:define>
 
-		<ui:define name="content">
-			<h:form id="form_add_financials_income">
-				<h:panelGroup styleClass="table_medium" layout="block">
-					<div class="table_header">
-						<h:outputText value="#{msg.LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE}" />
-					</div>
+	<ui:define name="content">
+		<h:form id="form_add_financials_income">
+			<h:panelGroup styleClass="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:outputLabel for="incomeTitle" value="#{msg.LOGIN_FINANCIAL_INCOME_TITLE}" />
-						</div>
+				<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">
-							<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>
+					<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>
 
-						<div class="clear"></div>
-					</h:panelGroup>
+					<div class="clear"></div>
+				</h:panelGroup>
 
-					<h:panelGroup styleClass="table_row" layout="block">
-						<div class="table_left_medium">
-							<h:outputLabel for="incomeInterval" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
-						</div>
+				<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">
-							<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:selectItems value="#{financialIncomeController.allIncomeIntervals()}" var="incomeInterval" itemValue="#{incomeInterval}" itemLabel="#{msg[incomeInterval.concat('_INTERVAL')]}" />
-							</h:selectOneMenu>
-						</div>
+					<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:selectItems value="#{financialIncomeController.allIncomeIntervals()}" var="incomeInterval" itemValue="#{incomeInterval}" itemLabel="#{msg[incomeInterval.concat('_INTERVAL')]}" />
+						</h:selectOneMenu>
+					</div>
 
-						<div class="clear"></div>
-					</h:panelGroup>
+					<div class="clear"></div>
+				</h:panelGroup>
 
-					<h:panelGroup styleClass="table_row" layout="block">
-						<div class="table_left_medium">
-							<h:outputLabel for="incomeSingleValue" value="#{msg.LOGIN_FINANCIAL_INCOME_SINGLE_VALUE}" />
-						</div>
+				<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">
-							<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>
+					<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>
 
-						<div class="clear"></div>
-					</h:panelGroup>
+					<div class="clear"></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 right_space" 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>
-				</h:panelGroup>
-			</h:form>
-		</ui:define>
-	</ui:composition>
-</html>
+					<h:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialIncomeController.addIncome()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
+				</div>
+			</h:panelGroup>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml
index 02631959..4822df8e 100644
--- a/web/user/financials/login_financials_add_receipt.xhtml
+++ b/web/user/financials/login_financials_add_receipt.xhtml
@@ -1,97 +1,94 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	  lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	  xmlns:ui="http://java.sun.com/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  xmlns:p="http://primefaces.org/ui">
-	>
-
-	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">
-			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.SUB_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT}" />
-		</ui:define>
-
-		<ui:define name="content">
-			<h:form id="form_add_financials_receipt">
-				<h:panelGroup styleClass="table_medium" layout="block">
-					<div class="table_header">
-						<h:outputText value="#{msg.LOGIN_FINANCIAL_ADD_RECEIPT_FORM_TITLE}" />
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+				xmlns="http://www.w3.org/1999/xhtml"
+				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:h="http://xmlns.jcp.org/jsf/html"
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
+
+	<ui:define name="login_title">
+		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.SUB_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form id="form_add_financials_receipt">
+			<h:panelGroup styleClass="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:outputLabel for="receiptCompany" value="#{msg.LOGIN_FINANCIAL_SELECT_RECEIPT_COMPANY}" />
 					</div>
 
-					<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">
-							<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:selectItems value="#{businessDataController.allRegisteredCompanies()}" var="receiptCompany" itemValue="#{receiptCompany}" itemLabel="#{receiptCompany.basicBusinessData.companyName}" />
-							</h:selectOneMenu>
-						</div>
-
-						<div class="clear"></div>
+					<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:selectItems value="#{businessDataController.allRegisteredCompanies()}" var="receiptCompany" itemValue="#{receiptCompany}" itemLabel="#{receiptCompany.basicBusinessData.companyName}" />
+						</h:selectOneMenu>
 					</div>
 
-					<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" title="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUED_TITLE}" locale="#{localizationController.locale.displayCountry}" value="#{financialReceiptController.receiptIssued}" />
-						</div>
+					<div class="clear"></div>
+				</h:panelGroup>
 
-						<div class="clear"></div>
+				<h:panelGroup styleClass="table_row" layout="block">
+					<div class="table_left_medium">
+						<h:outputLabel for="receiptIssued" value="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_CREATED}" />
 					</div>
 
-					<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">
+						<p:calendar id="receiptIssued" title="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUED_TITLE}" locale="#{localizationController.locale.displayCountry}" value="#{financialReceiptController.receiptIssued}" />
+					</div>
 
-						<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>
+					<div class="clear"></div>
+				</h:panelGroup>
 
-						<div class="clear"></div>
+				<h:panelGroup styleClass="table_row" layout="block">
+					<div class="table_left_medium">
+						<h:outputLabel for="receiptNumber" value="#{msg.LOGIN_FINANCIAL_RECEIPT_NUMBER}" />
 					</div>
 
-					<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 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 styleClass="table_row" layout="block">
-						<div class="table_left_medium">
-							<h:outputLabel for="paymentType" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
-						</div>
+					<div class="clear"></div>
+				</h:panelGroup>
 
-						<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:selectItems value="#{financialReceiptController.allPaymentTypes()}" var="paymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType]}" />
-							</h:selectOneMenu>
-						</div>
+				<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}" />
+				</h:panelGroup>
 
-						<div class="clear"></div>
+				<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_footer">
-						<h:commandButton styleClass="reset right_space" 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 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:selectItems value="#{financialReceiptController.allPaymentTypes()}" var="paymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType]}" />
+						</h:selectOneMenu>
 					</div>
+
+					<div class="clear"></div>
 				</h:panelGroup>
-			</h:form>
-		</ui:define>
-	</ui:composition>
-</html>
+
+				<div class="table_footer">
+					<h:commandButton styleClass="reset right_space" 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>
+			</h:panelGroup>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/user/financials/login_financials_overview.xhtml b/web/user/financials/login_financials_overview.xhtml
index 15aaec65..91a9aa6a 100644
--- a/web/user/financials/login_financials_overview.xhtml
+++ b/web/user/financials/login_financials_overview.xhtml
@@ -1,64 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	  lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-	  xmlns:ui="http://java.sun.com/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">
-			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.SUB_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
-		</ui:define>
-
-		<ui:define name="content">
-			<h:panelGroup layout="block" styleClass="para">
-				<h:panelGrid columns="4">
-					<f:facet name="header">
-						<h:outputText value="#{msg.GENERAL_FINANCIAL_OVERVIEW}" />
-					</f:facet>
-
-					<h:column>
-						<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_RECEIPTS}" />
-
-						<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_receipts" value="#{financialIncomeController.receipts.size()}" />
-					</h:column>
-
-					<h:column>
-						<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_OTHER_EXPENSES}" />
-
-						<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_other_expenses" value="#{financialIncomeController.otherExpenses.size()}" />
-					</h:column>
-
-					<h:column>
-						<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_INCOME}" />
-
-						<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_income" value="#{financialIncomeController.income.size()}" />
-					</h:column>
-				</h:panelGrid>
-			</h:panelGroup>
-
-			<h:panelGroup layout="block" styleClass="para">
-				<h:outputText value="#{msg.USER_FINANCIALS_NEXT_ACTIONS}" />
-
-				<ul>
-					<li>
-						<h:link  title="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT_TITLE}" outcome="add_user_fiancial_receipt" value="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT}" />
-					</li>
-
-					<li>
-						<h:link  title="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES_TITLE}" outcome="add_user_fiancial_other_expenses" value="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES}" />
-					</li>
-
-					<li>
-						<h:link  title="#{msg.LINK_USER_FINANCIAL_ADD_INCOME_TITLE}" outcome="add_user_fiancial_income" value="#{msg.LINK_USER_FINANCIAL_ADD_INCOME}" />
-					</li>
-				</ul>
-			</h:panelGroup>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+				xmlns="http://www.w3.org/1999/xhtml"
+				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:h="http://xmlns.jcp.org/jsf/html"
+				xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+	<ui:define name="login_title">
+		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.SUB_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:panelGroup layout="block" styleClass="para">
+			<h:panelGrid columns="4">
+				<f:facet name="header">
+					<h:outputText value="#{msg.GENERAL_FINANCIAL_OVERVIEW}" />
+				</f:facet>
+
+				<h:column>
+					<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_RECEIPTS}" />
+
+					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_receipts" value="#{financialIncomeController.receipts.size()}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_OTHER_EXPENSES}" />
+
+					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_other_expenses" value="#{financialIncomeController.otherExpenses.size()}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_INCOME}" />
+
+					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_income" value="#{financialIncomeController.income.size()}" />
+				</h:column>
+			</h:panelGrid>
+		</h:panelGroup>
+
+		<h:panelGroup layout="block" styleClass="para">
+			<h:outputText value="#{msg.USER_FINANCIALS_NEXT_ACTIONS}" />
+
+			<ul>
+				<li>
+					<h:link  title="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT_TITLE}" outcome="add_user_fiancial_receipt" value="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT}" />
+				</li>
+
+				<li>
+					<h:link  title="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES_TITLE}" outcome="add_user_fiancial_other_expenses" value="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES}" />
+				</li>
+
+				<li>
+					<h:link  title="#{msg.LINK_USER_FINANCIAL_ADD_INCOME_TITLE}" outcome="add_user_fiancial_income" value="#{msg.LINK_USER_FINANCIAL_ADD_INCOME}" />
+				</li>
+			</ul>
+		</h:panelGroup>
+	</ui:define>
+</ui:composition>
-- 
2.39.5

