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 6a2931c5d127ac02bfd3e10cf4bb0da4d482e14d..c3740b3c92797aa51d755a86949e1fc701d68a3b 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -10,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>
@@ -32,7 +33,7 @@
                         </ui:fragment>
  
                         <h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
-                               <h:panelGroup styleClass="table" layout="block">
+                               <h:panelGroup styleClass="table_medium" layout="block">
                                         <div class="table_header">
                                                 <h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
                                                         <f:param value="#{beanHelper.user.userName}" />
@@ -46,17 +47,17 @@
  
                                         <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
  
-                                       <div class="table_row">
-                                               <div class="table_left_medium">
+                                       <h:panelGroup styleClass="table_row" layout="block">
+                                               <div class="table_left25_medium">
                                                         <h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
                                                 </div>
  
-                                               <div class="table_right_medium">
-                                                       <h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="7" cols="25" />
+                                               <div class="table_right75_medium">
+                                                       <h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
                                                 </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}" />