From 3d060825916b05291528becf901537e1d95290e1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 29 Sep 2017 23:42:20 +0200
Subject: [PATCH] Don't cherry-pick: - cleared receipt backing bean after the
 receipt has been successfull added   and event has been triggered - rewrote
 more towards PrimeFaces to have (more but not fully) responsive forms -
 renamed i18n strings - tpzo fixed
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../FinancialAdminReceiptWebRequestBean.java  | 18 ++++++++
 .../FinancialsReceiptWebRequestBean.java      | 17 ++++++++
 .../localization/project_de_DE.properties     |  4 +-
 .../localization/project_en_US.properties     |  4 +-
 .../receipt/admin_form_financial_receipt.tpl  | 38 ++++++----------
 web/WEB-INF/templates/admin/menu/project.tpl  |  7 ++-
 .../receipt/login_form_financial_receipt.tpl  |  8 ++--
 web/admin/fax/admin_fax_show.xhtml            |  2 +-
 .../receipts/admin_receipt_list.xhtml         | 43 ++++++++++++-------
 web/admin/landline/admin_landline_show.xhtml  |  2 +-
 web/admin/mobile/admin_mobile_show.xhtml      |  2 +-
 .../login_financials_add_income.xhtml         |  2 +-
 .../login_financials_add_receipt.xhtml        |  6 +--
 .../login_financials_overview.xhtml           |  4 +-
 14 files changed, 98 insertions(+), 59 deletions(-)

diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java
index 00af46b6..0c797f2e 100644
--- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java
@@ -167,6 +167,9 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl
 		// Fire event with updated instance
 		this.adminAddedReceiptEvent.fire(new ReceiptAddedEvent(updatedReceipt));
 
+		// Clear bean
+		this.clear();
+
 		// Return redirect outcome
 		return "add_receipt_item?faces-redirect=true"; //NOI18N
 	}
@@ -317,6 +320,21 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl
 		this.receiptUser = receiptUser;
 	}
 
