From 9bb31b7645f2a2e8357255bda6ae64ee980b32d6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 19 Apr 2017 22:03:51 +0200
Subject: [PATCH] more fixes, 'register' was to much around, comes from
 copy-paste template ... :-(
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/admin/category/admin_category_list.xhtml | 2 +-
 web/admin/customer/admin_customer_edit.xhtml | 4 ++--
 web/admin/customer/admin_customer_list.xhtml | 2 +-
 web/admin/product/admin_product_list.xhtml   | 2 +-
 web/admin/user/admin_user_list.xhtml         | 2 +-
 web/basket.xhtml                             | 2 +-
 web/customer/checkout.xhtml                  | 4 ++--
 web/customer/empty_basket.xhtml              | 1 +
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/web/admin/category/admin_category_list.xhtml b/web/admin/category/admin_category_list.xhtml
index a0564035..5e678e70 100644
--- a/web/admin/category/admin_category_list.xhtml
+++ b/web/admin/category/admin_category_list.xhtml
@@ -49,7 +49,7 @@
 			</div>
 
 			<div class="para">
-				<h:form id="add_category">
+				<h:form id="form_add_category">
 					<div class="table">
 						<div class="table_header">
 							<h:outputText value="#{msg.ADMIN_ADD_CATEGORY_TITLE}" />
diff --git a/web/admin/customer/admin_customer_edit.xhtml b/web/admin/customer/admin_customer_edit.xhtml
index f5055eea..1bba6ec7 100644
--- a/web/admin/customer/admin_customer_edit.xhtml
+++ b/web/admin/customer/admin_customer_edit.xhtml
@@ -25,7 +25,7 @@
 		<ui:define name="content">
 			<h:outputText styleClass="errors" value="#{msg.ERROR_CUSTOMER_ID_NOT_FOUND}" rendered="#{empty adminHelper.customer}" />
 
-			<h:form id="admin_edit_customer" rendered="#{not empty adminHelper.customer}">
+			<h:form id="form_admin_edit_customer" rendered="#{not empty adminHelper.customer}">
 				<div class="table">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_EDIT_CUSTOMER_TITLE}" />
@@ -41,7 +41,7 @@
 
 					<div class="table_footer">
 						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_CUSTOMER}" action="#{adminCustomerController.editCustomerData()}" />
+						<h:commandButton class="submit" type="submit" id="admin_edit_customer" value="#{msg.BUTTON_ADMIN_EDIT_CUSTOMER}" action="#{adminCustomerController.editCustomerData()}" />
 					</div>
 				</div>
 			</h:form>
diff --git a/web/admin/customer/admin_customer_list.xhtml b/web/admin/customer/admin_customer_list.xhtml
index 66588a34..0211a4d5 100644
--- a/web/admin/customer/admin_customer_list.xhtml
+++ b/web/admin/customer/admin_customer_list.xhtml
@@ -81,7 +81,7 @@
 			</h:dataTable>
 
 			<div class="table_medium">
-				<h:form id="admin_add_customer">
+				<h:form id="form_admin_add_customer">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_ADD_CUSTOMER_TITLE}" />
 					</div>
diff --git a/web/admin/product/admin_product_list.xhtml b/web/admin/product/admin_product_list.xhtml
index 97cd4c99..371c7e9c 100644
--- a/web/admin/product/admin_product_list.xhtml
+++ b/web/admin/product/admin_product_list.xhtml
@@ -65,7 +65,7 @@
 			</div>
 
 			<div class="para">
-				<h:form id="add_product">
+				<h:form id="form_add_product">
 					<div class="table">
 						<div class="table_header">
 							<h:outputText value="#{msg.ADMIN_ADD_PRODUCT_TITLE}" />
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 02a58ddb..8d6a4871 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -97,7 +97,7 @@
 			</h:dataTable>
 
 			<h:panelGroup styleClass="table_medium" layout="block">
-				<h:form id="admin_add_user">
+				<h:form id="form_admin_add_user">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
 					</div>
diff --git a/web/basket.xhtml b/web/basket.xhtml
index 6204ef7b..11877d77 100644
--- a/web/basket.xhtml
+++ b/web/basket.xhtml
@@ -48,7 +48,7 @@
 						<h:outputText value="#{msg.CHANGE_ITEM_AMOUNT}" />
 					</f:facet>
 
-					<h:form id="add_item">
+					<h:form id="form_add_item">
 						<h:commandButton class="submit" id="add" value="#{msg.BUTTON_CHANGE_ITEM_AMOUNT}" action="#{basketController.doChangeItem(item)}" title="#{msg.BUTTON_TITLE_CHANGE_ITEM_AMOUNT}" />
 
 						<h:inputText class="input" id="amount" size="3" maxlength="20" value="#{item.orderedAmount}" title="#{msg.INPUT_TITLE_ENTER_ITEM_AMOUNT}">
diff --git a/web/customer/checkout.xhtml b/web/customer/checkout.xhtml
index 4407e154..129ba3fc 100644
--- a/web/customer/checkout.xhtml
+++ b/web/customer/checkout.xhtml
@@ -37,7 +37,7 @@
 							</div>
 
 							<div class="checkout_option_content">
-								<h:link class="checkout_option_link" id="checkout_option_login" outcome="login" value="#{msg.LINK_CHECKOUT_OPTION_LOGIN}">
+								<h:link class="checkout_option_link" id="checkout_option_login" outcome="user_login" value="#{msg.LINK_CHECKOUT_OPTION_LOGIN}">
 									<f:param name="redirect" value="login_checkout" />
 								</h:link>
 							</div>
@@ -49,7 +49,7 @@
 							</div>
 
 							<div class="checkout_option_content">
-								<h:link class="checkout_option_link" id="checkout_option_register" outcome="register" value="#{msg.LINK_CHECKOUT_OPTION_REGISTRATION}">
+								<h:link class="checkout_option_link" id="checkout_option_register" outcome="user_register" value="#{msg.LINK_CHECKOUT_OPTION_REGISTRATION}">
 									<f:param name="redirect" value="login_checkout" />
 								</h:link>
 							</div>
diff --git a/web/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml
index a80d0bb6..fd61bed8 100644
--- a/web/customer/empty_basket.xhtml
+++ b/web/customer/empty_basket.xhtml
@@ -17,6 +17,7 @@
 		</ui:define>
 
 		<ui:define name="content">
+			<!-- @TODO resend_link.xhtml is here! //-->
 			<h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 				<div class="table">
 					<div class="table_header">
-- 
2.39.5