Please cherry-pick:

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

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 5d36aee840a550113575c9756405d34e1324ccc8..c3740b3c92797aa51d755a86949e1fc701d68a3b 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -11,7 +11,7 @@
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <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:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
                                <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
                        </f:metadata>
                </ui:define>
@@ -47,7 +47,7 @@
 
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left25_medium">
                                                        <h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
                                                </div>
@@ -57,7 +57,7 @@
                                                </div>
 
                                                <div class="clear"></div>
-                                       </div>
+                                       </h:panelGroup>
 
                                        <div class="table_footer">
                                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />