Merge branch 'master' of github.com:torchbox/wagtail

wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html

@@ -4,16 +4,15 @@
             <h2>Pages awaiting moderation</h2>
             <table class="listing">
                 <col />
-                <col width="15%"/>
-                <col width="15%"/>
+                <col />
                 <col width="15%"/>
                 <col width="15%"/>
                 <thead>
                     <tr>
                         <th class="title">Title</th>
+                        <th>Parent</th>
                         <th>Date</th>
                         <th>Author</th>
-                        <th>Parent</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -38,10 +37,9 @@
                                     <li><a href="{% url 'wagtailadmin_pages_preview_for_moderation' revision.id %}">Preview</a></li>
                                 </ul>
                             </td>
-                            <td><div class="human-readable-date" title="{{ revision.created_at|date:"d M Y H:i" }}">{{ revision.created_at|timesince }} ago </div></td>
-                            <td>{{ revision.user.get_full_name }}</td>
                             <td><a href="{% url 'wagtailadmin_explore' revision.page.get_parent.id %}">{{ revision.page.get_parent.title }}</a></td>
-                            
+                            <td><div class="human-readable-date" title="{{ revision.created_at|date:"d M Y H:i" }}">{{ revision.created_at|timesince }} ago </div></td>
+                            <td>{{ revision.user.get_full_name }}</td>                            
                         </tr>
                     {% endfor %}
                 </tbody>

wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html

@@ -36,18 +36,7 @@
 {% endblock %}
 
 {% block content %}
-    <header class="nice-padding">
-        <h1>Search</h1>
-    </header>
-
-    <form class="search-bar full-width nice-padding" action="{% url 'wagtailadmin_pages_search' %}" method="get">
-        <ul class="fields">
-            {% for field in form %}
-                {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
-            {% endfor %}
-            <li class="submit"><input type="submit" value="Search" /></li>
-        </ul>
-    </form>
+    {% include "wagtailadmin/shared/header.html" with title="Search" search_url="wagtailadmin_pages_search" %}
 
     <div id="page-results">
         {% include "wagtailadmin/pages/search_results.html" with show_parent="True" %}

wagtail/wagtailadmin/views/pages.py

@@ -566,7 +566,7 @@ def search(request):
         })
     else:
         return render(request, "wagtailadmin/pages/search.html", {
-            'form': form,
+            'search_form': form,
             'pages': pages,
             'is_searching': is_searching,
             'search_query': q,