[Mpuls-commits] r2348 - in wasko/branches/2.0: . mpulsweb/templates/administration

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-04-14 15:45:14 +0200 (Wed, 14 Apr 2010)
New Revision: 2348

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako
Log:
Fixed issue #1374: Display errors while editing user

Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-14 13:30:20 UTC (rev 2347)
+++ wasko/branches/2.0/ChangeLog	2010-04-14 13:45:14 UTC (rev 2348)
@@ -1,5 +1,10 @@
 2010-04-14  Roland Geider <roland.geider at intevation.de>
 	
+	*  mpulsweb/templates/administration/edit_user.mako:
+        Fixed issue #1374 - Display errors while editing user
+
+2010-04-14  Roland Geider <roland.geider at intevation.de>
+	
 	* mpulsweb/lib/navigation.py:
 	* mpulsweb/lib/renderer.py:
 	* mpulsweb/public/styles/all.css:

Modified: wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako	2010-04-14 13:30:20 UTC (rev 2347)
+++ wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako	2010-04-14 13:45:14 UTC (rev 2348)
@@ -32,40 +32,54 @@
 <div id="admin_edit_user">
 <div id="waska_form">
 <form action="/administration/editUserAction" method="POST">
-	<fieldset><legend>${_('adm_form_legend_personal')}</legend>
-          <div class="w25">
-            % if c.form_errors.get('firstname'):
-              <label for="firstname" class="error_font">${_('adm_form_user_firstname')}</label><br>
-              <input type="text" class="field error_box" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}" maxlength="64">
-            % else:
-              <label for="firstname">${_('adm_form_user_firstname')}</label><br>
-              <input type="text" class="field" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}" maxlength="64">
-            % endif 
-	  </div>
-          <div class="w75">
-            % if c.form_errors.get('lastname'): 
-              <label for="lastname" class="error_font">${_('adm_form_user_lastname')}</label><br>
-	      <input type="text" class="field error_box" id="lasttname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}" maxlength="64">
-            % else:
-              <label for="lastname">${_('adm_form_user_lastname')}</label><br>
-	      <input type="text" class="field" id="lasttname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}" maxlength="64">
-            % endif
-	  </div>
-	<div class="w25">
-		<label
-		for="telephone">${_('adm_form_user_telephone')}</label><br>
-		<input type="text" class="field" id="telephone" name="telephone" value="${c.form_result.get('telephone', c.uo.telephone)| h}" maxlength="32">
-	</div>
-	<div class="w75">
-		<label
-		for="room">${_('adm_form_user_roomnumer')}</label><br>
-		<input type="text" class="field" id="room" name="room" value="${c.form_result.get('room', c.uo.room)| h}" maxlength="16">
-	</div>
-	<div class="waska_form_element w100">
-		<label
-		for="branchoffice">${_('adm_form_user_branchoffice')}</label><br>
-		<input type="text" class="field" id="branchoffice" name="branchoffice" value="${c.form_result.get('branchoffice', c.uo.branchoffice)| h}" maxlength="64">
-	</div>
+
+	<fieldset>
+        
+        <legend>${_('adm_form_legend_personal')}</legend>
+        
+        <table>
+            <tr>
+                <td>
+                    % if c.form_errors.get('firstname'): 
+                    <label for="firstname" class="error_font">${_('adm_form_user_firstname')}</label><br>
+                    <input type="text" class="field error_box" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}" maxlength="64">
+                    % else:
+                    <label for="firstname">${_('adm_form_user_firstname')}</label><br>
+                    <input type="text" class="field" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}" maxlength="64">
+                    % endif
+                </td>
+                
+                <td>
+                    % if c.form_errors.get('lastname'): 
+                    <label for="lastname" class="error_font">${_('adm_form_user_lastname')}</label><br>
+                    <input type="text" class="field error_box" id="lastname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}" maxlength="64">
+                    % else:
+                    <label for="lastname">${_('adm_form_user_lastname')}</label><br>
+                    <input type="text" class="field" id="lastname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}" maxlength="64">
+                    % endif
+                </td>
+            </tr>
+            
+            <tr>
+                <td>
+                    <label for="telephone">${_('adm_form_user_telephone')}</label><br>
+                    <input type="text" class="field" id="telephone" name="telephone" value="${c.form_result.get('telephone', c.uo.telephone)| h}" maxlength="32">
+                </td>
+                <td>
+                    <label for="room">${_('adm_form_user_roomnumer')}</label><br>
+                    <input type="text" class="field" id="room" name="room" value="${c.form_result.get('room', c.uo.room)| h}" maxlength="16">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label for="branchoffice">${_('adm_form_user_branchoffice')}</label><br>
+                    <input type="text" class="field" id="branchoffice" name="branchoffice" value="${c.form_result.get('branchoffice', c.uo.branchoffice)| h}" maxlength="64">
+                </td>
+                <td></td>
+            </tr>
+        </table>
+        
+
 	</fieldset>
 	<fieldset><legend>${_('adm_form_legend_login')}</legend>
           <table>