Please cherry-pick:

- removed "id" where it is not explicitly needed
- removed process="@form" as later one hides a more serious bug (was wrong
  scope)
- removed contenttype from f:view which makes rendering AJAX requests by
  Primefaces trigger an exception
- rewrote single-line attributes to distinct lines (each attribute of a tag in
  a separate line for better readability) in master.tpl

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

diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
index 4974b565e78c274047f062d9768a29da7a3f581c..b55fd89553c62a8e4f70177476dfc90f7535d31a 100644 (file)
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -8,7 +8,7 @@
        >
 
        <h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-               <h:form id="form_user_login">
+               <h:form>
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
@@ -55,7 +55,6 @@
                                                />
 
                                        <p:commandButton
-                                               process="@form"
                                                type="submit"
                                                action="#{userLoginController.doUserLogin()}"
                                                value="#{msg.BUTTON_USER_LOGIN}"

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index 4b416b655576c7cb445ab19a28e7fe0957bce29e..fcd3872492c4a234f0f01907cd8a9874f9ee1e79 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -7,7 +7,7 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+       <h:form rendered="#{featureController.isFeatureEnabled('user_registration')}">
                <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
@@ -92,7 +92,6 @@
                                        />
 
                                <p:commandButton
-                                       process="@form"
                                        type="submit"
                                        value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}"
                                        action="#{userRegistrationController.doRegisterMultiPage1()}"

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
index 910cd9cf91e008bb57931c9fcd5a803006f53d38..b63427044cf0e3563a182353067089d803a56f22 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
@@ -7,7 +7,7 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+       <h:form rendered="#{featureController.isFeatureEnabled('user_registration')}">
                <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
@@ -22,7 +22,6 @@
                                        />
 
                                <p:commandButton
-                                       process="@form"
                                        type="submit"
                                        value="#{msg.BUTTON_FINISH_REGISTRATION}"
                                        action="#{userRegistrationController.doFinishRegistration()}"

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index a359818c293f972e75311fed1b0a392a3ad2c638..d99a8f802092972ceac5623609c668aad03b7589 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -7,7 +7,7 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+       <h:form rendered="#{featureController.isFeatureEnabled('user_registration')}">
                <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
@@ -96,7 +96,6 @@
                                        />
 
                                <p:commandButton
-                                       process="@form"
                                        type="submit"
                                        value="#{msg.BUTTON_FINISH_REGISTRATION}"
                                        action="#{userRegistrationController.doFinishRegistration()}"

diff --git a/web/WEB-INF/templates/master.tpl b/web/WEB-INF/templates/master.tpl
index a9da0c56747974da738e976ba339dffdda5653da..27c9d091e2dafcf5977cf45c67c391509102ca7d 100644 (file)
--- a/web/WEB-INF/templates/master.tpl
+++ b/web/WEB-INF/templates/master.tpl
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:f="http://java.sun.com/jsf/core"
-                               xmlns:h="http://java.sun.com/jsf/html"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:p="http://primefaces.org/ui"
-                               xmlns:pm="http://primefaces.org/mobile">
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       xmlns:pm="http://primefaces.org/mobile"
+       >
+       <h:doctype
+               rootElement="html"
+               public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+               system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+               />
+
+       <html
+               lang="#{localizationController.locale.language}"
+               xml:lang="#{localizationController.locale.language}"
+               xmlns="http://www.w3.org/1999/xhtml"
+               >
+               <f:view locale="#{localizationController.locale}" />
 
-       <h:doctype rootElement="html" public="-//W3C//DTD XHTML 1.0 Transitional//EN" system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-       <html lang="#{localizationController.locale.language}" xml:lang="#{localizationController.locale.language}" xmlns="http://www.w3.org/1999/xhtml">
-               <f:view locale="#{localizationController.locale}" contentType="text/html" />
                <h:head>
                        <f:facet name="first">
                                <ui:insert name="metadata" />

diff --git a/web/WEB-INF/templates/widgets/locale_change_widget.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
index c7d57c759e6ffd25c79916bf953f73612842bc67..f02b18a261955789e99a50bd1e58e3b2b097a8b5 100644 (file)
--- a/web/WEB-INF/templates/widgets/locale_change_widget.tpl
+++ b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
@@ -7,7 +7,7 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <h:form id="form-change-locale">
+       <h:form>
                <p:outputPanel styleClass="ui-g">
                        <p:outputPanel styleClass="ui-g-12 ui-md-6">
                                <p:selectOneMenu value="#{localizationController.localeCode}">
@@ -26,7 +26,6 @@
 
                        <p:outputPanel styleClass="ui-g-12 ui-md-6">
                                <p:commandButton
-                                       process="@form"
                                        type="submit"
                                        actionListener="#{localizationController.doChangeLocale()}"
                                        value="#{msg.BUTTON_CHANGE_LOCALE}"