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

[jjobs-war.git] / web / admin / user / admin_user_edit.xhtml

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 1578ec171cc51cc9741e50f97d179e0558f01c5c..9d8c126360c137df5d1815d8714ea87625e33e1f 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -8,29 +8,38 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{adminHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-               <f:viewAction action="#{adminHelper.copyUserToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_USER}</ui:define>
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+                               <f:viewAction action="#{beanHelper.copyUserToController()}" />
+                       </f:metadata>
+               </ui:define>
+
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_USER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}" />
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.user}" />
-
-                       <h:form id="admin_edit_user" rendered="#{not empty adminHelper.user}">
-                               <div class="table">
+                       <ui:fragment rendered="#{empty beanHelper.user}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
+                               <h:panelGroup styleClass="table_medium" layout="block">
                                        <div class="table_header">
-                                               #{msg.ADMIN_EDIT_USER_TITLE}
+                                               <h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
                                        </div>
 
                                        <div class="para notice">
-                                               #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
+                                               <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
@@ -38,10 +47,10 @@
                                        </ui:include>
 
                                        <div class="table_footer">
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
+                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
                        </h:form>
                </ui:define>
        </ui:composition>