[Mpuls-commits] r4495 - base/trunk/mpulsweb/templates/settings

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-01-14 12:05:44 +0100 (Fri, 14 Jan 2011)
New Revision: 4495

Modified:
   base/trunk/mpulsweb/templates/settings/edit.mako
Log:
* mpulsweb/templates/settings/edit.mako: Simpliefied edit page for
	agencysetting. Rendering of errors an fillout of values in forms is
	now done with htmlfill.


Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako	2011-01-14 10:55:18 UTC (rev 4494)
+++ base/trunk/mpulsweb/templates/settings/edit.mako	2011-01-14 11:05:44 UTC (rev 4495)
@@ -46,39 +46,15 @@
         <legend>${_('Specification for agency')}</legend>
         <div class="waska_form_element w30">
           <label for="ka_name">${_('adm_form_settings_kaname')}</label>
-          % if c.form_errors.get('ka_name'):
-            <input type="text" class="field error_box" id="ka_name"
-                   value="${c.form_result.get('ka_name', c.agency.getName())}"
-                   name="ka_name" maxlength="60">
-          % else:
-            <input type="text" class="field" id="ka_name" name="ka_name"
-                   value="${c.form_result.get('ka_name', c.agency.getName())}"
-                   maxlength="60">
-          % endif
+          <input type="text" class="field" id="ka_name" name="ka_name" value="" maxlength="60">
         </div>
         <div class="waska_form_element w30">
           <label for="ka_adresse">${_('adm_form_settings_kaadress')}</label>
-          % if c.form_errors.get('ka_adresse'):
-            <input type="text" class="field error_box" id="ka_adresse"
-                   value="${c.form_result.get('ka_adresse', c.agency.getAddress())}"
-                   name="ka_adresse" maxlength="120">
-          % else:
-            <input type="text" class="field" id="ka_adresse" name="ka_adresse"
-                   value="${c.form_result.get('ka_adresse', c.agency.getAddress())}"
-                   maxlength="120">
-          % endif
+          <input type="text" class="field" id="ka_adresse" name="ka_adresse" value="" maxlength="120">
         </div>
         <div class="waska_form_element w30">
           <label for="fkz">${_('adm_form_settings_fkz')}</label>
-          % if c.form_errors.get('fkz'):
-            <input type="text" class="error_box" id="fkz" name="fkz"
-                   value="${c.form_result.get('fkz', c.agency.getFKZ())}"
-                   maxlength="60">
-          % else:
-            <input type="text" id="fkz" name="fkz"
-                   value="${c.form_result.get('fkz', c.agency.getFKZ())}"
-                   maxlength="60">
-          % endif
+          <input type="text" id="fkz" name="fkz" value="" maxlength="60">
         </div>
       </fieldset>
       <fieldset>
@@ -87,18 +63,7 @@
           <label for="max_speicherdauer">
             ${_('adm_form_settings_max_savetime')}
           </label>
-          % if c.form_errors.get('max_speicherdauer'):
-            <input type="text" class="error_box" id="max_speicherdauer"
-                   name="max_speicherdauer"
-                   value="${c.form_result.get('max_speicherdauer',
-                                              c.agency.getMaxSavetime())}"
-                   maxlength="4">
-          % else:
-            <input type="text" id="max_speicherdauer" name="max_speicherdauer"
-                   value="${c.form_result.get('max_speicherdauer',
-                                              c.agency.getMaxSavetime())}"
-                   maxlength="4">
-          % endif
+          <input type="text" id="max_speicherdauer" name="max_speicherdauer" value="" maxlength="4">
           <p class="info">
             ${_('Automatic reminders are used to identify cases, which has not been edited for longer than the specified value. Additionally there can be further conditions when a reminder is created. Further condition: %s') % g.mpuls_config.get('case', 'reminderconditiondesc')}
           </p>
@@ -109,12 +74,7 @@
               <img class="smallicon" alt="" src="${h.url_for('/images/icons/info/failure_22.png')}">
             </a>
           % endif
-          % if c.agency.isAnonTransfer():
-            <input id="anon_transfer" name="anon_transfer" type="checkbox"
-                   checked />
-          % else:
-            <input id="anon_transfer" name="anon_transfer" type="checkbox"/>
-          % endif
+          <input id="anon_transfer" name="anon_transfer" type="checkbox"/>
           <label for="anon_transfer">
             ${_('adm_form_settings_anontransfer')}
           </label>