From 05fb3943d5f02c04683c85c4a2598ea2fcf06b37 Mon Sep 17 00:00:00 2001
From: Aron Carroll <self@aroncarroll.com>
Date: Wed, 6 Jun 2012 09:21:47 +0100
Subject: [PATCH] [2375] Refactor group form page to use new macros

---
 ckan/templates/group/pages/form.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ckan/templates/group/pages/form.html b/ckan/templates/group/pages/form.html
index 3c99b5a7a52..e66abba0fed 100644
--- a/ckan/templates/group/pages/form.html
+++ b/ckan/templates/group/pages/form.html
@@ -4,11 +4,10 @@
   {% 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>
@@ -16,12 +15,12 @@ <h2>{{ _('Errors in form') }}</h2>
   {% 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 %}