From aa41a5e8a9a11e1c7babbcf547b0ea590e414e87 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 13 May 2014 12:45:49 +0100
Subject: [PATCH] updating header form style

---
 .../templates/wagtailforms/index.html         |  2 +-
 .../wagtailforms/index_submissions.html       | 47 ++++++++++---------
 wagtail/wagtailforms/views.py                 |  2 +-
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/wagtail/wagtailforms/templates/wagtailforms/index.html b/wagtail/wagtailforms/templates/wagtailforms/index.html
index e542e596df..c3a8315010 100644
--- a/wagtail/wagtailforms/templates/wagtailforms/index.html
+++ b/wagtail/wagtailforms/templates/wagtailforms/index.html
@@ -4,7 +4,7 @@
 {% block bodyclass %}menu-forms{% endblock %}
 {% block content %}
     {% trans "Forms" as forms_str %}
-    {% trans "Data" as select_form_str %}
+    {% trans "Pages" as select_form_str %}
     {% include "wagtailadmin/shared/header.html" with title=forms_str subtitle=select_form_str %}
 
     <div class="nice-padding">
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
index 26ed4a7bd9..7bba352fbc 100644
--- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
+++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
@@ -30,27 +30,32 @@
 {% endblock %}
 {% block content %}
     <header class="nice-padding">
-        <div class="row row-flush">
-            <div class="left col6">
-                <h1>
-                {% blocktrans with form_title=form_page.title|capfirst %}Submissions of <span>{{ form_title }}</span>{% endblocktrans %}
-                </h1>
-            </div>
-            <form class="col6" action="" method="get">
-                <ul class="fields">
-                    {% for field in select_date_form %}
-                        <div class="col3">
-                            {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
-                        </div>
-                    {% endfor %}
-                    <div class="col2">
-                        <li class="submit"><input name="action" type="submit" value="Filter" />
-                        <br /><input name="action" type="submit" value="CSV" /></li>
+        <form action="" method="get">
+            <div class="row">
+                <div class="left">
+                    <div class="col">
+                        <h1 class="icon icon-form">
+                        {% blocktrans with form_title=form_page.title|capfirst %}Form data <span>{{ form_title }}</span>{% endblocktrans %}
+                        </h1>
                     </div>
-                    
-                </ul>
-            </form>
-        </div>
+                    <div class="col search-bar small">
+                        <ul class="fields">
+                            {% for field in select_date_form %}
+                                <div class="col4">
+                                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                                </div>
+                            {% endfor %}
+                            <li class="submit">
+                                <button name="action" value="">{% trans 'Filter' %}</button>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="right">
+                   <button name="action" value="CSV" class="button bicolor icon icon-download">{% trans 'Download CSV' %}</button>
+                </div>
+            </div>
+        </form>
     </header>
     <div class="nice-padding">
         {% if submissions %}
@@ -59,7 +64,7 @@
             {% include "wagtailadmin/shared/pagination_nav.html" with items=submissions is_searching=False linkurl='-' %}
             {# Here we pass an invalid non-empty URL name as linkurl to generate pagination links with the URL path omitted #}
         {% else %}
-            <p class="no-results-message">{% blocktrans with title=form_page.title %}No submissions of the '{{ title }}' form.{% endblocktrans %}</p>
+            <p class="no-results-message">{% blocktrans with title=form_page.title %}There have been no submissions of the '{{ title }}' form.{% endblocktrans %}</p>
         {% endif %}
     </div>
 {% endblock %}
diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py
index aa3d525df7..2174642c60 100644
--- a/wagtail/wagtailforms/views.py
+++ b/wagtail/wagtailforms/views.py
@@ -79,7 +79,7 @@ def list_submissions(request, page_id):
         return response
 
     p = request.GET.get('p', 1)
-    paginator = Paginator(submissions, 1)
+    paginator = Paginator(submissions, 20)
 
     try:
         submissions = paginator.page(p)