+	/**
+	 * Clears this bean
+	 */
+	private void clear () {
+		// Clear all fields
+		this.setReceiptBarCodeNumber(null);
+		this.setReceiptBranchOffice(null);
+		this.setReceiptIssued(null);
+		this.setReceiptNumber(null);
+		this.setReceiptPaymentType(null);
+		this.setReceiptRegisterNumber(null);
+		this.setReceiptSellerEmployee(null);
+		this.setReceiptUser(null);
+	}
+
 	/**
 	 * Creates a new instance from all available data of this bean.
 	 * <p>
diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java
index 46a90a6d..b1dc31e3 100644
--- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java
@@ -202,6 +202,9 @@ public class FinancialsReceiptWebRequestBean extends BaseFinancialsBean implemen
 		// Fire event with updated instance
 		this.addedReceiptEvent.fire(new ReceiptAddedEvent(updatedReceipt));
 
+		// Clear bean
+		this.clear();
+
 		// Return redirect outcome
 		return "add_receipt_item?faces-redirect=true"; //NOI18N
 	}
@@ -475,6 +478,20 @@ public class FinancialsReceiptWebRequestBean extends BaseFinancialsBean implemen
 		return this.allReceipts.contains(receipt);
 	}
 
+	/**
+	 * Clears this bean
+	 */
+	private void clear () {
+		// Clear all fields
+		this.setReceiptBarCodeNumber(null);
+		this.setReceiptBranchOffice(null);
+		this.setReceiptIssued(null);
+		this.setReceiptNumber(null);
+		this.setReceiptPaymentType(null);
+		this.setReceiptRegisterNumber(null);
+		this.setReceiptSellerEmployee(null);
+	}
+
 	/**
 	 * Returns a fully created receipt instance (except primary key, of course)
 	 * <p>
diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index dd5c1590..3ee7f47d 100644
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -48,8 +48,8 @@ ADMIN_ADD_FINANCIAL_RECEIPT_TITLE=Neuen Kassenbon hinzufuegen
 BUTTON_ADMIN_ADD_FINANCIAL_RECEIPT=Kassenbon hinzufuegen
 ADMIN_FINANCIAL_RECEIPT_ISSUE_DATE_REQUIRED=Bitte geben Sie das Ausstellungsdatum des Kassenbons ein.
 ADMIN_MENU_FINANCIAL_RECEIPTS_TITLE=Kassenbons
-LINK_ADMIN_LIST_FINANCIAL_RECEIPTS_TITLE=Listet alle registrierten Kassenbos/Rechnungen auf..
-LINK_ADMIN_LIST_FINANCIAL_RECEIPTS=Kassenbons/Rechnungen auflisten
+ADMIN_LINK_LIST_FINANCIAL_RECEIPTS_TITLE=Listet alle registrierten Kassenbons/Rechnungen auf..
+ADMIN_LINK_LIST_FINANCIAL_RECEIPTS=Kassenbons/Rechnungen auflisten
 ADMIN_LIST_FINANCIAL_RECEIPTS_HEADER=Alle Kassenbons/Rechnungen auflisten
 ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND=Grunddaten des Kassenbons
 ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND_TITLE=Geben Sie hier die Grunddaten des neuen Kassenbons einn.
diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index 839e4222..30c46e15 100644
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -36,8 +36,8 @@ 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.
 ADMIN_MENU_FINANCIAL_RECEIPTS_TITLE=Receipts
-LINK_ADMIN_LIST_FINANCIAL_RECEIPTS_TITLE=Lists all registered receipts.
-LINK_ADMIN_LIST_FINANCIAL_RECEIPTS=List receipts
+ADMIN_LINK_LIST_FINANCIAL_RECEIPTS_TITLE=Lists all registered receipts.
+ADMIN_LINK_LIST_FINANCIAL_RECEIPTS=List receipts
 ADMIN_LIST_FINANCIAL_RECEIPTS_HEADER=List all receipts
 ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND=Basic data of receipt:
 ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND_TITLE=Enter here basic data of the new 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 a9bb9e50..abcb5de3 100644
--- 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
@@ -7,12 +7,11 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:p="http://primefaces.org/ui">
 
-	<fieldset class="fieldset">
-		<legend title="#{project.ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND_TITLE}">
-			<h:outputText value="#{project.ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND}" />
-		</legend>
-
-		<h:panelGrid columns="3" styleClass="table table-full">
+	<p:fieldset legend="#{project.ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND}">
+		<!--
+		@TODO: title="#{project.ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND_TITLE}"
+		-->
+		<p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
 			<p:outputLabel for="branchOffice" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE}" />
 			<p:selectOneMenu
 				id="branchOffice"
@@ -26,7 +25,6 @@
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
 				<f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{branchOffice.branchCompany.companyName} #{branchOffice.branchStreet} #{branchOffice.branchHouseNumber}, #{branchOffice.branchCity}" />
 			</p:selectOneMenu>
-			<p:message for="branchOffice" />
 
 			<p:outputLabel for="receiptIssued" value="#{project.ENTER_FINANCIAL_RECEIPT_ISSUE_DATE}" />
 			<p:calendar
@@ -40,7 +38,6 @@
 				styleClass="input"
 				title="#{project.ADMIN_RECEIPT_DATE_OF_ISSUE_TITLE}"
 				/>
-			<p:message for="receiptIssued" />
 
 			<p:outputLabel for="receiptPaymentType" value="#{msg.ADMIN_SELECT_PAYMENT_TYPE}" />
 			<p:selectOneMenu
@@ -55,7 +52,6 @@
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
 				<f:selectItems value="#{dataController.paymentTypes}" var="receiptPaymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType.i18nKey]}" />
 			</p:selectOneMenu>
-			<p:message for="receiptPaymentType" />
 
 			<p:outputLabel for="receiptSellerEmployee" value="#{msg.ADMIN_SELECT_SELLER_EMPLOYEE}" />
 			<p:selectOneMenu
@@ -68,7 +64,6 @@
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 				<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.employeeNumber} #{beanHelper.renderContact(companyEmployee.employeePersonalData)}" itemDescription="#{companyEmployee.employeeCompany.companyName}, #{beanHelper.renderBranchOffice(companyEmployee.employeeBranchOffice)}" />
 			</p:selectOneMenu>
-			<p:message for="receiptSellerEmployee" />
 
 			<p:outputLabel for="receiptUser" value="#{project.ADMIN_SELECT_FINANCIAL_RECEIPT_USER_OWNER}" />
 			<p:selectOneMenu
@@ -81,31 +76,26 @@
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 				<f:selectItems value="#{userController.allUsers()}" var="receiptUser" itemValue="#{receiptUser}" itemLabel="#{receiptUser.userContact.contactFirstName} #{receiptUser.userContact.contactFamilyName} (#{receiptUser.userName})" />
 			</p:selectOneMenu>
-			<p:message for="receiptUser" />
-		</h:panelGrid>
-	</fieldset>
-
-	<fieldset class="fieldset">
-		<legend title="#{project.ADMIN_FINANCIAL_RECEIPT_OTHER_LEGEND_TITLE}">
-			<h:outputText value="#{project.ADMIN_FINANCIAL_RECEIPT_OTHER_LEGEND}" />
-		</legend>
+		</p:panelGrid>
+	</p:fieldset>
 
-		<h:panelGrid columns="3" styleClass="table table-full">
+	<p:fieldset legend="#{project.ADMIN_FINANCIAL_RECEIPT_OTHER_LEGEND}">
+		<!--
+		@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: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" />
 			</p:inputText>
-			<p:message for="receiptNumber" />
 
 			<p:outputLabel for="receiptRegisterNumber" value="#{project.ENTER_FINANCIAL_RECEIPT_REGISTER_NUMBER}" />
 			<p:inputText styleClass="input" id="receiptRegisterNumber" size="3" maxlength="10" value="#{adminReceiptController.receiptRegisterNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_REGISTER_NUMBER_INVALID}">
 				<f:validateLongRange minimum="1" maximum="999" />
 			</p:inputText>
-			<p:message for="receiptRegisterNumber" />
 
 			<p:outputLabel for="receiptBarCodeNumber" value="#{project.ENTER_FINANCIAL_RECEIPT_BARCODE_NUMBER}" />
 			<p:inputText styleClass="input" id="receiptBarCodeNumber" size="24" maxlength="24" value="#{adminReceiptController.receiptBarCodeNumber}" />
-			<p:message for="receiptBarCodeNumber" />
-		</h:panelGrid>
-	</fieldset>
+		</p:panelGrid>
+	</p:fieldset>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/menu/project.tpl b/web/WEB-INF/templates/admin/menu/project.tpl
index aa442752..f0d00989 100644
--- a/web/WEB-INF/templates/admin/menu/project.tpl
+++ b/web/WEB-INF/templates/admin/menu/project.tpl
@@ -3,7 +3,10 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
-	<!-- Put your stuff here //-->
+	<p:submenu label="#{project.ADMIN_MENU_FINANCIAL_RECEIPTS_TITLE}">
+		<p:menuitem title="#{project.ADMIN_LINK_LIST_FINANCIAL_RECEIPTS_TITLE}" outcome="admin_list_receipts" value="#{project.ADMIN_LINK_LIST_FINANCIAL_RECEIPTS}" />
+	</p:submenu>
 </ui:composition>
diff --git a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
index 848a92b3..f6c1a3de 100644
--- a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
@@ -12,7 +12,7 @@
 			<h:outputText value="#{project.LOGIN_FINANCIAL_RECEIPT_BASIC_LEGEND}" />
 		</legend>
 
-		<h:panelGrid columns="3" styleClass="table table-full">
+		<p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
 			<p:outputLabel for="branchOffice" value="#{project.LOGIN_SELECT_BRANCH_OFFICE}" />
 			<p:selectOneMenu
 				id="branchOffice"
@@ -69,7 +69,7 @@
 				<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
 			</p:selectOneMenu>
 			<p:message for="receiptSellerEmployee" />
-		</h:panelGrid>
+		</p:panelGrid>
 	</fieldset>
 
 	<fieldset class="fieldset">
@@ -77,7 +77,7 @@
 			<h:outputText value="#{project.LOGIN_FINANCIAL_RECEIPT_OTHER_LEGEND}" />
 		</legend>
 
-		<h:panelGrid columns="3" styleClass="table table-full">
+		<p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
 			<p:outputLabel for="receiptNumber" value="#{project.FINANCIAL_RECEIPT_NUMBER}" />
 			<p:inputText styleClass="input" id="receiptNumber" size="10" maxlength="20" value="#{receiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
 				<f:validateLongRange minimum="1" maximum="9999999999" />
@@ -93,6 +93,6 @@
 			<p:outputLabel for="receiptBarCodeNumber" value="#{project.FINANCIAL_RECEIPT_BARCODE_NUMBER}" />
 			<p:inputText styleClass="input" id="receiptBarCodeNumber" size="24" maxlength="24" value="#{receiptController.receiptBarCodeNumber}" />
 			<p:message for="receiptBarCodeNumber" />
-		</h:panelGrid>
+		</p:panelGrid>
 	</fieldset>
 </ui:composition>
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 70570c4e..1d5407b9 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -25,7 +25,7 @@
 	<ui:define name="content">
 		<widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
 
-		<p:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+		<p:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-full">
 			<f:facet name="header">
 				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
 					<f:param value="#{beanHelper.faxNumber.phoneId}" />
diff --git a/web/admin/financials/receipts/admin_receipt_list.xhtml b/web/admin/financials/receipts/admin_receipt_list.xhtml
index e24fff89..5eb3796a 100644
--- a/web/admin/financials/receipts/admin_receipt_list.xhtml
+++ b/web/admin/financials/receipts/admin_receipt_list.xhtml
@@ -20,7 +20,6 @@
 				id="table-list-financial-receipt"
 				var="receipt"
 				value="#{receiptController.allReceipts()}"
-				widgetVar="receiptTable"
 				filteredValue="#{receiptController.filteredReceipts}"
 				tableStyleClass="table table-full"
 				rows="10"
@@ -31,8 +30,9 @@
 				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_FINANCIAL_RECEIPT_LIST_EMPTY}"
+				widgetVar="receiptList"
+				>
 				<f:facet name="header">
 					<h:outputText value="#{project.ADMIN_LIST_FINANCIAL_RECEIPTS_HEADER}" />
 					<p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
@@ -41,21 +41,32 @@
 			</p:dataTable>
 		</h:form>
 
-		<h:form id="form_admin_add_financial_receipt">
-			<h:panelGrid columns="1" headerClass="table-header" footerClass="table-footer" styleClass="table table-full">
-				<f:facet name="header">
-					<h:outputText value="#{project.ADMIN_ADD_FINANCIAL_RECEIPT_TITLE}" />
-				</f:facet>
+		<h:form>
+			<p:panelGrid layout="grid" columns="1" styleClass="table table-full">
+				<h:panelGroup styleClass="table-header" layout="block">
+					<h4>
+						<h:outputText value="#{project.ADMIN_ADD_FINANCIAL_RECEIPT_TITLE}" />
+					</h4>
+				</h:panelGroup>
 
-				<p:column>
-					<ui:include src="/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl" />
-				</p:column>
+				<ui:include src="/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl" />
 
-				<f:facet name="footer">
-					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<p:commandButton styleClass="submit" type="submit" id="button_add_financial_receipt" value="#{project.BUTTON_ADMIN_ADD_FINANCIAL_RECEIPT}" action="#{adminReceiptController.addReceipt()}" />
-				</f:facet>
-			</h:panelGrid>
+				<p:panelGrid columns="2" styleClass="table-footer" layout="grid">
+					<p:commandButton
+						styleClass="reset divider-right"
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						styleClass="submit"
+						type="submit"
+						value="#{project.BUTTON_ADMIN_ADD_FINANCIAL_RECEIPT}"
+						action="#{adminReceiptController.addReceipt()}"
+						update=":master:form-list-financial-receipt:table-list-financial-receipt"
+						/>
+				</p:panelGrid>
+			</p:panelGrid>
 		</h:form>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 7fc7f091..052f450b 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -25,7 +25,7 @@
 	<ui:define name="content">
 		<widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" />
 
-		<p:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+		<p:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-full">
 			<f:facet name="header">
 				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
 					<f:param value="#{beanHelper.landLineNumber.phoneId}" />
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 7ee27039..68e532e1 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -25,7 +25,7 @@
 	<ui:define name="content">
 		<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" />
 
-		<p:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+		<p:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-full">
 			<f:facet name="header">
 				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
 					<f:param value="#{beanHelper.mobileNumber.phoneId}" />
diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml
index 9541a547..e4a34748 100644
--- a/web/user/financials/login_financials_add_income.xhtml
+++ b/web/user/financials/login_financials_add_income.xhtml
@@ -16,7 +16,7 @@
 
 	<ui:define name="content">
 		<h:form id="form_add_financials_income">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+			<h:panelGroup styleClass="table table-full" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{project.LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE}" />
 				</div>
diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml
index fe029289..ec59537b 100644
--- a/web/user/financials/login_financials_add_receipt.xhtml
+++ b/web/user/financials/login_financials_add_receipt.xhtml
@@ -16,7 +16,7 @@
 
 	<ui:define name="content">
 		<h:form id="form_add_financial_receipt">
-			<h:panelGrid columns="1" headerClass="table-header" footerClass="table-footer" styleClass="table table-full">
+			<p:panelGrid layout="grid" columns="1" headerClass="table-header" footerClass="table-footer" styleClass="table table-full">
 				<f:facet name="header">
 					<h:outputText value="#{project.LOGIN_ADD_FINANCIAL_RECEIPT_TITLE}" />
 				</f:facet>
@@ -27,9 +27,9 @@
 
 				<f:facet name="footer">
 					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<p:commandButton styleClass="submit" type="submit" id="button_add_financial_receipt" value="#{project.BUTTON_LOGIN_ADD_FINANCIAL_RECEIPT}" action="#{receiptController.addReceipt()}" />
+					<p:commandButton styleClass="submit" type="submit" id="submit_add_financial_receipt" value="#{project.BUTTON_LOGIN_ADD_FINANCIAL_RECEIPT}" action="#{receiptController.addReceipt()}" />
 				</f:facet>
-			</h:panelGrid>
+			</p:panelGrid>
 		</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 592ad41f..ac4bde5d 100644
--- a/web/user/financials/login_financials_overview.xhtml
+++ b/web/user/financials/login_financials_overview.xhtml
@@ -16,7 +16,7 @@
 
 	<ui:define name="content">
 		<h:panelGroup layout="block" styleClass="para">
-			<h:panelGrid columns="4">
+			<p:panelGrid layout="grid" columns="4">
 				<f:facet name="header">
 					<h:outputText value="#{project.GENERAL_FINANCIAL_OVERVIEW}" />
 				</f:facet>
@@ -38,7 +38,7 @@
 
 					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_income" value="#{financialIncomeController.income.size()}" />
 				</h:column>
-			</h:panelGrid>
+			</p:panelGrid>
 		</h:panelGroup>
 
 		<h:panelGroup layout="block" styleClass="para">
-- 
2.39.5