From 5b6dd59f7b2be7476af04f234ecd90a9b8908db8 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 5 Feb 2014 11:55:54 +0000
Subject: [PATCH] merging from ui update branch

---
 wagtail/wagtailadmin/static/wagtailadmin/css/core.less    | 4 ++--
 .../templates/wagtailadmin/shared/header.html             | 8 ++++----
 wagtail/wagtaildocs/views/documents.py                    | 2 +-
 wagtail/wagtailimages/views/images.py                     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
index 54f1e4f539..e0959fcc88 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/core.less
@@ -18,7 +18,7 @@ max z-index: 5;
 @import "components/formatters.less";
 
 html{
-    background-color:@color-header-bg;
+    background-color:@color-grey-5;
 }
 
 body{
@@ -378,7 +378,7 @@ body.explorer-open .nav-main{
 header{
     padding-top:1.5em;
     padding-bottom:1em;
-    background-color: @color-grey-5;
+    background-color: @color-header-bg;
     border-bottom:1px solid @color-grey-4;
     margin-bottom:2em;
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
index 3039d801a3..1db8ef2776 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
@@ -1,13 +1,13 @@
-<header class="nice-padding {% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %} {% if form %}hasform{% endif %}">
+<header class="nice-padding {% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %} {% if search_form %}hasform{% endif %}">
     <div class="row row-flush">
-        <div class="left col{% if form %}6{% else %}9{% endif %}">
+        <div class="left col{% if search_form %}6{% else %}9{% endif %}">
             <h1>{{ title }} <span>{{ subtitle }}</span></h1>
         </div>
-        {% if form %}
+        {% if search_form %}
             <div class="left col3">
                 <form class="search-bar" action="{% url search_url %}" method="get">
                     <ul class="fields">
-                        {% for field in form %}
+                        {% for field in search_form %}
                             {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
                         {% endfor %}
                         <li class="submit"><input type="submit" value="Search" /></li>
diff --git a/wagtail/wagtaildocs/views/documents.py b/wagtail/wagtaildocs/views/documents.py
index 17747049d9..8b364f51c6 100644
--- a/wagtail/wagtaildocs/views/documents.py
+++ b/wagtail/wagtaildocs/views/documents.py
@@ -57,7 +57,7 @@ def index(request):
         })
     else:
         return render(request, "wagtaildocs/documents/index.html", {
-            'form': form,
+            'search_form': form,
             'documents': documents,
             'popular_tags': Document.popular_tags(),
             'is_searching': is_searching,
diff --git a/wagtail/wagtailimages/views/images.py b/wagtail/wagtailimages/views/images.py
index f8d9eeb136..27230c313f 100644
--- a/wagtail/wagtailimages/views/images.py
+++ b/wagtail/wagtailimages/views/images.py
@@ -57,7 +57,7 @@ def index(request):
         })
     else:
         return render(request, "wagtailimages/images/index.html", {
-            'form': form,
+            'search_form': form,
             'images': images,
             'is_searching': is_searching,
             'popular_tags': Image.popular_tags(),