-
+
- color-salmon +
- color-salmon-light
- color-grey-1 @@ -54,6 +55,12 @@
- color-grey-4
- color-grey-5
-
+
- color-red +
- color-orange +
- color-green +
+
+
+
+
+
+
+
+
+
+ come celebrate the independence of Ameristralia
", + "cost": "Free" } }, @@ -276,6 +307,16 @@ ] } }, +{ + "pk": 6, + "model": "auth.group", + "fields": { + "name": "Admin non-editors", + "permissions": [ + ["access_admin", "wagtailadmin", "admin"] + ] + } +}, { "pk": 1, "model": "wagtailcore.grouppagepermission", @@ -411,6 +452,24 @@ "email": "siteeditor@example.com" } }, +{ + "pk": 6, + "model": "auth.user", + "fields": { + "username": "admin_only_user", + "first_name": "", + "last_name": "", + "is_active": true, + "is_superuser": false, + "is_staff": false, + "groups": [ + ["Admin non-editors"] + ], + "user_permissions": [], + "password": "md5$seasalt$1e9bf2bf5606aa5c39852cc30f0f6f22", + "email": "admin_only_user@example.com" + } +}, { "pk": 1, @@ -429,5 +488,23 @@ "page": 8, "submit_time": "2014-01-01T12:00:00.000Z" } +}, +{ + "pk": 1, + "model": "wagtaildocs.Document", + "fields": { + "title": "test document", + "created_at": "2014-01-01T12:00:00.000Z" + } +}, +{ + "pk": 1, + "model": "wagtailimages.Image", + "fields": { + "title": "test image", + "created_at": "2014-01-01T12:00:00.000Z", + "width": 0, + "height": 0 + } } ] diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py index ca6d411da..ff6dc2dcc 100644 --- a/wagtail/tests/models.py +++ b/wagtail/tests/models.py @@ -1,6 +1,9 @@ from django.db import models from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.utils.encoding import python_2_unicode_compatible + from modelcluster.fields import ParentalKey + from wagtail.wagtailcore.models import Page, Orderable from wagtail.wagtailcore.fields import RichTextField from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel, InlinePanel, PageChooserPanel @@ -259,6 +262,7 @@ FormPage.content_panels = [ # Snippets +@python_2_unicode_compatible class Advert(models.Model): url = models.URLField(null=True, blank=True) text = models.CharField(max_length=255) @@ -268,7 +272,7 @@ class Advert(models.Model): FieldPanel('text'), ] - def __unicode__(self): + def __str__(self): return self.text @@ -281,18 +285,20 @@ register_snippet(Advert) # to ensure specific [in]correct register ordering # AlphaSnippet is registered during TestSnippetOrdering +@python_2_unicode_compatible class AlphaSnippet(models.Model): text = models.CharField(max_length=255) - def __unicode__(self): + def __str__(self): return self.text # ZuluSnippet is registered during TestSnippetOrdering +@python_2_unicode_compatible class ZuluSnippet(models.Model): text = models.CharField(max_length=255) - def __unicode__(self): + def __str__(self): return self.text diff --git a/wagtail/tests/templates/tests/event_page.html b/wagtail/tests/templates/tests/event_page.html index b60bc6058..795b7bf0a 100644 --- a/wagtail/tests/templates/tests/event_page.html +++ b/wagtail/tests/templates/tests/event_page.html @@ -1,4 +1,5 @@ -{% load pageurl %} +{% load wagtailcore_tags %} + diff --git a/wagtail/tests/templates/tests/form_page.html b/wagtail/tests/templates/tests/form_page.html index 5fbd2ae9f..d908c60a2 100644 --- a/wagtail/tests/templates/tests/form_page.html +++ b/wagtail/tests/templates/tests/form_page.html @@ -1,4 +1,5 @@ -{% load pageurl %} +{% load wagtailcore_tags %} + diff --git a/wagtail/tests/templates/tests/form_page_landing.html b/wagtail/tests/templates/tests/form_page_landing.html index e29a6a942..d9a6369d4 100644 --- a/wagtail/tests/templates/tests/form_page_landing.html +++ b/wagtail/tests/templates/tests/form_page_landing.html @@ -1,4 +1,5 @@ -{% load pageurl %} +{% load wagtailcore_tags %} + diff --git a/wagtail/tests/templates/tests/includes/event_listing.html b/wagtail/tests/templates/tests/includes/event_listing.html index 31c0b1b3b..02f880ec4 100644 --- a/wagtail/tests/templates/tests/includes/event_listing.html +++ b/wagtail/tests/templates/tests/includes/event_listing.html @@ -1,4 +1,4 @@ -{% load pageurl %} +{% load wagtailcore_tags %}-
{% for event in events %}
diff --git a/wagtail/tests/templates/tests/simple_page.html b/wagtail/tests/templates/tests/simple_page.html
index 3413b3aa2..1f3593514 100644
--- a/wagtail/tests/templates/tests/simple_page.html
+++ b/wagtail/tests/templates/tests/simple_page.html
@@ -1,4 +1,5 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
+
diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py
index d04c871a3..83e12adfb 100644
--- a/wagtail/tests/urls.py
+++ b/wagtail/tests/urls.py
@@ -4,6 +4,7 @@ from wagtail.wagtailcore import urls as wagtail_urls
from wagtail.wagtailadmin import urls as wagtailadmin_urls
from wagtail.wagtaildocs import urls as wagtaildocs_urls
from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls
+from wagtail.contrib.wagtailsitemaps.views import sitemap
# Signal handlers
from wagtail.wagtailsearch import register_signal_handlers as wagtailsearch_register_signal_handlers
@@ -15,6 +16,8 @@ urlpatterns = patterns('',
url(r'^search/', include(wagtailsearch_frontend_urls)),
url(r'^documents/', include(wagtaildocs_urls)),
+ url(r'^sitemap\.xml$', sitemap),
+
# For anything not caught by a more specific rule above, hand over to
# Wagtail's serving mechanism
url(r'', include(wagtail_urls)),
diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py
index 02327799b..c44549401 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -1,7 +1,4 @@
-from django.test import TestCase
from django.contrib.auth.models import User
-from django.utils.six.moves.urllib.parse import urlparse, ParseResult
-from django.http import QueryDict
# We need to make sure that we're using the same unittest library that Django uses internally
# Otherwise, we get issues with the "SkipTest" and "ExpectedFailure" exceptions being recognised as errors
diff --git a/wagtail/tests/wagtail_hooks.py b/wagtail/tests/wagtail_hooks.py
index 5dccca666..13e3e46d2 100644
--- a/wagtail/tests/wagtail_hooks.py
+++ b/wagtail/tests/wagtail_hooks.py
@@ -1,4 +1,4 @@
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
from wagtail.wagtailcore.whitelist import attribute_rule, check_url, allow_without_attributes
def editor_css():
diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index a15440016..ba6edc4fa 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -1,6 +1,9 @@
+from __future__ import unicode_literals
+
import copy
-import re
-import datetime
+
+from six import string_types
+from six import text_type
from taggit.forms import TagWidget
from modelcluster.forms import ClusterForm, ClusterFormMetaclass
@@ -9,13 +12,10 @@ from django.template.loader import render_to_string
from django.template.defaultfilters import addslashes
from django.utils.safestring import mark_safe
from django import forms
-from django.db import models
from django.forms.models import fields_for_model
from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured, ValidationError
+from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
from django.core.urlresolvers import reverse
-from django.conf import settings
-from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
from wagtail.wagtailcore.models import Page
@@ -72,7 +72,7 @@ class WagtailAdminModelFormMetaclass(ClusterFormMetaclass):
new_class = super(WagtailAdminModelFormMetaclass, cls).__new__(cls, name, bases, attrs)
return new_class
-WagtailAdminModelForm = WagtailAdminModelFormMetaclass('WagtailAdminModelForm', (ClusterForm,), {})
+WagtailAdminModelForm = WagtailAdminModelFormMetaclass(str('WagtailAdminModelForm'), (ClusterForm,), {})
# Now, any model forms built off WagtailAdminModelForm instead of ModelForm should pick up
# the nice form fields defined in FORM_FIELD_OVERRIDES.
@@ -108,7 +108,7 @@ def get_form_for_model(
# Give this new form class a reasonable name.
class_name = model.__name__ + str('Form')
form_class_attrs = {
- 'Meta': type('Meta', (object,), attrs)
+ 'Meta': type(str('Meta'), (object,), attrs)
}
return WagtailAdminModelFormMetaclass(class_name, (WagtailAdminModelForm,), form_class_attrs)
@@ -140,6 +140,10 @@ def extract_panel_definitions_from_model_class(model, exclude=None):
return panels
+def set_page_edit_handler(page_class, handlers):
+ page_class.handlers = handlers
+
+
class EditHandler(object):
"""
Abstract class providing sensible default behaviours for objects implementing
@@ -183,19 +187,21 @@ class EditHandler(object):
heading = ""
help_text = ""
- def object_classnames(self):
+ def classes(self):
"""
- Additional classnames to add to the
- when rendering this - within an ObjectList + Additional CSS classnames to add to whatever kind of object this is at output. + Subclasses of EditHandler should override this, invoking super(B, self).classes() to + append more classes specific to the situation. """ - return "" - def field_classnames(self): - """ - Additional classnames to add to the
- when rendering this within a
-
-
- """
- return ""
+ classes = []
+
+ try:
+ classes.append(self.classname)
+ except AttributeError:
+ pass
+
+ return classes
def field_type(self):
"""
@@ -239,12 +245,12 @@ class EditHandler(object):
"""
rendered_fields = self.rendered_fields()
missing_fields_html = [
- unicode(self.form[field_name])
+ text_type(self.form[field_name])
for field_name in self.form.fields
if field_name not in rendered_fields
]
- return mark_safe(u''.join(missing_fields_html))
+ return mark_safe(''.join(missing_fields_html))
def render_form_content(self):
"""
@@ -261,12 +267,6 @@ class BaseCompositeEditHandler(EditHandler):
"""
_widget_overrides = None
- def object_classnames(self):
- try:
- return "multi-field " + self.classname
- except (AttributeError, TypeError):
- return "multi-field"
-
@classmethod
def widget_overrides(cls):
if cls._widget_overrides is None:
@@ -304,7 +304,7 @@ class BaseCompositeEditHandler(EditHandler):
}))
def render_js(self):
- return mark_safe(u'\n'.join([handler.render_js() for handler in self.children]))
+ return mark_safe('\n'.join([handler.render_js() for handler in self.children]))
def rendered_fields(self):
result = []
@@ -319,26 +319,41 @@ class BaseTabbedInterface(BaseCompositeEditHandler):
def TabbedInterface(children):
- return type('_TabbedInterface', (BaseTabbedInterface,), {'children': children})
+ return type(str('_TabbedInterface'), (BaseTabbedInterface,), {'children': children})
class BaseObjectList(BaseCompositeEditHandler):
template = "wagtailadmin/edit_handlers/object_list.html"
-def ObjectList(children, heading=""):
- return type('_ObjectList', (BaseObjectList,), {
+def ObjectList(children, heading="", classname=""):
+ return type(str('_ObjectList'), (BaseObjectList,), {
'children': children,
'heading': heading,
+ 'classname': classname
})
+class BaseFieldRowPanel(BaseCompositeEditHandler):
+ template = "wagtailadmin/edit_handlers/field_row_panel.html"
+
+def FieldRowPanel(children, classname=""):
+ return type(str('_FieldRowPanel'), (BaseFieldRowPanel,), {
+ 'children': children,
+ 'classname': classname,
+ })
+
class BaseMultiFieldPanel(BaseCompositeEditHandler):
template = "wagtailadmin/edit_handlers/multi_field_panel.html"
+ def classes(self):
+ classes = super(BaseMultiFieldPanel, self).classes()
+ classes.append("multi-field")
+
+ return classes
-def MultiFieldPanel(children, heading="", classname=None):
- return type('_MultiFieldPanel', (BaseMultiFieldPanel,), {
+def MultiFieldPanel(children, heading="", classname=""):
+ return type(str('_MultiFieldPanel'), (BaseMultiFieldPanel,), {
'children': children,
'heading': heading,
'classname': classname,
@@ -353,25 +368,23 @@ class BaseFieldPanel(EditHandler):
self.heading = self.bound_field.label
self.help_text = self.bound_field.help_text
- def object_classnames(self):
- try:
- return "single-field " + self.classname
- except (AttributeError, TypeError):
- return "single-field"
+ def classes(self):
+ classes = super(BaseFieldPanel, self).classes();
+
+ if self.bound_field.field.required:
+ classes.append("required")
+ if self.bound_field.errors:
+ classes.append("error")
+
+ classes.append(self.field_type())
+ classes.append("single-field")
+
+ return classes
def field_type(self):
return camelcase_to_underscore(self.bound_field.field.__class__.__name__)
- def field_classnames(self):
- classname = self.field_type()
- if self.bound_field.field.required:
- classname += " required"
- if self.bound_field.errors:
- classname += " error"
-
- return classname
-
- object_template = "wagtailadmin/edit_handlers/field_panel_object.html"
+ object_template = "wagtailadmin/edit_handlers/single_field_panel.html"
def render_as_object(self):
return mark_safe(render_to_string(self.object_template, {
@@ -401,8 +414,8 @@ class BaseFieldPanel(EditHandler):
return [self.field_name]
-def FieldPanel(field_name, classname=None):
- return type('_FieldPanel', (BaseFieldPanel,), {
+def FieldPanel(field_name, classname=""):
+ return type(str('_FieldPanel'), (BaseFieldPanel,), {
'field_name': field_name,
'classname': classname,
})
@@ -414,7 +427,7 @@ class BaseRichTextFieldPanel(BaseFieldPanel):
def RichTextFieldPanel(field_name):
- return type('_RichTextFieldPanel', (BaseRichTextFieldPanel,), {
+ return type(str('_RichTextFieldPanel'), (BaseRichTextFieldPanel,), {
'field_name': field_name,
})
@@ -470,7 +483,7 @@ class BasePageChooserPanel(BaseChooserPanel):
def target_content_type(cls):
if cls._target_content_type is None:
if cls.page_type:
- if isinstance(cls.page_type, basestring):
+ if isinstance(cls.page_type, string_types):
# translate the passed model name into an actual model class
from django.db.models import get_model
try:
@@ -505,7 +518,7 @@ class BasePageChooserPanel(BaseChooserPanel):
def PageChooserPanel(field_name, page_type=None):
- return type('_PageChooserPanel', (BasePageChooserPanel,), {
+ return type(str('_PageChooserPanel'), (BasePageChooserPanel,), {
'field_name': field_name,
'page_type': page_type,
})
@@ -588,7 +601,7 @@ class BaseInlinePanel(EditHandler):
def InlinePanel(base_model, relation_name, panels=None, label='', help_text=''):
rel = getattr(base_model, relation_name).related
- return type('_InlinePanel', (BaseInlinePanel,), {
+ return type(str('_InlinePanel'), (BaseInlinePanel,), {
'relation_name': relation_name,
'related': rel,
'panels': panels,
@@ -597,10 +610,23 @@ def InlinePanel(base_model, relation_name, panels=None, label='', help_text=''):
})
+# This allows users to include the publishing panel in their own per-model override
+# without having to write these fields out by hand, potentially losing 'classname'
+# and therefore the associated styling of the publishing panel
+def PublishingPanel():
+ return MultiFieldPanel([
+ FieldRowPanel([
+ FieldPanel('go_live_at'),
+ FieldPanel('expire_at'),
+ ], classname="label-above"),
+ ], ugettext_lazy('Scheduled publishing'), classname="publishing")
+
+
# Now that we've defined EditHandlers, we can set up wagtailcore.Page to have some.
Page.content_panels = [
FieldPanel('title', classname="full title"),
]
+
Page.promote_panels = [
MultiFieldPanel([
FieldPanel('slug'),
@@ -609,3 +635,7 @@ Page.promote_panels = [
FieldPanel('search_description'),
], ugettext_lazy('Common page configuration')),
]
+
+Page.settings_panels = [
+ PublishingPanel()
+]
diff --git a/wagtail/wagtailadmin/hooks.py b/wagtail/wagtailadmin/hooks.py
index d299c3346..989c43bd8 100644
--- a/wagtail/wagtailadmin/hooks.py
+++ b/wagtail/wagtailadmin/hooks.py
@@ -1,38 +1,11 @@
-from django.conf import settings
-try:
- from importlib import import_module
-except ImportError:
- # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7)
- from django.utils.importlib import import_module
+# The 'hooks' module is now part of wagtailcore.
+# Imports are provided here for backwards compatibility
-_hooks = {}
+import warnings
-# TODO: support 'register' as a decorator:
-# @hooks.register('construct_main_menu')
-# def construct_main_menu(menu_items):
-# ...
+warnings.warn(
+ "The wagtail.wagtailadmin.hooks module has been moved. "
+ "Use wagtail.wagtailcore.hooks instead.", DeprecationWarning)
-def register(hook_name, fn):
- if hook_name not in _hooks:
- _hooks[hook_name] = []
- _hooks[hook_name].append(fn)
-
-_searched_for_hooks = False
-
-
-def search_for_hooks():
- global _searched_for_hooks
- if not _searched_for_hooks:
- for app_module in settings.INSTALLED_APPS:
- try:
- import_module('%s.wagtail_hooks' % app_module)
- except ImportError:
- continue
-
- _searched_for_hooks = True
-
-
-def get_hooks(hook_name):
- search_for_hooks()
- return _hooks.get(hook_name, [])
+from wagtail.wagtailcore.hooks import register, get_hooks
diff --git a/wagtail/wagtailadmin/menu.py b/wagtail/wagtailadmin/menu.py
index b99e3b0ee..74e3c406c 100644
--- a/wagtail/wagtailadmin/menu.py
+++ b/wagtail/wagtailadmin/menu.py
@@ -1,3 +1,7 @@
+from __future__ import unicode_literals
+
+from six import text_type
+
from django.utils.text import slugify
from django.utils.html import format_html
@@ -7,10 +11,10 @@ class MenuItem(object):
self.label = label
self.url = url
self.classnames = classnames
- self.name = (name or slugify(unicode(label)))
+ self.name = (name or slugify(text_type(label)))
self.order = order
def render_html(self):
return format_html(
- u"""""",
+ """""",
self.name, self.url, self.classnames, self.label)
diff --git a/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py b/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py
index b9ef11382..44a6c1b62 100644
--- a/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py
+++ b/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import DataMigration
@@ -20,7 +22,7 @@ class Migration(DataMigration):
wagtailadmin_content_type = orm['contenttypes.ContentType'].objects.create(
app_label='wagtailadmin', model='admin', name='Wagtail admin')
admin_permission = orm['auth.permission'].objects.create(
- content_type=wagtailadmin_content_type, codename='access_admin', name=u'Can access Wagtail admin')
+ content_type=wagtailadmin_content_type, codename='access_admin', name='Can access Wagtail admin')
for group in orm['auth.group'].objects.filter(name__in=['Editors', 'Moderators']):
group.permissions.add(admin_permission)
@@ -32,23 +34,23 @@ class Migration(DataMigration):
wagtailadmin_content_type.delete()
models = {
- u'auth.group': {
+ 'auth.group': {
'Meta': {'object_name': 'Group'},
- u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
- u'auth.permission': {
- 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
- u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
- u'contenttypes.contenttype': {
+ 'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
diff --git a/wagtail/wagtailadmin/signals.py b/wagtail/wagtailadmin/signals.py
new file mode 100644
index 000000000..f1c1bcb28
--- /dev/null
+++ b/wagtail/wagtailadmin/signals.py
@@ -0,0 +1,4 @@
+from django.dispatch import Signal
+
+
+init_new_page = Signal(providing_args=['page', 'parent'])
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
deleted file mode 100644
index 8e93b8543..000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
+++ /dev/null
@@ -1,97 +0,0 @@
-(function(jQuery) {
- return jQuery.widget('IKS.halloToolbarFixed', {
- toolbar: null,
- options: {
- parentElement: 'body',
- editable: null,
- toolbar: null,
- affix: true,
- affixTopOffset: 2
- },
- _create: function() {
- var el, widthToAdd,
- _this = this;
- this.toolbar = this.options.toolbar;
- this.toolbar.show();
- jQuery(this.options.parentElement).append(this.toolbar);
- this._bindEvents();
- jQuery(window).resize(function(event) {
- return _this.setPosition();
- });
- jQuery(window).scroll(function(event) {
- return _this.setPosition();
- });
- if (this.options.parentElement === 'body') {
- el = jQuery(this.element);
- widthToAdd = parseFloat(el.css('padding-left'));
- widthToAdd += parseFloat(el.css('padding-right'));
- widthToAdd += parseFloat(el.css('border-left-width'));
- widthToAdd += parseFloat(el.css('border-right-width'));
- widthToAdd += (parseFloat(el.css('outline-width'))) * 2;
- widthToAdd += (parseFloat(el.css('outline-offset'))) * 2;
- return jQuery(this.toolbar).css("width", el.width() + widthToAdd);
- }
- },
- _getPosition: function(event, selection) {
- var offset, position, width;
- if (!event) {
- return;
- }
- width = parseFloat(this.element.css('outline-width'));
- offset = width + parseFloat(this.element.css('outline-offset'));
- return position = {
- top: this.element.offset().top - this.toolbar.outerHeight() - offset,
- left: this.element.offset().left - offset
- };
- },
- _getCaretPosition: function(range) {
- var newRange, position, tmpSpan;
- tmpSpan = jQuery("");
- newRange = rangy.createRange();
- newRange.setStart(range.endContainer, range.endOffset);
- newRange.insertNode(tmpSpan.get(0));
- position = {
- top: tmpSpan.offset().top,
- left: tmpSpan.offset().left
- };
- tmpSpan.remove();
- return position;
- },
- setPosition: function() {
- var elementBottom, elementTop, height, offset, scrollTop, topOffset;
- if (this.options.parentElement !== 'body') {
- return;
- }
-
- this.toolbar.css('top', this.element.offset().top - this.toolbar.outerHeight());
-
- if (this.options.affix) {
- this.toolbar.removeClass('affixed');
- scrollTop = jQuery(window).scrollTop();
- offset = this.element.offset();
- height = this.element.height();
- topOffset = this.options.affixTopOffset;
- elementTop = offset.top - (this.toolbar.height() + this.options.affixTopOffset);
- elementBottom = (height - topOffset) + (offset.top - this.toolbar.height());
- if (scrollTop > elementTop && scrollTop < elementBottom) {
- this.toolbar.addClass('affixed');
- this.toolbar.css('top', this.options.affixTopOffset);
- }
- } else {
-
- }
- return this.toolbar;
- },
- _updatePosition: function(position) {},
- _bindEvents: function() {
- var _this = this;
- this.element.on('halloactivated', function(event, data) {
- _this.setPosition();
- return _this.toolbar.show();
- });
- return this.element.on('hallodeactivated', function(event, data) {
- return _this.toolbar.hide();
- });
- }
- });
-})(jQuery);
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 03adb7aca..a5dd67eeb 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -1,11 +1,14 @@
+"use strict";
+
var halloPlugins = {
'halloformat': {},
'halloheadings': {formatBlocks: ["p", "h2", "h3", "h4", "h5"]},
'hallolists': {},
'hallohr': {},
'halloreundo': {},
- 'hallowagtaillink': {},
+ 'hallowagtaillink': {}
};
+
function registerHalloPlugin(name, opts) {
halloPlugins[name] = (opts || {});
}
@@ -30,7 +33,7 @@ function makeRichTextEditable(id) {
richText.hallo({
toolbar: 'halloToolbarFixed',
- toolbarcssClass: 'testy',
+ toolbarCssClass: (input.closest('.object').hasClass('full')) ? 'full' : '',
plugins: halloPlugins
}).bind('hallomodified', function(event, data) {
input.val(data.content);
@@ -57,6 +60,7 @@ function initDateChooser(id) {
if (window.dateTimePickerTranslations) {
$('#' + id).datetimepicker({
timepicker: false,
+ scrollInput:false,
format: 'Y-m-d',
i18n: {
lang: window.dateTimePickerTranslations
@@ -66,6 +70,7 @@ function initDateChooser(id) {
} else {
$('#' + id).datetimepicker({
timepicker: false,
+ scrollInput:false,
format: 'Y-m-d',
});
}
@@ -75,6 +80,7 @@ function initTimeChooser(id) {
if (window.dateTimePickerTranslations) {
$('#' + id).datetimepicker({
datepicker: false,
+ scrollInput:false,
format: 'H:i',
i18n: {
lang: window.dateTimePickerTranslations
@@ -93,6 +99,7 @@ function initDateTimeChooser(id) {
if (window.dateTimePickerTranslations) {
$('#' + id).datetimepicker({
format: 'Y-m-d H:i',
+ scrollInput:false,
i18n: {
lang: window.dateTimePickerTranslations
},
@@ -197,7 +204,7 @@ function InlinePanel(opts) {
self.updateMoveButtonDisabledStates = function() {
if (opts.canOrder) {
- forms = self.formsUl.children('li:visible');
+ var forms = self.formsUl.children('li:visible');
forms.each(function(i) {
$('ul.controls .inline-child-move-up', this).toggleClass('disabled', i === 0).toggleClass('enabled', i !== 0);
$('ul.controls .inline-child-move-down', this).toggleClass('disabled', i === forms.length - 1).toggleClass('enabled', i != forms.length - 1);
@@ -240,7 +247,10 @@ function InlinePanel(opts) {
}
self.initChildControls(fixPrefix(opts.emptyChildFormPrefix));
if (opts.canOrder) {
- $(fixPrefix('#id_' + opts.emptyChildFormPrefix + '-ORDER')).val(formCount);
+ /* NB form hidden inputs use 0-based index and only increment formCount *after* this function is run.
+ Therefore formcount and order are currently equal and order must be incremented
+ to ensure it's *greater* than previous item */
+ $(fixPrefix('#id_' + opts.emptyChildFormPrefix + '-ORDER')).val(formCount + 1);
}
self.updateMoveButtonDisabledStates();
@@ -331,36 +341,65 @@ $(function() {
/* Set up behaviour of preview button */
$('.action-preview').click(function(e) {
e.preventDefault();
+ var $this = $(this);
- var previewWindow = window.open($(this).data('placeholder'), $(this).data('windowname'));
-
- $.ajax({
- type: "POST",
- url: $(this).data('action'),
- data: $('#page-edit-form').serialize(),
- success: function(data, textStatus, request) {
- if (request.getResponseHeader('X-Wagtail-Preview') == 'ok') {
- previewWindow.document.open();
- previewWindow.document.write(data);
- previewWindow.document.close();
- } else {
- previewWindow.close();
- document.open();
- document.write(data);
- document.close();
- }
- },
- error: function(xhr, textStatus, errorThrown) {
- /* If an error occurs, display it in the preview window so that
- we aren't just showing the spinner forever. We preserve the original
- error output rather than giving a 'friendly' error message so that
- developers can debug template errors. (On a production site, we'd
- typically be serving a friendly custom 500 page anyhow.) */
-
- previewWindow.document.open();
- previewWindow.document.write(xhr.responseText);
- previewWindow.document.close();
+ var previewWindow = window.open($this.data('placeholder'), $this.data('windowname'));
+
+ if(/MSIE/.test(navigator.userAgent)){
+ submitPreview.call($this, false);
+ } else {
+ previewWindow.onload = function(){
+ submitPreview.call($this, true);
}
- });
+ }
+
+ function submitPreview(enhanced){
+ $.ajax({
+ type: "POST",
+ url: $this.data('action'),
+ data: $('#page-edit-form').serialize(),
+ success: function(data, textStatus, request) {
+ if (request.getResponseHeader('X-Wagtail-Preview') == 'ok') {
+ var pdoc = previewWindow.document;
+
+ if(enhanced){
+ var frame = pdoc.getElementById('preview-frame');
+
+ frame = frame.contentWindow || frame.contentDocument.document || frame.contentDocument;
+ frame.document.open();
+ frame.document.write(data);
+ frame.document.close();
+
+ var hideTimeout = setTimeout(function(){
+ pdoc.getElementById('loading-spinner-wrapper').className += 'remove';
+ clearTimeout(hideTimeout);
+ }) // just enough to give effect without adding discernible slowness
+ } else {
+ pdoc.open();
+ pdoc.write(data);
+ pdoc.close()
+ }
+ } else {
+ previewWindow.close();
+ document.open();
+ document.write(data);
+ document.close();
+ }
+ },
+ error: function(xhr, textStatus, errorThrown) {
+ /* If an error occurs, display it in the preview window so that
+ we aren't just showing the spinner forever. We preserve the original
+ error output rather than giving a 'friendly' error message so that
+ developers can debug template errors. (On a production site, we'd
+ typically be serving a friendly custom 500 page anyhow.) */
+
+ previewWindow.document.open();
+ previewWindow.document.write(xhr.responseText);
+ previewWindow.document.close();
+ }
+ });
+
+ }
+
});
});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
index af5950fdb..9e4655dc4 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
@@ -2829,6 +2829,7 @@
} else {
}
+
return this.toolbar.css('left', this.element.offset().left - 2);
},
_updatePosition: function(position) {},
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss
index 078c93469..4902c2418 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss
@@ -246,7 +246,7 @@
.xdsoft_calendar td.xdsoft_default,
.xdsoft_calendar td.xdsoft_current,
.xdsoft_timepicker .xdsoft_time_box > div > div.xdsoft_current{
- background: $color-orange;
+ background: $color-salmon;
color:#fff;
font-weight: 700;
}
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
index 1428f0fd9..d9e61a2cc 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/dropdowns.scss
@@ -2,29 +2,19 @@
position:relative;
@include clearfix();
- .dropdown-toggle{
- color:white;
- text-transform:uppercase;
- background-color:$color-teal;
- line-height:3em;
- padding-left:1em;
- padding-right:1em;
- cursor:pointer;
-
- &:before,
- &:after{
- margin:0;
- }
- }
-
- input[type=button], input[type=submit], button, .button{
- padding:1em 0;
+ input[type=submit], input[type=reset], input[type=button], button, .button{
+ padding:0;
display:block;
width:100%;
+ height:3em;
+ line-height:3em;
text-align:left;
padding-left:1em;
+ float:left;
+ }
+ input[type=submit], input[type=reset], input[type=button], button{
+ line-height:inherit;
}
-
ul{
@include unlist();
@@ -41,6 +31,7 @@
border-color: rgba(255,255,255,0.2);
border-style: solid;
border-width:1px 0 0 0;
+ overflow:hidden;
}
a{
@@ -115,25 +106,26 @@
li{
border-width:0 0 1px 0;
}
- }
+ }
-
- .button{
- float:left;
-
- &:hover{
- background-color:$color-teal-darker;
- }
- }
-
- & > .button + .dropdown-toggle{
+ .dropdown-toggle{
+ color:white;
+ text-transform:uppercase;
+ background-color:$color-teal;
+ line-height:2.8em;
+ cursor:pointer;
+ height:100%;
border-left:1px solid rgba(255,255,255,0.2);
position:absolute;
right:0;
- height:100%;
padding:0 0.5em;
text-align:center;
+ &:before,
+ &:after{
+ margin:0;
+ }
+
&:before{
width:1em;
font-size:1.2rem;
@@ -143,7 +135,8 @@
background-color:$color-teal-darker;
}
}
- &.open > .button + .dropdown-toggle{
+
+ &.open .dropdown-toggle{
background-color:$color-teal-darker;
}
@@ -193,55 +186,6 @@
}
}
-h2 .dropdown{
- display:inline-block;
- font-size:0.7em;
- margin-right:0.5em;
- vertical-align:middle;
-
- .dropdown-toggle{
- padding:0.5em 0;
- border-right:1px solid $color-grey-3;
-
- /* icon */
- &:before{
- opacity:0.5;
- padding:0.2em;
- height:1.1em;
- text-align:left;
- }
- &:hover{
- background-color:$color-teal;
- border-color:transparent;
- }
- }
- &.open{
- .dropdown-toggle{
- background-color:$color-teal;
- }
-
- ul{
- left:auto;
- }
- }
-
- .dropdown-toggle:hover{
- background-color:$color-grey-3;
- &:before{
- color:white;
- opacity:1;
- }
- }
- &.open .dropdown-toggle:before{
- background-color:$color-teal;
- color:white;
- opacity:1;
- }
-
-
-}
-
-
/* Transitions */
.dropdown ul{
@include transition(opacity 0.2s linear);
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 3a14a17ae..3a8f67ba2 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -1,3 +1,9 @@
+/*
+ These are the generic stylings for forms of any type.
+ If you're styling something specific to the page editing interface,
+ it probably ought to go in layouts/page-editor.scss
+*/
+
form {
ul, li{
list-style-type:none;
@@ -6,9 +12,6 @@ form {
margin:0;
padding:0;
}
- li{
- @include row();
- }
}
fieldset{
@@ -55,6 +58,7 @@ input, textarea, select, .richtext, .tagit{
border: 0 !important;
margin-top:-3px !important;
margin-bottom: -2px !important;
+ line-height:1em !important;
}
&:hover{
@@ -76,13 +80,14 @@ input, textarea, select, .richtext, .tagit{
outline:none;
}
- &:after{
+ /* Add select arrow back on browsers where native ui has been removed */
+ select ~ span:after{
@include border-radius(0 6px 6px 0);
z-index:0;
position:absolute;
- right:1px;
+ right:0px;
top:1px;
- height:95%;
+ bottom:0px;
width:1.5em;
font-family:wagtail;
content:"q";
@@ -94,12 +99,14 @@ input, textarea, select, .richtext, .tagit{
pointer-events:none;
color:$color-grey-3;
background-color:$color-fieldset-hover;
- margin:0px 1px 0 0;
+ margin:0px 1px 1px 0;
+
+ .ie &{
+ display:none;
+ }
}
- .ie &:after{
- display:none;
- }
+
}
/* radio and check boxes */
@@ -166,34 +173,39 @@ input[type=checkbox]:checked:before{
color:$color-teal;
}
-/* Core button style */
+/* Core button style
+Note that these styles include methods to render buttons the same x-browser, described here:
+http://cbjdigital.com/blog/2010/08/bulletproof_css_input_button_heights */
input[type=submit], input[type=reset], input[type=button], .button, button{
font-family:Open Sans,Arial,sans-serif;
@include border-radius(3px);
width:auto;
- padding:0.7em 1em;
+ height:2.4em;
+ line-height:2.4em;
+ padding:0 1em;
+ font-size:0.9em;
+ font-weight:normal;
+ vertical-align: middle;
+ display:inline-block;
background-color: $color-button;
border:1px solid $color-button;
color:white;
text-decoration:none;
text-transform:uppercase;
- font-size:0.9em;
white-space: nowrap;
position:relative;
- -webkit-font-smoothing: auto;
- vertical-align: middle;
- line-height:1em;
- display:inline-block;
overflow:hidden;
- position:relative;
- font-weight:normal;
outline:none;
+ box-sizing:border-box;
+ -webkit-font-smoothing: auto;
-moz-appearance: none;
-moz-box-sizing:border-box;
&.button-small{
- padding:0.55em 0.8em;
- font-size:1em;
+ padding:0 0.8em;
+ height:2em;
+ line-height:2em;
+ font-size:0.85em;
}
&.button-secondary{
@@ -252,7 +264,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
left:0;
top:0;
width:2em;
- line-height:2em;
+ line-height:1.85em;
height:100%;
text-align:center;
background-color:rgba(0,0,0,0.2);
@@ -261,13 +273,12 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
}
&.button-small.bicolor{
- padding: 0.65em 0.8em;
padding-left:3.5em;
&:before{
width:2em;
font-size:0.9rem;
- line-height:2em;
+ line-height:1.65em;
}
}
@@ -280,21 +291,25 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
}
}
-button.icon{
- &:before,
- &:after{
- line-height:0;
+/* Special styles to counteract Firefox's completely unwarranted assumptions about button styles */
+input[type=submit], input[type=reset], input[type=button], button{
+ padding:0 1em;
+ height: 2.4em;
+ line-height:inherit;
+
+ &.button-small{
+ height:2em;
+ line-height:inherit;
}
}
.multiple{
- @include transition(max-height 10s ease);
padding:0;
- max-height:10000px;
max-width:1024px - 50px;
overflow:hidden;
> li{
+ @include row();
position:relative;
background-color:white;
padding:1em 10em 1em 1.5em; /* 10em padding leaves room for controls */
@@ -394,7 +409,7 @@ li.focused > .help{
opacity:1;
}
-.required label:after{
+.required .field > label:after{
content:"*";
color:$color-red;
font-weight:bold;
@@ -415,58 +430,112 @@ li.focused > .help{
.boolean_field .help, .radio .help{
opacity:1;
}
-.iconfield {
- position:relative;
+
+/*
+ This is expected to go on the parent of the input/select/textarea
+ so in most cases .input
+*/
+.iconfield, /* generic */
+.date_field,
+.time_field,
+.date_time_field,
+.url_field{
+ .input{
+ position:relative;
+
+ &:before, &:after{
+ font-family:wagtail;
+ position:absolute;
+ top:0.5em;
+ line-height:100%;
+ font-size:2em;
+ color:$color-grey-3;
+ }
+ &:before{
+ left:0.3em;
+ }
+ &:after{
+ right:0.5em;
+ }
+ }
input:not([type=radio]), input:not([type=checkbox]), input:not([type=submit]), input:not([type=button]){
padding-left:2.5em;
}
- &:before, &:after{
- font-family:wagtail;
- position:absolute;
- top:0.4em;
- font-size:1.4em;
- color:$color-grey-3;
- }
- &:before{
- left:0.5em;
- }
- &:after{
- right:0.5em;
+ /* smaller fields required slight repositioning of icons */
+ &.field-small{
+ .input{
+ &:before, &:after{
+ font-size:1.3rem; /* REMs are necessary here because IE doesn't treat generated content correctly */
+ top:0.3em;
+ }
+ &:before{
+ left:0.5em;
+ }
+ &:after{
+ right:0.5em;
+ }
+ }
}
/* special case for search spinners */
&.icon-spinner:after{
color:$color-teal;
opacity:0.8;
- font-size:20px;
- width:20px;
- height:20px;
- line-height:23px;
text-align:center;
top:0.3em;
-
}
}
-.fields li{
+.date_field,
+.date_time_field{
+ .input:before{
+ @extend .icon-date:before;
+ }
+}
+
+.time_field{
+ .input:before{
+ @extend .icon-time:before;
+ }
+}
+
+.url_field{
+ .input:before{
+ @extend .icon-link:before;
+ }
+}
+
+
+/* This is specifically for model that are a generated set of checkboxes/radios */
+.model_multiple_choice_field .input li,
+.choice_field .input li{
+ label{
+ display:block;
+ width:auto;
+ float:none;
+ }
+}
+
+.fields > li,
+.field-col{
+ @include clearfix();
padding-top:0.5em;
padding-bottom:1.2em;
}
-.field-content .input li{
- label{
- width:auto;
- float:none;
- }
+.field-row{
+ @include clearfix();
+ /* negative margin the bottom so it doesn't add too much space */
+ margin-bottom:-1.2em;
}
.input{
clear:both;
}
-/* field sizing */
+/* field sizing and alignment */
.field-small{
input, textarea, select, .richtext, .tagit{
@@ -550,11 +619,6 @@ ul.inline li:first-child, li.inline:first-child{
.chosen { display: none; }
.unchosen { display: block; }
}
-
- input[type=button]{
- font-size:0.85em;
- padding:0.5em 0.5em;
- }
}
/* standard way of doing a chooser where the chosen object's title is overlayed */
@@ -652,7 +716,7 @@ ul.tagit li.tagit-choice-editable{
/* search-bars */
.search-bar{
- .required label:after{
+ .required .field > label:after{
display:none;
}
}
@@ -674,6 +738,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
padding-top:1.2em;
padding-left:0;
+ .choice_field &,
.model_multiple_choice_field &,
.boolean_field &,
.model_choice_field &,
@@ -681,26 +746,62 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
.file_field &{
padding-top:0;
}
+ }
- .boolean_field &{
- padding-bottom:0;
+ .label-above{
+ .field > label{
+ display:block;
+ padding:0 0 0.8em 0;
+ float:none;
+ width:auto;
}
}
input[type=submit], input[type=reset], input[type=button], .button, button{
font-size:0.95em;
- padding:0.75em 1.4em;
+ padding:0 1.4em;
+ height: 3em;
+ line-height:3em;
+
+ &.button-small{
+ height:2.3em;
+ line-height:2.2em;
+ }
&.bicolor{
- padding-left:3.5em;
+ padding-left:3.7em;
&:before{
- width:2.2em;
- line-height:2.15em;
+ width:2em;
+ line-height:2.2em;
+ font-size:1.1rem;
+ }
+ }
+
+ &.button-small.bicolor{
+ line-height:2.3em;
+
+ &:before{
+ line-height:1.85em;
}
}
}
+ /* Special styles to counteract Firefox's completely unwarranted assumptions about button styles */
+ input[type=submit], input[type=reset], input[type=button], button{
+ line-height:inherit;
+
+ &.button-small, &.bicolor,
+ &.button-small.bicolor{
+ line-height:inherit;
+ }
+
+ &.button-small{
+ height:2.3em;
+ }
+ }
+
+
.help{
opacity:1;
}
@@ -712,8 +813,14 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
@include row();
}
+ .field-col{
+ float:left;
+ padding-left:0 !important;
+ }
+
.field-content{
@include column(10);
padding-right:0;
- }
+ padding-left:0;
+ }
}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
index d93eaa270..3f079897f 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
@@ -97,13 +97,6 @@ header{
}
}
-/* mozilla specific hack */
-@-moz-document url-prefix() {
- .iconfield.icon-spinner:after{
- line-height:20px;
- }
-}
-
.page-explorer header{
margin-bottom:0;
padding-bottom:0em;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 92e83bbe5..1cfb7e624 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -96,7 +96,6 @@
.icon-unlocked:before {
content: "p";
}
-
.icon-doc-full-inverse:before {
content: "r";
}
@@ -210,9 +209,9 @@
}
.icon-spinner:after{
width:1em;
- animation: spin 1s infinite;
- -webkit-animation: spin 1s infinite;
- -moz-animation: spin 1s infinite;
+ animation: spin 0.5s infinite linear;
+ -webkit-animation: spin 0.5s infinite linear;
+ -moz-animation: spin 0.5s infinite linear;
content:"1";
}
.icon-pick:before{
@@ -221,8 +220,10 @@
.icon-redirect:before{
content:"3";
}
+/* Credit: Icon made by Zurb from Flaticon.com */
.icon-view:before{
- content:"4"; /* Credit: Icon made by Zurb from Flaticon.com */
+ content:"4";
+ vertical-align:-4.5px;
font-size:1.3rem;
}
.icon-collapse-down:before{
@@ -234,6 +235,9 @@
.icon-date:before{
content:"7";
}
+.icon-time:before{
+ content:"8";
+}
.icon-success:before{
content:"9";
}
@@ -246,6 +250,7 @@
.icon-form:before{
content:"$";
}
+
.icon.text-replace{
font-size:0em;
line-height:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index e79d8b28d..9d940362a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -179,7 +179,6 @@ ul.listing{
@include clearfix();
margin-top:0.8em;
text-transform:uppercase;
- font-size:0.85em;
margin-bottom:-0.5em;
a{
@@ -197,7 +196,7 @@ ul.listing{
.button{
color:$color-teal;
border-color:$color-grey-3;
- background:transparent;
+ background:white;
&:hover{
border-color:$color-teal;
@@ -327,13 +326,11 @@ ul.listing{
opacity:0.7;
}
}
- a{
- color:auto;
- }
.actions{
margin-top:1em;
}
.button{
+ background-color:transparent;
color:white;
border-color:$color-teal-darker;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
index 2c85d24e8..0473ae050 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss
@@ -1,32 +1,30 @@
.tab-nav{
- @include clearfix();
+ @include row();
padding:0;
+ background:$color-grey-4;
li{
list-style-type:none;
- width:48%;
+ width:33%;
float:left;
padding:0;
position:relative;
-
- &:before,&:after{
- display:none;
- }
+ margin-right:1px;
}
a{
@include transition(border-color 0.2s ease);
background-color:lighten($color-teal-darker, 3%);
outline:none;
- line-height:3em;
text-transform:uppercase;
font-weight:700;
font-size:1.2em;
text-decoration:none;
display:block;
- padding:0 20px;
+ padding:0.7em;
color:white;
border-top:0.3em solid lighten($color-teal-darker, 3%);
- border-bottom:1px solid transparent;
+ max-height:1.2em;
+ overflow:hidden;
&:hover{
color:white;
@@ -45,7 +43,6 @@
min-width:0.9em;
color:white;
background:$color-red;
-
content:attr(data-count);
padding:0 0.3em;
line-height:1.4em;
@@ -61,10 +58,21 @@
border-top:0.3em solid $color-grey-1;
}
+ li.settings a{
+ &:before{
+ font-family:wagtail;
+ vertical-align:middle;
+ text-transform:none;
+ content:"w";
+ margin-right:0.5em;
+ font-size:1.2em;
+ }
+ }
+
/* For cases where tab-nav should merge with header */
&.merged{
- background-color:$color-header-bg;
margin-top:0;
+ background-color:$color-header-bg;
}
}
.tab-content{
@@ -79,14 +87,27 @@
}
@media screen and (min-width: $breakpoint-mobile){
- .tab-nav li{
- width:auto;
- padding:0;
- margin-left:0.7em;
- }
+ .tab-nav{
+ /* For cases where tab-nav should merge with header */
+ &.merged{
+ background-color:$color-header-bg;
+ }
- .tab-nav a{
- padding:0 50px;
+ li{
+ width:auto;
+ padding:0;
+ margin-left:0.7em;
+ }
+
+ a{
+ padding-left:$desktop-nice-padding - 10;
+ padding-right:$desktop-nice-padding - 10;
+ }
+
+ li.settings a{
+ padding-left:2em;
+ padding-right:2em;
+ }
}
.modal-content .tab-nav li{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 1d73b4502..55e27b067 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -394,11 +394,6 @@ footer{
.actions{
width:250px;
margin-right:$grid-gutter-width/2;
-
- .button{
- padding-top:1em;
- padding-bottom:1em;
- }
}
.meta{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
index 583faf89a..57c8a26f1 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json
@@ -1,6 +1,29 @@
{
"IcoMoonType": "selection",
"icons": [
+ {
+ "icon": {
+ "paths": [
+ "M632.913 707.493l-173.647-173.649v-232.782h105.469v189.094l142.759 142.757zM512 90.125c-232.995 0-421.875 188.88-421.875 421.875s188.88 421.875 421.875 421.875 421.875-188.88 421.875-421.875-188.88-421.875-421.875-421.875zM512 828.406c-174.747 0-316.406-141.659-316.406-316.406s141.659-316.406 316.406-316.406c174.747 0 316.406 141.659 316.406 316.406s-141.659 316.406-316.406 316.406z"
+ ],
+ "tags": [
+ "clock",
+ "time",
+ "schedule"
+ ],
+ "grid": 16
+ },
+ "properties": {
+ "id": 72,
+ "order": 9,
+ "prevSize": 32,
+ "code": 56,
+ "name": "clock",
+ "ligatures": ""
+ },
+ "setIdx": 0,
+ "iconIdx": 72
+ },
{
"icon": {
"paths": [
@@ -20,7 +43,7 @@
"name": "lock39copy",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 0
},
{
@@ -42,7 +65,7 @@
"name": "lock39-open",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 1
},
{
@@ -63,7 +86,7 @@
"name": "form",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 2
},
{
@@ -82,7 +105,7 @@
"name": "uni61",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 3
},
{
@@ -101,7 +124,7 @@
"name": "uni62",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 4
},
{
@@ -120,7 +143,7 @@
"name": "uni63",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 5
},
{
@@ -139,7 +162,7 @@
"name": "uni64",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 6
},
{
@@ -158,7 +181,7 @@
"name": "uni65",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 7
},
{
@@ -177,7 +200,7 @@
"name": "uni66",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 8
},
{
@@ -196,7 +219,7 @@
"name": "uni67",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 9
},
{
@@ -215,7 +238,7 @@
"name": "uni69",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 10
},
{
@@ -234,7 +257,7 @@
"name": "uni6A",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 11
},
{
@@ -253,7 +276,7 @@
"name": "uni6B",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 12
},
{
@@ -272,7 +295,7 @@
"name": "uni6C",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 13
},
{
@@ -291,7 +314,7 @@
"name": "uni6E",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 14
},
{
@@ -310,7 +333,7 @@
"name": "uni68",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 15
},
{
@@ -329,7 +352,7 @@
"name": "uni6F",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 16
},
{
@@ -348,7 +371,7 @@
"name": "uni71",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 17
},
{
@@ -367,7 +390,7 @@
"name": "uni72",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 18
},
{
@@ -386,7 +409,7 @@
"name": "uni73",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 19
},
{
@@ -405,7 +428,7 @@
"name": "uni74",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 20
},
{
@@ -424,7 +447,7 @@
"name": "uni75",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 21
},
{
@@ -443,7 +466,7 @@
"name": "uni76",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 22
},
{
@@ -462,7 +485,7 @@
"name": "uni77",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 23
},
{
@@ -481,7 +504,7 @@
"name": "uni78",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 24
},
{
@@ -500,7 +523,7 @@
"name": "uni7A",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 25
},
{
@@ -519,7 +542,7 @@
"name": "uni41",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 26
},
{
@@ -538,7 +561,7 @@
"name": "uni42",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 27
},
{
@@ -557,7 +580,7 @@
"name": "uni44",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 28
},
{
@@ -576,7 +599,7 @@
"name": "uni43",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 29
},
{
@@ -595,7 +618,7 @@
"name": "uni45",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 30
},
{
@@ -614,7 +637,7 @@
"name": "uni46",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 31
},
{
@@ -633,7 +656,7 @@
"name": "uni47",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 32
},
{
@@ -652,7 +675,7 @@
"name": "uni48",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 33
},
{
@@ -671,7 +694,7 @@
"name": "uni49",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 34
},
{
@@ -690,7 +713,7 @@
"name": "uni4A",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 35
},
{
@@ -709,7 +732,7 @@
"name": "uni4B",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 36
},
{
@@ -728,7 +751,7 @@
"name": "uni4C",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 37
},
{
@@ -747,7 +770,7 @@
"name": "uni4D",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 38
},
{
@@ -766,7 +789,7 @@
"name": "uni4E",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 39
},
{
@@ -785,7 +808,7 @@
"name": "uni4F",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 40
},
{
@@ -804,7 +827,7 @@
"name": "uni50",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 41
},
{
@@ -823,7 +846,7 @@
"name": "uni51",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 42
},
{
@@ -842,7 +865,7 @@
"name": "uni79",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 43
},
{
@@ -861,7 +884,7 @@
"name": "uni52",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 44
},
{
@@ -880,7 +903,7 @@
"name": "uni54",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 45
},
{
@@ -899,7 +922,7 @@
"name": "uni57",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 46
},
{
@@ -918,7 +941,7 @@
"name": "uni58",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 47
},
{
@@ -937,7 +960,7 @@
"name": "uni59",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 48
},
{
@@ -956,7 +979,7 @@
"name": "uni5A",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 49
},
{
@@ -975,7 +998,7 @@
"name": "uni56",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 50
},
{
@@ -994,7 +1017,7 @@
"name": "uni31",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 51
},
{
@@ -1013,7 +1036,7 @@
"name": "uni55",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 52
},
{
@@ -1032,7 +1055,7 @@
"name": "uni33",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 53
},
{
@@ -1051,7 +1074,7 @@
"name": "uni32",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 54
},
{
@@ -1070,7 +1093,7 @@
"name": "uni35",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 55
},
{
@@ -1089,7 +1112,7 @@
"name": "uni36",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 56
},
{
@@ -1108,7 +1131,7 @@
"name": "uni30",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 57
},
{
@@ -1127,7 +1150,7 @@
"name": "uni3F",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 58
},
{
@@ -1146,7 +1169,7 @@
"name": "uni21",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 59
},
{
@@ -1165,7 +1188,7 @@
"name": "uni39",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 60
},
{
@@ -1184,7 +1207,7 @@
"name": "uni53",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 61
},
{
@@ -1203,7 +1226,7 @@
"name": "uni34",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 62
},
{
@@ -1222,7 +1245,7 @@
"name": "uni37",
"ligatures": ""
},
- "setIdx": 0,
+ "setIdx": 1,
"iconIdx": 63
}
],
@@ -1245,13 +1268,14 @@
"baseline": 6.25,
"whitespace": 50
},
- "showMetadata": false,
- "showMetrics": true,
- "useClassSelector": false,
- "classSelector": ".icon",
- "embed": false
+ "resetPoint": 58880
+ },
+ "imagePref": {
+ "color": 0,
+ "height": 32,
+ "columns": 16,
+ "margin": 16
},
- "imagePref": {},
"historySize": 100,
"showCodes": true,
"search": "",
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index 605751ad4..343d7c831 100755
Binary files a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot differ
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
index f095fbd63..11310f293 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -17,6 +17,7 @@
+ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf index 84159ccc9..ee751e5a6 100755 Binary files a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff index fd8552d26..08166f5b2 100755 Binary files a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff and b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.woff differ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss index 40711ef7b..f1e2ee779 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/home.scss @@ -46,6 +46,13 @@ header{ } } + a{ + position:relative; + display:block; + width:100%; + height:100%; + } + span{ font-family:Bitter, Georgia, serif; display:block; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss index 13845ce53..24762b4dc 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss @@ -44,6 +44,7 @@ form{ } } label{ + width:auto; color:white; } input[type=submit]{ @@ -83,24 +84,9 @@ form{ .field{ padding:0; } - .iconfield:before{ + .iconfield .input:before{ display:none; - } - - .full label{ - @include border-radius(2px); - text-transform:uppercase; - padding:2px 5px; - position:absolute; - top:0; - left:0; - margin-top:-1px; - font-size:0.7em; - z-index:1; - margin:0.2em 0; - line-height:1.5em; - font-weight:normal; - } + } /* Special full-width, one-off fields i.e a single text or textarea input */ .full input{ @@ -173,7 +159,7 @@ form{ margin:0px (-$desktop-nice-padding); .iconfield{ - &:before{ + .input:before{ display:inline-block; position: absolute; color:$color-grey-4; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss index 5e3120c82..50e77748d 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss @@ -25,9 +25,6 @@ } } -.objects{ - background:url("#{$static-root}bg-dark-diag.svg"); -} .object{ position:relative; overflow:hidden; @@ -80,9 +77,9 @@ > h2, &.single-field label{ -webkit-font-smoothing: auto; - background:$color-grey-3; + background:$color-salmon-light; text-transform:uppercase; - padding:0.9em 0 0.9em 4em; + padding:0.9em 0 0.9em 4.1em; font-size:0.95em; margin:0 0 0.2em 0; line-height:1.5em; @@ -92,10 +89,10 @@ left:0; right:0; z-index:1; - text-shadow:1px 1px 1px rgba(255,255,255,0.5); - @include box-shadow(0 0 7px 0 rgba(0,0,0,0.4)); + overflow:hidden; &:before{ + text-shadow:none; font-family:wagtail; text-transform:none; content:"q"; @@ -108,10 +105,11 @@ line-height:1.8em; left:0px; width:1.7em; - opacity:0.15; + color:white; padding:0; margin:0; cursor:pointer; + background-color:$color-salmon; } } @@ -186,6 +184,17 @@ } } + /* special panel for the publishing fields, requires a bit more pizzazz */ + &.publishing{ + h2:before{ + content:"7"; + font-size:2.4em; + line-height:1.4em; + width:1.4em; + } + + } + &.title input, &.title textarea{ font-size:2em; @@ -235,20 +244,20 @@ top:0px; left:0px; width:3.3em; - background-color:$color-teal; padding:0; margin:0 0 0 -20px; cursor:pointer; - a{ - font-size: 0em; - line-height: 0; + .button{ + @include border-radius(0); overflow: visible; - display:block; + display:inline-block; + padding:0; + width:3.45em; + background-color:$color-salmon; &:before{ position:relative; - color:white; padding:0; line-height:1.8em; /* specific height required as parent 'a' has no height */ font-size:1.4rem; @@ -260,7 +269,6 @@ .multiple{ padding:0; - max-height:0px; } } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss index 38d4281da..09cb627ed 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss @@ -68,6 +68,12 @@ section{ .color-grey-5{ background-color:$color-grey-5; } + .color-salmon{ + background-color:$color-salmon; + } + .color-salmon-light{ + background-color:$color-salmon-light; + } } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss index 36db5559a..d47ca5ecc 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss @@ -3,10 +3,13 @@ .hallotoolbar{ position:absolute; - left:$mobile-nice-padding; z-index:5; margin-top:4em; - margin-left:0em; + margin-left:1.2em; +} +/* full is added to hallotoolbar when invoked on a field set to the full layout style */ +.hallotoolbar.full{ + margin-left:$mobile-nice-padding; } .hallotoolbar.affixed{ position:fixed; @@ -14,6 +17,7 @@ } .hallotoolbar button{ @include border-radius(0); + height:2.4em; } .richtext { @@ -149,7 +153,7 @@ } @media screen and (min-width: $breakpoint-mobile){ - .hallotoolbar{ - left:$menu-width + $desktop-nice-padding; + .hallotoolbar.full{ + margin-left:$desktop-nice-padding; } } \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss index 0f6567989..e27817175 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss @@ -27,9 +27,11 @@ $breakpoint-desktop-larger: 100em; /* 1600px */ $color-teal: #43b1b0; $color-teal-darker: darken($color-teal, 10%); $color-teal-dark: #246060; -$color-red: #f7474e; +$color-red: #cd3238; $color-orange:#e9b04d; $color-green: #189370; +$color-salmon: #f37e77; +$color-salmon-light: #fcf2f2; /* darker to lighter */ $color-grey-1: #333333; diff --git a/wagtail/wagtailadmin/tasks.py b/wagtail/wagtailadmin/tasks.py index 59779d36b..815971e46 100644 --- a/wagtail/wagtailadmin/tasks.py +++ b/wagtail/wagtailadmin/tasks.py @@ -5,6 +5,7 @@ from django.contrib.auth import get_user_model from django.db.models import Q from wagtail.wagtailcore.models import PageRevision, GroupPagePermission +from wagtail.wagtailusers.models import UserProfile # The following will check to see if we can import task from celery - # if not then we definitely haven't installed it @@ -53,7 +54,7 @@ def send_notification(page_revision_id, notification, excluded_user_id): if notification == 'submitted': # Get list of publishers recipients = users_with_page_permission(revision.page, 'publish') - elif notification == 'approved' or notification == 'rejected': + elif notification in ['rejected', 'approved']: # Get submitter recipients = [revision.user] else: @@ -62,7 +63,7 @@ def send_notification(page_revision_id, notification, excluded_user_id): # Get list of email addresses email_addresses = [ recipient.email for recipient in recipients - if recipient.email and recipient.id != excluded_user_id + if recipient.email and recipient.id != excluded_user_id and getattr(UserProfile.get_for_user(recipient), notification + '_notifications') ] # Return if there are no email addresses diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html index 90f803350..2e1ddda6a 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/account.html @@ -1,5 +1,7 @@ {% extends "wagtailadmin/base.html" %} {% load i18n %} + +{% block titletag %}{% trans "Account" %}{% endblock %} {% block content %} {% trans "Account" as account_str %} {% include "wagtailadmin/shared/header.html" with title=account_str %} @@ -28,6 +30,17 @@
{% endif %}
+ {% if show_notification_preferences %}
+ - + + + + {% trans "Choose which email notifications to receive." %} + + + {% endif %}
+
+
+{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
index a2058cab9..bf583c1dd 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html
@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/edit_handlers/field_panel_field.html" %}
+{% extends "wagtailadmin/shared/field.html" %}
{% load i18n %}
{% comment %}
Either the chosen or unchosen div will be shown, depending on the presence
@@ -17,14 +17,14 @@
{% if not field.field.required %}
-
+
{% endif %}
-
+
-
+
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 472cae0b2..f6f2fb4f5 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html
@@ -1,23 +1 @@
-
- {{ field.label_tag }}
-
-
+{% include "wagtailadmin/shared/field.html" %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html
new file mode 100644
index 000000000..ead32db1a
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html
@@ -0,0 +1,7 @@
+
-
-
- {% block form_field %}
- {{ field }}
- {% endblock %}
-
-
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %} - - {% if field.errors %} - - {% endif %} --
+ {% for child in self.children %}
+
- + {{ child.render_as_field }} + + {% endfor %} +
-
{% for child in self.children %}
-
- - {{ child.render_as_field }} - +
- {{ child.render_as_field }} {% endfor %}
-
{% for child in self.children %}
-
- +
-
{% if child.heading %}
{{ child.heading }}
{% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_object.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html similarity index 57% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_object.html rename to wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html index 5becef9b4..ecb35cbd6 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_object.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html @@ -1,6 +1,6 @@ diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html index 5bbccb03b..b70c1d47a 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html @@ -1,12 +1,12 @@-
{% for child in self.children %}
-
- {{ child.heading }} +
- {{ child.heading }} {% endfor %}
{% for child in self.children %} -+ \ No newline at end of file + diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html index 22682500f..52448ffe5 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html @@ -28,17 +28,17 @@{{ child.render_as_object }} {% endfor %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html index 8a03b4e04..166c0c912 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/site_summary.html @@ -3,25 +3,31 @@{% trans "Site summary" %}
- + {% blocktrans count counter=total_pages %} {{ total_pages }} Page {% plural %} {{ total_pages }} Pages {% endblocktrans %} +
- + {% blocktrans count counter=total_images %} {{ total_images }} Image {% plural %} {{ total_images }} Images {% endblocktrans %} +
- + {% blocktrans count counter=total_docs %} {{ total_docs }} Document {% plural %} {{ total_docs }} Documents {% endblocktrans %} +
-
- +{{ form.username.label_tag }} -+{{ form.username }}
- -
+{{ form.password.label_tag }} -+diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html index 169f4ba7c..0af5ec841 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been approved{% endblocktrans %} +{% extends 'wagtailadmin/notifications/base_notification.html' %}{% block notification %}{% load i18n %}{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been approved{% endblocktrans %} {% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been approved.{% endblocktrans %} -{% trans "You can view the page here:" %} {{ revision.page.full_url }} \ No newline at end of file +{% trans "You can view the page here:" %} {{ revision.page.full_url }}{% endblock %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base_notification.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base_notification.html new file mode 100644 index 000000000..948fe186e --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base_notification.html @@ -0,0 +1,3 @@ +{% load i18n %}{% block notification %}{% endblock %} + +{% trans "Edit your notification preferences here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_account_notification_preferences' %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html index 34a49fae7..f4be24976 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected{% endblocktrans %} +{% extends 'wagtailadmin/notifications/base_notification.html' %}{% block notification %}{% load i18n %}{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected{% endblocktrans %} {% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %} -{% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %} \ No newline at end of file +{% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %}{% endblock %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html index f3a9115e0..e048d73a5 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html @@ -1,5 +1,5 @@ -{% load i18n %}{% blocktrans with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation{% endblocktrans %} +{% extends 'wagtailadmin/notifications/base_notification.html' %}{% block notification %}{% load i18n %}{% blocktrans with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation{% endblocktrans %} {% blocktrans with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation.{% endblocktrans %} {% trans "You can preview the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_preview_for_moderation' revision.id %} -{% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %} \ No newline at end of file +{% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %}{% endblock %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index 3ddb8c1f3..17bcbd8bf 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -16,11 +16,9 @@ - - diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html index 4f60050be..1809a6510 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html @@ -1,4 +1,4 @@ - diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html index a5cd5d24a..d24b9b0e9 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html @@ -1,4 +1,4 @@ - diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html index 1e1f7e9b3..901ee0ac1 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html @@ -70,7 +70,7 @@ {% blocktrans with last_mod=page.get_latest_revision.created_at %}Last modified: {{ last_mod }}{% endblocktrans %} {% if page.get_latest_revision.user %} {% blocktrans with modified_by=page.get_latest_revision.user.get_full_name|default:page.get_latest_revision.user.username %}by {{ modified_by }}{% endblocktrans %} - {% if request.user.email %} + {% if page.get_latest_revision.user.email %}{{ form.password }}{% endif %} {% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html index 46a4d2867..d5c4b7a51 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html @@ -11,5 +11,6 @@
+ diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html index 583d92744..50bfb186e 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html @@ -9,6 +9,6 @@ {% endif %} {% endfor %} {% if include_self %} -- >{{ page.title }}
+- {{ page.title }}
{% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html new file mode 100644 index 000000000..9113e1b6b --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html @@ -0,0 +1,25 @@ +{% load wagtailadmin_tags %} ++ {{ field.label_tag }} +\ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html index a1f51174a..d10e9ba27 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html @@ -1,25 +1,4 @@ {% load wagtailadmin_tags %} -+++ {% block form_field %} + {{ field }} + {% endblock %} + + {# This span only used on rare occasions by certain types of input #} + ++ {% if field.help_text %} +{{ field.help_text }}
+ {% endif %} + + {% if field.errors %} + + {% endif %} +- -
- {{ field.label_tag }} -+--- {% block form_field %} - {{ field }} - {% endblock %} - -- {% if field.help_text %} -{{ field.help_text }}
- {% endif %} - - {% if field.errors %} - - {% endif %} -- + {% include "wagtailadmin/shared/field.html" %}
\ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html index 59340d2d8..be391989d 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html @@ -8,7 +8,7 @@ - -