From 383bf1e384719de297d6953c3a7b770722f2a42a Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 12 Feb 2015 15:19:00 +0000
Subject: [PATCH] tweaks to how specific types of field are rendered

---
 .../scss/layouts/page-editor.scss             | 48 +++++++++++++------
 .../wagtailadmin/block_forms/field.html       |  2 +-
 .../block_forms/sequence_member.html          |  2 +-
 .../templatetags/wagtailadmin_tags.py         |  6 ++-
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
index ede60e89c..061995fbd 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
@@ -212,7 +212,7 @@
             .sequence-member-inner{
                 @include clearfix;
                 position:relative;
-                padding:0em 50px 1em 50px;
+                padding:1.5em 50px;
 
                 > .sequence .sequence-inner{
                     @include column(10);
@@ -220,10 +220,6 @@
                     padding-right:0;
                 }
 
-                .sequence-member-inner{
-                    padding:0 0 1em 0;
-                }
-
                 > .struct-block > label,
                 > .char_field > label,
                 .sequence > label{
@@ -262,21 +258,47 @@
             padding-bottom:1.2em;
         }
 
-        .struct-block .char_field > label{
+        .struct-block .widget-text_input > label{
             display:none;
         }
 
-        input[type=text], input[type=url], input[type=email], input[type=numeric], .richtext, textarea{
+        .widget-text_input input, .richtext, textarea{
             border:0;
-            padding-left:0;
-            padding-right:0;
+            padding:0;
             background-color:transparent;
             max-width:1024px;
         }
 
-        .richtext.inEditMode{
-            padding-top:1em;
-            padding-bottom:1em;
+        .widget-admin_image_chooser{
+            label{
+                display:none;
+            }
+            .field-content{
+                display:block;
+                float:none;
+                width:100%;
+                text-align:center;
+                max-width:500px;
+                margin:auto;
+                border:1px solid $color-grey-4;
+                padding:1em;
+            }
+            .chooser{
+                .chosen{
+                    padding:0;
+                }
+                .unchosen{
+                    &:before{
+                        float:none;
+                        font-size:4em;
+                        margin:0;
+                    }
+                }
+                .preview-image{
+                    float:none;
+                    margin:0;
+                }
+            }
         }
     }
 
@@ -314,7 +336,6 @@
         @include box-shadow(inset 0 0 45px rgba(0,0,0,0.3));
         position:relative;
         background-color:$color-grey-1;
-        border-top:1px solid transparent;
         opacity:1;
         z-index:5;
 
@@ -417,7 +438,6 @@
         &.stream-menu-closed{
             @include box-shadow(none);
             height:0px;
-            border-top:1px solid lighten($color-grey-4, 3%);
 
             .toggle{
                 color:$color-grey-3;
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/field.html b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/field.html
index 0118759cc..01c2f972a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/field.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/field.html
@@ -1,5 +1,5 @@
 {% load wagtailadmin_tags %}
-<div class="field {{ field|fieldtype }} fieldname-{{ name }} {{ classes }} ">
+<div class="field {{ field|fieldtype }} widget-{{ field|widgettype }} fieldname-{{ name }} {{ classes }} ">
     {{ label_tag }}
     <div class="field-content">
         <div class="input">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/sequence_member.html b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/sequence_member.html
index c40fed301..5466cf55e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/sequence_member.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/sequence_member.html
@@ -1,4 +1,4 @@
-<li id="{{ prefix }}-container" class="sequence-member sequencename-{{ block_type_name }}">
+<li id="{{ prefix }}-container" class="sequence-member blockname-{{ block_type_name }}">
     <input type="hidden" id="{{ prefix }}-deleted" name="{{ prefix }}-deleted" value="">
     <input type="hidden" id="{{ prefix }}-order" name="{{ prefix }}-order" value="{{ index }}">
     
diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
index 650e49f35..fb3fa5ff3 100644
--- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
+++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
@@ -68,7 +68,11 @@ def widgettype(bound_field):
     try:
         return camelcase_to_underscore(bound_field.field.widget.__class__.__name__)
     except AttributeError:
-        return ""
+        try:
+            return camelcase_to_underscore(bound_field.widget.__class__.__name__)
+        except AttributeError: 
+            return ""
+
 
 
 @register.filter