From fdc89f5ea1008fec59f6e4a7b09780b823baa84d Mon Sep 17 00:00:00 2001 From: Neal Todd Date: Fri, 14 Feb 2014 13:26:17 +0000 Subject: [PATCH 1/4] Travis webhook for Slack --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index c7141cc47..72fe29fb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,9 @@ notifications: - wagtail-ci@torchbox.com on_success: change on_failure: always + webhooks: + urls: + - https://torchbox.slack.com/services/hooks/travis?token=Qs4aYF1Y5wJZAF797PKHShBI + on_success: change + on_failure: always From ae2cef1a585753cb46b730ceefcb0a3524732ea8 Mon Sep 17 00:00:00 2001 From: Tom Dyson Date: Fri, 14 Feb 2014 13:34:01 +0000 Subject: [PATCH 2/4] Added RCA screenshot to README --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index a454db209..1b2869acc 100644 --- a/README.rst +++ b/README.rst @@ -6,6 +6,8 @@ Wagtail CMS =========== +.. image:: http://i.imgur.com/4pbWQ35.png + Wagtail is a Django content management system built originally for the `Royal College of Art `_ and focused on flexibility and user experience. Its features include: * A fast, attractive editor interface From d93c47468dcc777a827c811a5b18e8861a515340 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Fri, 14 Feb 2014 15:14:26 +0000 Subject: [PATCH 3/4] added better means of identifying form errors across tabs --- .../wagtailadmin/css/components/tabs.less | 19 ++++++++ .../static/wagtailadmin/js/core.js | 44 ++++++++++--------- .../static/wagtailadmin/js/page-editor.js | 16 ++++++- 3 files changed, 56 insertions(+), 23 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less index 380b40a93..cf93b3aa4 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less @@ -7,6 +7,7 @@ width:48%; float:left; padding:0; + position:relative; &:before,&:after{ display:none; @@ -35,6 +36,24 @@ a.errors{ color:@color-red !important; + + &:after{ + .border-radius(50%); + .box-shadow(1px 1px 2px rgba(0, 0, 0, 0.2)); + position:absolute; + right:-0.5em; + top:-0.5em; + z-index:5; + min-width:1em; + color:white; + background:@color-red; + border:2px solid darken(@color-red,20%); + content:attr(data-count); + padding:0 0.3em; + line-height:1.4em; + text-align:center; + font-size:0.8em; + } } li.active a{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/core.js b/wagtail/wagtailadmin/static/wagtailadmin/js/core.js index 5c35629ca..f1ce40eb5 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/core.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/core.js @@ -108,27 +108,29 @@ $(function(){ }); /* Header search behaviour */ - var search_current_index = 0; - var search_next_index = 0; + if(window.headerSearch){ + var search_current_index = 0; + var search_next_index = 0; - $(window.headerSearch.termInput).on('input', function() { - clearTimeout($.data(this, 'timer')); - var wait = setTimeout(search, 200); - $(this).data('timer', wait); - }); + $(window.headerSearch.termInput).on('input', function() { + clearTimeout($.data(this, 'timer')); + var wait = setTimeout(search, 200); + $(this).data('timer', wait); + }); - function search () { - search_next_index++; - var index = search_next_index; - $.ajax({ - url: window.headerSearch.url, - data: {q: $(window.headerSearch.termInput).val()}, - success: function(data, status) { - if (index > search_current_index) { - search_current_index = index; - $(window.headerSearch.targetOutput).html(data); - } - }, - }); - }; + function search () { + search_next_index++; + var index = search_next_index; + $.ajax({ + url: window.headerSearch.url, + data: {q: $(window.headerSearch.termInput).val()}, + success: function(data, status) { + if (index > search_current_index) { + search_current_index = index; + $(window.headerSearch.targetOutput).html(data); + } + }, + }); + }; + } }); diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js index efceb8577..f6563a3c6 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js @@ -236,11 +236,23 @@ function initSlugCleaning(){ } function initErrorDetection(){ + var errorSections = {}; + + // first count up all the errors $('.error-message').each(function(){ var parentSection = $(this).closest('section'); - $('.tab-nav a[href=#'+ parentSection.attr('id') +']').addClass('errors'); - }) + if(!errorSections[parentSection.attr('id')]){ + errorSections[parentSection.attr('id')] = 0; + } + + errorSections[parentSection.attr('id')] = errorSections[parentSection.attr('id')]+1; + }); + + // now identify them on each tab + for(var index in errorSections) { + $('.tab-nav a[href=#'+ index +']').addClass('errors').attr('data-count', errorSections[index]); + } } $(function() { From 19f25dd28bd7ab842eccc723e59652ea9794c6c3 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Fri, 14 Feb 2014 15:22:10 +0000 Subject: [PATCH 4/4] nicer inset shadow on inactive tabs --- .../wagtailadmin/static/wagtailadmin/css/components/tabs.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less index cf93b3aa4..3ce8db99a 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less +++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/tabs.less @@ -14,6 +14,7 @@ } } a{ + .box-shadow(inset 0px -2px 3px 0 rgba(0,0,0,0.1)); .transition(border-color 0.2s ease); background-color:@color-grey-4; outline:none; @@ -26,7 +27,6 @@ padding:0 20px; color:@color-grey-2; border-top:0.3em solid darken(@color-grey-4,0%); - border-bottom:1px solid transparent; &:hover{ color:inherit; @@ -57,6 +57,7 @@ } li.active a{ + .box-shadow(none); color:@color-grey-1; background-color:white; border-top:0.3em solid @color-grey-1;