From 383bf1e384719de297d6953c3a7b770722f2a42a Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 12 Feb 2015 15:19:00 +0000 Subject: [PATCH 1/3] 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 %} -
+
{{ label_tag }}
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 @@ -
  • +
  • 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 From a8f4c3296dc785da3787ef4432853ac667ffd615 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 12 Feb 2015 15:24:43 +0000 Subject: [PATCH 2/3] labels for streamfield fields don't seem to get capitalized like normal django field labels --- .../static/wagtailadmin/scss/layouts/page-editor.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss index 061995fbd..bf42743da 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss @@ -181,6 +181,10 @@ &.stream-field { padding:0; + label{ + text-transform:capitalize; + } + &.required .field > label:after{ display:none; } From dfa18ba1315bd7ca8bbc81aa10c24dfeff41dfc4 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 12 Feb 2015 15:39:06 +0000 Subject: [PATCH 3/3] addressing hallo toolbar appearing in wrong place --- .../static/wagtailadmin/js/blocks/sequence.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js b/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js index 52e85b5f3..386dabdcb 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js @@ -35,12 +35,15 @@ For example, they don't assume the presence of a 'delete' button - it's up to th self.container.fadeOut(); }; self._markAdded = function() { - self.menu.addClass('stream-menu-closed'); self.container.hide(); self.container.slideDown(); - + + self.hideMenu(); + // focus first suitable input found - $('.input input,.input textarea,.input .richtext', self.container).first().focus(); + var timeout = setTimeout(function(){ + $('.input input,.input textarea,.input .richtext', self.container).first().focus(); + }, 10) }; self.getIndex = function() { return parseInt(indexField.val(), 10); @@ -73,7 +76,8 @@ For example, they don't assume the presence of a 'delete' button - it's up to th var members = []; self.menu = countField.siblings('.stream-menu'); - self.menu.click(function(){ + self.menu.click(function(e){ + e.preventDefault(); self.toggleMenu(); });