From 2aaec7c332c6b52b95389c786bade412101c52dd Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 20 May 2014 14:38:22 +0100
Subject: [PATCH 1/2] reordered fields

---
 wagtail/wagtailforms/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py
index cf794c86a..d04279c94 100644
--- a/wagtail/wagtailforms/models.py
+++ b/wagtail/wagtailforms/models.py
@@ -79,11 +79,11 @@ class AbstractFormField(Orderable):
 
     panels = [
         FieldPanel('label'),
-        FieldPanel('field_type', classname="formbuilder-type"),
+        FieldPanel('help_text'),
         FieldPanel('required'),
+        FieldPanel('field_type', classname="formbuilder-type"),
         FieldPanel('choices', classname="formbuilder-choices"),
         FieldPanel('default_value', classname="formbuilder-default"),
-        FieldPanel('help_text'),
     ]
 
     class Meta:

From e0438a81170dc79f55c3f2c431bdd51f31a0fdd4 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 21 May 2014 09:22:06 +0100
Subject: [PATCH 2/2] updates to allow better formatting of fields

---
 .../wagtailadmin/scss/components/forms.scss   | 41 ++++++++++++++++++-
 .../edit_handlers/field_panel_field.html      |  1 +
 .../wagtailadmin/shared/field_as_li.html      |  1 +
 .../templates/wagtailadmin/skeleton.html      |  9 ++--
 4 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 7eeb828f6..29c44b4f3 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -67,6 +67,41 @@ input, textarea, select, .richtext, .tagit{
     }
 }
 
+/* select boxes */
+.typed_choice_field .input{
+    position:relative;
+
+    select{
+        outline:none;
+    }
+
+    &:after{
+        @include border-radius(0 6px 6px 0);
+        z-index:0;
+        position:absolute;
+        right:1px;
+        top:1px;
+        height:95%;
+        width:1.5em;
+        font-family:wagtail;
+        content:"q";
+        border:1px solid $color-input-border;
+        border-width:0 0 0 1px;
+        text-align:center;
+        line-height:1.4em;
+        font-size:3em;
+        pointer-events:none;
+        color:$color-grey-3;
+        background-color:$color-fieldset-hover;
+        margin:0px 1px 0 0;
+    }
+
+    .ie &:after{
+        display:none;
+    }
+}
+
+/* radio and check boxes */
 input[type=radio], input[type=checkbox]{
     @include border-radius(0);
     cursor:pointer;
@@ -415,7 +450,7 @@ li.focused > .help{
 
 .fields li{
     padding-top:0.5em;
-    padding-bottom:1em;
+    padding-bottom:1.2em;
 }
 
 .field-content .input li{
@@ -637,6 +672,10 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         .file_field &{
             padding-top:0;
         }
+
+        .boolean_field &{
+            padding-bottom:0;
+        }
     }
 
     input[type=submit], input[type=reset], input[type=button], .button, button{
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html
index 49ef50e9a..472cae0b2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html
@@ -5,6 +5,7 @@
             {% block form_field %}
                 {{ field }}
             {% endblock %}
+            <span></span>
         </div>
         {% if field.help_text %}
             <p class="help">{{ field.help_text }}</p>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
index 89f2d6fa7..678dd67fd 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
@@ -7,6 +7,7 @@
                 {% block form_field %}
                     {{ field }}
                 {% endblock %}
+                <span></span>
             </div>
             {% if field.help_text %}
                 <p class="help">{{ field.help_text }}</p>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
index bc9475695..ac5038056 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
@@ -1,9 +1,10 @@
 <!doctype html>
 {% load compress %}
-<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"  lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
-<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"  lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
-<!--[if IE 8]>         <html class="no-js lt-ie9"  lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js"  lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <!--<![endif]-->
+<!--[if lt IE 7]>      <html class="no-js ie lt-ie9 lt-ie8 lt-ie7" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
+<!--[if IE 7]>         <html class="no-js ie lt-ie9 lt-ie8" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
+<!--[if IE 8]>         <html class="no-js ie lt-ie9" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
+<!--[if IE 9]>         <html class="no-js ie lt-ie10" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
+<!--[if gt IE 9]><!--> <html class="no-js"  lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <!--<![endif]-->
 <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />