more fixes, 'register' was to much around, comes from copy-paste template ... :-(

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

diff --git a/web/admin/category/admin_category_list.xhtml b/web/admin/category/admin_category_list.xhtml
index a0564035aca95c0f8ef5093470801cb1c0484350..5e678e706e50ab3192b5c4b3108d8094665b4925 100644 (file)
--- 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 f5055eeae2992acc35389ed0209be2f5f8939eaf..1bba6ec70cff606b3911491366cb5892ed0a0e61 100644 (file)
--- 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 66588a341af96b4d1b7c1615ea8c550ffe962205..0211a4d5417f784074b90e4553cb534e94d22986 100644 (file)
--- 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 97cd4c991e0331775147f89f37c032f95b51fce9..371c7e9c9bcaf5760d10b41626d5f9e362fa8057 100644 (file)
--- 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 02a58ddbd15aef1a425fd3cd661f428f0e65529d..8d6a487179540c8f89a887b05491d3db7433208a 100644 (file)
--- 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 6204ef7be3ae776b4a66e3c55c36670ab6522e39..11877d7770b4e0ac7552b8eddcd80c5e2542f8da 100644 (file)
--- 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 4407e154817bc2f228cdbc7ceff7d95bf90551bb..129ba3fc40d1e1cf2507abe51d9791c24fed98a2 100644 (file)
--- 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 a80d0bb666d329d942b8a3cfdbcd946fe9a27f33..fd61bed89c274141987669b1c61e4d7f843a478f 100644 (file)
--- 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">