[2375] Refactor group form page to use new macros

ckan · Jun 6, 2012 · 05fb394 · 05fb394
1 parent a2b02e8
commit 05fb394
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/ckan/templates/group/pages/form.html b/ckan/templates/group/pages/form.html
@@ -4,24 +4,23 @@
   {% block error_summary %}
     {% if error_summary %}
       <div class="error-explanation">
-        <h2>{{ _('Errors in form') }}</h2>
         <p>{{ _('The form contains invalid entries:') }}</p>
         <ul>
           {% for key, error in error_summary.items() %}
-            <li>{{ key }} {{ error }}</li>
+            <li>{{ key }}: {{ error }}</li>
           {% endfor %}
         </ul>
       </div>
     {% endif %}
   {% endblock %}
 
   {% block basic_fields %}
-    {{ form.input('title', label=_('Title'), id='field-title', placeholder=_('My Group'), data=data, errors=errors, classes=['control-full']) }}
-    {{ form.prepend('name', label=_('URL'), prepend=h.url(controller='group', action='index') ~ '/', id='field-url', placeholder=_('my-group'), data=data, errors=errors) }}
-    {{ form.markdown('description', label=_('Description'), id='field-description', placeholder=_('A little information about my group...'), data=data, errors=errors) }}
-    {{ form.input('image_url', label=_('Image URL'), id='field-url', type='url', placeholder=_('http://example.com/my-image.jpg'), data=data, errors=errors, classes=['control-full']) }}
+    {{ form.input('title', label=_('Title'), id='field-title', placeholder=_('My Group'), value='what?', error=errors.title, classes=['control-full']) }}
+    {{ form.prepend('name', label=_('URL'), prepend=h.url(controller='group', action='index') ~ '/', id='field-url', placeholder=_('my-group'), value=data.name, error=errors.name) }}
+    {{ form.markdown('description', label=_('Description'), id='field-description', placeholder=_('A little information about my group...'), value=data.description, error=errors.description) }}
+    {{ form.input('image_url', label=_('Image URL'), id='field-url', type='url', placeholder=_('http://example.com/my-image.jpg'), value=data.image_url, error=errors.image_url, classes=['control-full']) }}
     {% if c.is_sysadmin or c.auth_for_change_state %}
-      {{ form.select('state', label=_('State'), id='field-state', selected=data.state, options={active: _('Active'), deleted: _('Deleted')}, errors=errors) }}
+      {{ form.select('state', label=_('State'), id='field-state', selected=data.state, options={active: _('Active'), deleted: _('Deleted')}, error=errors.state) }}
     {% endif %}
   {% endblock %}