bad googlebot no cookie
") + + hooks.register('before_serve_page', block_googlebot) + .. _construct_wagtail_edit_bird: ``construct_wagtail_edit_bird`` @@ -393,7 +426,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func .. code-block:: python - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks class UserbarPuppyLinkItem(object): def render(self, request): @@ -414,7 +447,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func from django.utils.safestring import mark_safe - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks class WelcomePanel(object): order = 50 @@ -440,7 +473,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func from django.http import HttpResponse - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks def do_after_page_create(request, page): return HttpResponse("Congrats on making content!", content_type="text/plain") @@ -468,7 +501,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func from django.http import HttpResponse from django.conf.urls import url - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks def admin_view( request ): return HttpResponse( \ @@ -484,13 +517,13 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func .. _construct_main_menu: ``construct_main_menu`` - Add, remove, or alter ``MenuItem`` objects from the Wagtail admin menu. The callable passed to this hook must take a ``request`` object and a list of ``menu_items``; it must return a list of menu items. New items can be constructed from the ``MenuItem`` class by passing in: a ``label`` which will be the text in the menu item, the URL of the admin page you want the menu item to link to (usually by calling ``reverse()`` on the admin view you've set up), CSS class ``name`` applied to the wrapping ``Password required
+You need a password to access this page.
+ + + + +Setting a "password required" page for a specific page type +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The attribute ``password_required_template`` can be defined on a page model to use a custom template for the "password required" view, for that page type only. For example, if a site had a page type for displaying embedded videos along with a description, it might choose to use a custom "password required" template that displays the video description as usual, but shows the password form in place of the video embed. + + .. code-block:: python + + class VideoPage(Page): + ... + password_required_template = 'video/password_required.html' diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst new file mode 100644 index 000000000..0929935f6 --- /dev/null +++ b/docs/releases/0.4.rst @@ -0,0 +1,205 @@ +========================= +Wagtail 0.4 release notes +========================= + +.. contents:: + :local: + :depth: 1 + + +What's new +========== + + +Private Pages +~~~~~~~~~~~~~ + +Wagtail now supports password protecting pages on the frontend, allowing sections of your website to be made private. + +:ref:`private_pages` + + +Python 3 support +~~~~~~~~~~~~~~~~ + +Wagtail now supports Python 3.2, 3.3 and 3.4. + + +Scheduled publishing +~~~~~~~~~~~~~~~~~~~~ + +Editors can now schedule pages to be published or unpublished at specified times. + +A new management command has been added (:ref:`publish_scheduled_pages`) to publish pages that have been scheduled by an editor. + + +Search on QuerySet with Elasticsearch +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +It's now possible to perform searches with Elasticsearch on ``PageQuerySet`` objects: + + >>> from wagtail.wagtailcore.models import Page + >>> Page.objects.live().descendant_of(events_index).search("Hello") + [
+
+ {% endif %}
+ {% endwith %}
diff --git a/docs/search/for_python_developers.rst b/docs/search/for_python_developers.rst
new file mode 100644
index 000000000..1cadbc8da
--- /dev/null
+++ b/docs/search/for_python_developers.rst
@@ -0,0 +1,152 @@
+
+.. _wagtailsearch_for_python_developers:
+
+
+=====================
+For Python developers
+=====================
+
+
+Basic usage
+===========
+
+All searches are performed on Django QuerySets. Wagtail provides a ``search`` method on the queryset for all page models:
+
+.. code-block:: python
+
+ # Search future EventPages
+ >>> from wagtail.wagtailcore.models import EventPage
+ >>> EventPage.objects.filter(date__gt=timezone.now()).search("Hello world!")
+
+
+All methods of ``PageQuerySet`` are supported by wagtailsearch:
+
+.. code-block:: python
+
+ # Search all live EventPages that are under the events index
+ >>> EventPage.objects.live().descendant_of(events_index).search("Event")
+ [Editors picks
+-
+ {% for editors_pick in editors_picks %}
+
-
+
+ + {{ editors_pick.page.title }} + +
+{{ editors_pick.description|safe }}
+
+ {% endfor %}
+
-
- {% endif %}
- {% endwith %}
Asynchronous Search with JSON and AJAX
--------------------------------------
@@ -142,30 +105,30 @@ Finally, we'll use JQuery to make the asynchronous requests and handle the inter
// when there's something in the input box, make the query
searchBox.on('input', function() {
if( searchBox.val() == ''){
- resultsBox.html('');
- return;
+ resultsBox.html('');
+ return;
}
// make the request to the Wagtail JSON search view
$.ajax({
- url: wagtailJSONSearchURL + "?q=" + searchBox.val(),
- dataType: "json"
+ url: wagtailJSONSearchURL + "?q=" + searchBox.val(),
+ dataType: "json"
})
.done(function(data) {
- console.log(data);
- if( data == undefined ){
- resultsBox.html('');
- return;
- }
- // we're in business! let's format the results
- var htmlOutput = '';
- data.forEach(function(element, index, array){
- htmlOutput += '';
- });
- // and display them
- resultsBox.html(htmlOutput);
+ console.log(data);
+ if( data == undefined ){
+ resultsBox.html('');
+ return;
+ }
+ // we're in business! let's format the results
+ var htmlOutput = '';
+ data.forEach(function(element, index, array){
+ htmlOutput += '';
+ });
+ // and display them
+ resultsBox.html(htmlOutput);
})
.error(function(data){
- console.log(data);
+ console.log(data);
});
});
@@ -178,12 +141,12 @@ Results are returned as a JSON object with this structure:
{
[
{
- title: "Lumpy Space Princess",
- url: "/oh-my-glob/"
+ title: "Lumpy Space Princess",
+ url: "/oh-my-glob/"
},
{
- title: "Lumpy Space",
- url: "/no-smooth-posers/"
+ title: "Lumpy Space",
+ url: "/no-smooth-posers/"
},
...
]
@@ -199,67 +162,8 @@ The AJAX interface uses the same view as the normal HTML search, ``wagtailsearch
In this template, you'll have access to the same context variables provided to the HTML template. You could provide a template in JSON format with extra properties, such as ``query.hits`` and editor's picks, or render an HTML snippet that can go directly into your results ``Editors picks
--
- {% for editors_pick in editors_picks %}
-
-
-
- - {{ editors_pick.page.title }} - -
-{{ editors_pick.description|safe }}
-
- {% endfor %}
-
``. If you need more flexibility, such as multiple formats/templates based on differing requests, you can set up a custom search view.
-.. _editors-picks:
+Custom Search Views
+-------------------
-Indexing Custom Fields & Custom Search Views
---------------------------------------------
-
-This functionality is still under active development to provide a streamlined interface, but take a look at ``wagtail/wagtail/wagtailsearch/views/frontend.py`` if you are interested in coding custom search views.
-
-
-Search Backends
----------------
-
-Wagtail can degrade to a database-backed text search, but we strongly recommend `Elasticsearch`_.
-
-.. _Elasticsearch: http://www.elasticsearch.org/
-
-
-Default DB Backend
-``````````````````
-The default DB search backend uses Django's ``__icontains`` filter.
-
-
-Elasticsearch Backend
-`````````````````````
-Prerequisites are the Elasticsearch service itself and, via pip, the `elasticsearch-py`_ package:
-
-.. code-block:: guess
-
- pip install elasticsearch
-
-.. note::
- If you are using Elasticsearch < 1.0, install elasticsearch-py version 0.4.5: ```pip install elasticsearch==0.4.5```
-
-The backend is configured in settings:
-
-.. code-block:: python
-
- WAGTAILSEARCH_BACKENDS = {
- 'default': {
- 'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch',
- 'URLS': ['http://localhost:9200'],
- 'INDEX': 'wagtail',
- 'TIMEOUT': 5,
- 'FORCE_NEW': False,
- }
- }
-
-Other than ``BACKEND`` the keys are optional and default to the values shown. ``FORCE_NEW`` is used by elasticsearch-py. In addition, any other keys are passed directly to the Elasticsearch constructor as case-sensitive keyword arguments (e.g. ``'max_retries': 1``).
-
-If you prefer not to run an Elasticsearch server in development or production, there are many hosted services available, including `Searchly`_, who offer a free account suitable for testing and development. To use Searchly:
-
-- Sign up for an account at `dashboard.searchly.com/users/sign\_up`_
-- Use your Searchly dashboard to create a new index, e.g. 'wagtaildemo'
-- Note the connection URL from your Searchly dashboard
-- Configure ``URLS`` and ``INDEX`` in the Elasticsearch entry in ``WAGTAILSEARCH_BACKENDS``
-- Run ``./manage.py update_index``
-
-.. _elasticsearch-py: http://elasticsearch-py.readthedocs.org
-.. _Searchly: http://www.searchly.com/
-.. _dashboard.searchly.com/users/sign\_up: https://dashboard.searchly.com/users/sign_up
-
-Rolling Your Own
-````````````````
-Wagtail search backends implement the interface defined in ``wagtail/wagtail/wagtailsearch/backends/base.py``. At a minimum, the backend's ``search()`` method must return a collection of objects or ``model.objects.none()``. For a fully-featured search backend, examine the Elasticsearch backend code in ``elasticsearch.py``.
+This functionality is still under active development to provide a streamlined interface, but take a look at ``wagtail/wagtail/wagtailsearch/views/frontend.py`` if you are interested in coding custom search views.
\ No newline at end of file
diff --git a/docs/search/index.rst b/docs/search/index.rst
new file mode 100644
index 000000000..e343f76c8
--- /dev/null
+++ b/docs/search/index.rst
@@ -0,0 +1,17 @@
+
+.. _wagtailsearch:
+
+
+Search
+======
+
+Wagtail provides a comprehensive and extensible search interface. In addition, it provides ways to promote search results through "Editor's Picks." Wagtail also collects simple statistics on queries made through the search interface.
+
+
+.. toctree::
+ :maxdepth: 2
+
+ for_python_developers
+ frontend_views
+ editors_picks
+ backends
diff --git a/docs/settings.rst b/docs/settings.rst
index 018af5d01..898fb3cb3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -3,7 +3,7 @@
Configuring Django for Wagtail
==============================
-To install Wagtail completely from scratch, create a new Django project and an app within that project. For instructions on these tasks, see `Writing your first Django app`_. Your project directory will look like the following::
+To install Wagtail completely from scratch, create a new Django project and an app within that project. For instructions on these tasks, see `Writing your first Django app `_ for configuration details.
+
+To test, open the 'medusa_output' folder in a terminal and run ``python -m SimpleHTTPServer``.
+
+
+Advanced topics
+~~~~~~~~~~~~~~~
+
Replacing GET parameters with custom routing
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+--------------------------------------------
Pages which require GET parameters (e.g. for pagination) don't generate suitable filenames for generated HTML files so they need to be changed to use custom routing instead.
@@ -34,6 +45,8 @@ For example, let's say we have a Blog Index which uses pagination. We can overri
.. code:: python
+ from wagtail.wagtailcore.url_routing import RouteResult
+
class BlogIndex(Page):
...
@@ -43,7 +56,7 @@ For example, let's say we have a Blog Index which uses pagination. We can overri
def route(self, request, path_components):
if self.live and len(path_components) == 2 and path_components[0] == 'page':
try:
- return self.serve(request, page=int(path_components[1]))
+ return RouteResult(self, kwargs={'page': int(path_components[1])})
except (TypeError, ValueError):
pass
@@ -51,7 +64,7 @@ For example, let's say we have a Blog Index which uses pagination. We can overri
Rendering pages which use custom routing
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+----------------------------------------
For page types that override the ``route`` method, we need to let django medusa know which URLs it responds on. This is done by overriding the ``get_static_site_paths`` method to make it yield one string per URL path.
@@ -72,12 +85,4 @@ For example, the BlogIndex above would need to yield one URL for each page of re
yield path
-Rendering
-~~~~~~~~~
-
-To render a site, run ``./manage.py staticsitegen``. This will render the entire website and place the HTML in a folder called 'medusa_output'. The static and media folders need to be copied into this folder manually after the rendering is complete. This feature inherits django-medusa's ability to render your static site to Amazon S3 or Google App Engine; see the `medusa docs `_ for configuration details.
-
-To test, open the 'medusa_output' folder in a terminal and run ``python -m SimpleHTTPServer``.
-
-
.. _django medusa: https://github.com/mtigas/django-medusa
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 4a9ff5c5e..b69c5d4e0 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,4 @@
# For coverage and PEP8 linting
coverage==3.7.1
-flake8==2.1.0
+flake8==2.2.1
mock==1.0.1
diff --git a/setup.py b/setup.py
index 7b26817cd..129a48468 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,8 @@
#!/usr/bin/env python
+import sys
+
+
try:
from setuptools import setup, find_packages
except ImportError:
@@ -16,9 +19,35 @@ except ImportError:
pass
+PY3 = sys.version_info[0] == 3
+
+
+install_requires = [
+ "Django>=1.6.2,<1.7",
+ "South>=0.8.4",
+ "django-compressor>=1.4",
+ "django-libsass>=0.2",
+ "django-modelcluster>=0.3",
+ "django-taggit==0.11.2",
+ "django-treebeard==2.0",
+ "Pillow>=2.3.0",
+ "beautifulsoup4>=4.3.2",
+ "lxml>=3.3.0",
+ "Unidecode>=0.04.14",
+ "six==1.7.3",
+ 'requests==2.3.0',
+]
+
+
+if not PY3:
+ install_requires += [
+ "unicodecsv>=0.9.4"
+ ]
+
+
setup(
name='wagtail',
- version='0.3.1',
+ version='0.4',
description='A Django content management system focused on flexibility and user experience',
author='Matthew Westcott',
author_email='matthew.westcott@torchbox.com',
@@ -37,23 +66,13 @@ setup(
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.2',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
'Framework :: Django',
'Topic :: Internet :: WWW/HTTP :: Site Management',
],
- install_requires=[
- "Django>=1.6.2,<1.7",
- "South>=0.8.4",
- "django-compressor>=1.3",
- "django-libsass>=0.1",
- "django-modelcluster>=0.1",
- "django-taggit==0.11.2",
- "django-treebeard==2.0",
- "Pillow>=2.3.0",
- "beautifulsoup4>=4.3.2",
- "lxml>=3.3.0",
- 'unicodecsv>=0.9.4',
- 'Unidecode>=0.04.14',
- "BeautifulSoup==3.2.1", # django-compressor gets confused if we have lxml but not BS3 installed
- ],
+ install_requires=install_requires,
zip_safe=False,
)
diff --git a/tox.ini b/tox.ini
index 11b8bb3a2..2b17c65ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,18 @@
[deps]
dj16=
Django>=1.6,<1.7
- pyelasticsearch==0.6.1
- elasticutils==0.8.2
+ elasticsearch==1.1.0
+ mock==1.0.1
[tox]
envlist =
py26-dj16-postgres,
py26-dj16-sqlite,
py27-dj16-postgres,
- py27-dj16-sqlite
+ py27-dj16-sqlite,
+ py32-dj16-postgres,
+ py33-dj16-postgres,
+ py34-dj16-postgres
# mysql not currently supported
# (wagtail.wagtailimages.tests.TestImageEditView currently fails with a
@@ -17,6 +20,12 @@ envlist =
# py26-dj16-mysql
# py27-dj16-mysql
+# South fails with sqlite on python3, because it tries to use DryRunMigrator which uses iteritems
+# py32-dj16-sqlite,
+# py33-dj16-sqlite,
+# py34-dj16-sqlite
+
+
[testenv]
commands=./runtests.py
@@ -24,7 +33,7 @@ commands=./runtests.py
basepython=python2.6
deps =
{[deps]dj16}
- psycopg2==2.5.2
+ psycopg2==2.5.3
setenv =
DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
@@ -48,7 +57,7 @@ setenv =
basepython=python2.7
deps =
{[deps]dj16}
- psycopg2==2.5.2
+ psycopg2==2.5.3
setenv =
DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
@@ -67,3 +76,48 @@ deps =
setenv =
DATABASE_ENGINE=django.db.backends.mysql
DATABASE_USER=wagtail
+
+[testenv:py32-dj16-postgres]
+basepython=python3.2
+deps =
+ {[deps]dj16}
+ psycopg2==2.5.3
+setenv =
+ DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
+
+[testenv:py32-dj16-sqlite]
+basepython=python3.2
+deps =
+ {[deps]dj16}
+setenv =
+ DATABASE_ENGINE=django.db.backends.sqlite3
+
+[testenv:py33-dj16-postgres]
+basepython=python3.3
+deps =
+ {[deps]dj16}
+ psycopg2==2.5.3
+setenv =
+ DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
+
+[testenv:py33-dj16-sqlite]
+basepython=python3.3
+deps =
+ {[deps]dj16}
+setenv =
+ DATABASE_ENGINE=django.db.backends.sqlite3
+
+[testenv:py34-dj16-postgres]
+basepython=python3.4
+deps =
+ {[deps]dj16}
+ psycopg2==2.5.3
+setenv =
+ DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
+
+[testenv:py34-dj16-sqlite]
+basepython=python3.4
+deps =
+ {[deps]dj16}
+setenv =
+ DATABASE_ENGINE=django.db.backends.sqlite3
diff --git a/wagtail/contrib/wagtailfrontendcache/__init__.py b/wagtail/contrib/wagtailfrontendcache/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/contrib/wagtailfrontendcache/models.py b/wagtail/contrib/wagtailfrontendcache/models.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/contrib/wagtailfrontendcache/signal_handlers.py b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py
new file mode 100644
index 000000000..0fc92d46e
--- /dev/null
+++ b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py
@@ -0,0 +1,25 @@
+from django.db import models
+from django.db.models.signals import post_delete
+
+from wagtail.wagtailcore.models import Page
+from wagtail.wagtailcore.signals import page_published
+
+from wagtail.contrib.wagtailfrontendcache.utils import purge_page_from_cache
+
+
+def page_published_signal_handler(instance, **kwargs):
+ purge_page_from_cache(instance)
+
+
+def post_delete_signal_handler(instance, **kwargs):
+ purge_page_from_cache(instance)
+
+
+def register_signal_handlers():
+ # Get list of models that are page types
+ indexed_models = [model for model in models.get_models() if issubclass(model, Page)]
+
+ # Loop through list and register signal handlers for each one
+ for model in indexed_models:
+ page_published.connect(page_published_signal_handler, sender=model)
+ post_delete.connect(post_delete_signal_handler, sender=model)
diff --git a/wagtail/contrib/wagtailfrontendcache/utils.py b/wagtail/contrib/wagtailfrontendcache/utils.py
new file mode 100644
index 000000000..66b77c971
--- /dev/null
+++ b/wagtail/contrib/wagtailfrontendcache/utils.py
@@ -0,0 +1,40 @@
+import requests
+from requests.adapters import HTTPAdapter
+
+from django.conf import settings
+
+
+class CustomHTTPAdapter(HTTPAdapter):
+ """
+ Requests will always send requests to whatever server is in the netloc
+ part of the URL. This is a problem with purging the cache as this netloc
+ may point to a different server (such as an nginx instance running in
+ front of the cache).
+
+ This class allows us to send a purge request directly to the cache server
+ with the host header still set correctly. It does this by changing the "url"
+ parameter of get_connection to always point to the cache server. Requests
+ will then use this connection to purge the page.
+ """
+ def __init__(self, cache_url):
+ self.cache_url = cache_url
+ super(CustomHTTPAdapter, self).__init__()
+
+ def get_connection(self, url, proxies=None):
+ return super(CustomHTTPAdapter, self).get_connection(self.cache_url, proxies)
+
+
+def purge_url_from_cache(url):
+ # Get session
+ cache_server_url = getattr(settings, 'WAGTAILFRONTENDCACHE_LOCATION', 'http://127.0.0.1:8000/')
+ session = requests.Session()
+ session.mount('http://', CustomHTTPAdapter(cache_server_url))
+
+ # Send purge request to cache
+ session.request('PURGE', url)
+
+
+def purge_page_from_cache(page):
+ # Purge cached paths from cache
+ for path in page.specific.get_cached_paths():
+ purge_url_from_cache(page.full_url + path[1:])
diff --git a/wagtail/contrib/wagtailsitemaps/__init__.py b/wagtail/contrib/wagtailsitemaps/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/contrib/wagtailsitemaps/models.py b/wagtail/contrib/wagtailsitemaps/models.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/contrib/wagtailsitemaps/sitemap_generator.py b/wagtail/contrib/wagtailsitemaps/sitemap_generator.py
new file mode 100644
index 000000000..d22f88112
--- /dev/null
+++ b/wagtail/contrib/wagtailsitemaps/sitemap_generator.py
@@ -0,0 +1,21 @@
+from django.template.loader import render_to_string
+
+
+class Sitemap(object):
+ template = 'wagtailsitemaps/sitemap.xml'
+
+ def __init__(self, site):
+ self.site = site
+
+ def get_pages(self):
+ return self.site.root_page.get_descendants(inclusive=True).live().public().order_by('path')
+
+ def get_urls(self):
+ for page in self.get_pages():
+ for url in page.get_sitemap_urls():
+ yield url
+
+ def render(self):
+ return render_to_string(self.template, {
+ 'urlset': self.get_urls()
+ })
diff --git a/wagtail/contrib/wagtailsitemaps/templates/wagtailsitemaps/sitemap.xml b/wagtail/contrib/wagtailsitemaps/templates/wagtailsitemaps/sitemap.xml
new file mode 100644
index 000000000..30ca3c024
--- /dev/null
+++ b/wagtail/contrib/wagtailsitemaps/templates/wagtailsitemaps/sitemap.xml
@@ -0,0 +1,13 @@
+
+
+{% spaceless %}
+{% for url in urlset %}
+
+ {{ url.location }}
+ {% if url.lastmod %}{{ url.lastmod|date:"Y-m-d" }} {% endif %}
+ {% if url.changefreq %}{{ url.changefreq }} {% endif %}
+ {% if url.priority %}{{ url.priority }} {% endif %}
+
+{% endfor %}
+{% endspaceless %}
+
diff --git a/wagtail/contrib/wagtailsitemaps/tests.py b/wagtail/contrib/wagtailsitemaps/tests.py
new file mode 100644
index 000000000..a556ce156
--- /dev/null
+++ b/wagtail/contrib/wagtailsitemaps/tests.py
@@ -0,0 +1,94 @@
+from django.test import TestCase
+from django.core.cache import cache
+
+from wagtail.wagtailcore.models import Page, PageViewRestriction, Site
+from wagtail.tests.models import SimplePage
+
+from .sitemap_generator import Sitemap
+
+
+class TestSitemapGenerator(TestCase):
+ def setUp(self):
+ self.home_page = Page.objects.get(id=2)
+
+ self.child_page = self.home_page.add_child(instance=SimplePage(
+ title="Hello world!",
+ slug='hello-world',
+ live=True,
+ ))
+
+ self.unpublished_child_page = self.home_page.add_child(instance=SimplePage(
+ title="Unpublished",
+ slug='unpublished',
+ live=False,
+ ))
+
+ self.protected_child_page = self.home_page.add_child(instance=SimplePage(
+ title="Protected",
+ slug='protected',
+ live=True,
+ ))
+ PageViewRestriction.objects.create(page=self.protected_child_page, password='hello')
+
+ self.site = Site.objects.get(is_default_site=True)
+
+ def test_get_pages(self):
+ sitemap = Sitemap(self.site)
+ pages = sitemap.get_pages()
+
+ self.assertIn(self.child_page.page_ptr, pages)
+ self.assertNotIn(self.unpublished_child_page.page_ptr, pages)
+ self.assertNotIn(self.protected_child_page.page_ptr, pages)
+
+ def test_get_urls(self):
+ sitemap = Sitemap(self.site)
+ urls = [url['location'] for url in sitemap.get_urls()]
+
+ self.assertIn('http://localhost/', urls) # Homepage
+ self.assertIn('http://localhost/hello-world/', urls) # Child page
+
+ def test_render(self):
+ sitemap = Sitemap(self.site)
+ xml = sitemap.render()
+
+ # Check that a URL has made it into the xml
+ self.assertIn('http://localhost/hello-world/', xml)
+
+ # Make sure the unpublished page didn't make it into the xml
+ self.assertNotIn('http://localhost/unpublished/', xml)
+
+ # Make sure the protected page didn't make it into the xml
+ self.assertNotIn('http://localhost/protected/', xml)
+
+
+class TestSitemapView(TestCase):
+ def test_sitemap_view(self):
+ response = self.client.get('/sitemap.xml')
+
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailsitemaps/sitemap.xml')
+ self.assertEqual(response['Content-Type'], 'text/xml; charset=utf-8')
+
+ def test_sitemap_view_cache(self):
+ cache_key = 'wagtail-sitemap:%d' % Site.objects.get(is_default_site=True).id
+
+ # Check that the key is not in the cache
+ self.assertFalse(cache.has_key(cache_key))
+
+ # Hit the view
+ first_response = self.client.get('/sitemap.xml')
+
+ self.assertEqual(first_response.status_code, 200)
+ self.assertTemplateUsed(first_response, 'wagtailsitemaps/sitemap.xml')
+
+ # Check that the key is in the cache
+ self.assertTrue(cache.has_key(cache_key))
+
+ # Hit the view again. Should come from the cache this time
+ second_response = self.client.get('/sitemap.xml')
+
+ self.assertEqual(second_response.status_code, 200)
+ self.assertTemplateNotUsed(second_response, 'wagtailsitemaps/sitemap.xml') # Sitemap should not be re rendered
+
+ # Check that the content is the same
+ self.assertEqual(first_response.content, second_response.content)
diff --git a/wagtail/contrib/wagtailsitemaps/views.py b/wagtail/contrib/wagtailsitemaps/views.py
new file mode 100644
index 000000000..04f31fdae
--- /dev/null
+++ b/wagtail/contrib/wagtailsitemaps/views.py
@@ -0,0 +1,23 @@
+from django.http import HttpResponse
+from django.core.cache import cache
+from django.conf import settings
+
+from .sitemap_generator import Sitemap
+
+
+def sitemap(request):
+ cache_key = 'wagtail-sitemap:' + str(request.site.id)
+ sitemap_xml = cache.get(cache_key)
+
+ if not sitemap_xml:
+ # Rerender sitemap
+ sitemap = Sitemap(request.site)
+ sitemap_xml = sitemap.render()
+
+ cache.set(cache_key, sitemap_xml, getattr(settings, 'WAGTAILSITEMAPS_CACHE_TIMEOUT', 6000))
+
+ # Build response
+ response = HttpResponse(sitemap_xml)
+ response['Content-Type'] = "text/xml; charset=utf-8"
+
+ return response
diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index 54cfd23a6..8506e9075 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -42,9 +42,10 @@
color-teal
color-teal-darker
color-teal-dark
- color-red
- color-orange
- color-green
+
+
@@ -407,6 +414,7 @@
warning
success
date
+ time
form
diff --git a/wagtail/contrib/wagtailstyleguide/views.py b/wagtail/contrib/wagtailstyleguide/views.py
index 52c5433a1..9683289d2 100644
--- a/wagtail/contrib/wagtailstyleguide/views.py
+++ b/wagtail/contrib/wagtailstyleguide/views.py
@@ -1,16 +1,10 @@
from django import forms
-from django.db import models
from django.shortcuts import render
from django.utils.translation import ugettext as _
from django.contrib import messages
from django.contrib.auth.decorators import permission_required
-from wagtail.wagtailadmin.edit_handlers import PageChooserPanel
-from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
-from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel
-
from wagtail.wagtailadmin.forms import SearchForm
-from wagtail.wagtailcore.fields import RichTextField
CHOICES = (
@@ -23,6 +17,7 @@ class ExampleForm(forms.Form):
url = forms.URLField(required=True)
email = forms.EmailField(max_length=254)
date = forms.DateField()
+ time = forms.TimeField()
select = forms.ChoiceField(choices=CHOICES)
boolean = forms.BooleanField(required=False)
diff --git a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py
index ae2989be9..56a17fc16 100644
--- a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py
+++ b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py
@@ -1,14 +1,10 @@
-from django.conf import settings
-from django.conf.urls import include, url
+from django.conf.urls import url
from django.core import urlresolvers
-from django.utils.html import format_html, format_html_join
from django.utils.translation import ugettext_lazy as _
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
from wagtail.wagtailadmin.menu import MenuItem
-from wagtail.wagtailimages import urls
-
from . import views
diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index 3f5f57c63..f31610279 100644
--- a/wagtail/tests/fixtures/test.json
+++ b/wagtail/tests/fixtures/test.json
@@ -23,7 +23,7 @@
"model": "wagtailcore.page",
"fields": {
"title": "Welcome to the Wagtail test site!",
- "numchild": 3,
+ "numchild": 5,
"show_in_menus": false,
"live": true,
"depth": 2,
@@ -85,6 +85,17 @@
}
},
+{
+ "pk": 1,
+ "model": "tests.eventpagespeaker",
+ "fields": {
+ "page": 4,
+ "first_name": "Santa",
+ "last_name": "Claus",
+ "sort_order": 0
+ }
+},
+
{
"pk": 5,
"model": "wagtailcore.page",
@@ -246,6 +257,79 @@
}
},
+{
+ "pk": 10,
+ "model": "wagtailcore.page",
+ "fields": {
+ "title": "Old style route method",
+ "numchild": 0,
+ "show_in_menus": true,
+ "live": true,
+ "depth": 3,
+ "content_type": ["tests", "pagewitholdstyleroutemethod"],
+ "path": "000100010004",
+ "url_path": "/home/old-style-route/",
+ "slug": "old-style-route"
+ }
+},
+{
+ "pk": 10,
+ "model": "tests.pagewitholdstyleroutemethod",
+ "fields": {
+ "content": "{{ self.title }}
+
+
+ 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
-
-
+
- color-salmon +
- color-salmon-light
- color-grey-1 @@ -54,6 +55,12 @@
- color-grey-4
- color-grey-5
-
+
- color-red +
- color-orange +
- color-green +
Test with old style route method
" + } +}, + +{ + "pk": 11, + "model": "wagtailcore.page", + "fields": { + "title": "Secret plans", + "numchild": 1, + "show_in_menus": true, + "live": true, + "depth": 3, + "content_type": ["tests", "simplepage"], + "path": "000100010005", + "url_path": "/home/secret-plans/", + "slug": "secret-plans" + } +}, +{ + "pk": 11, + "model": "tests.simplepage", + "fields": { + "content": "muahahahaha
" + } +}, + +{ + "pk": 12, + "model": "wagtailcore.page", + "fields": { + "title": "Steal underpants", + "numchild": 0, + "show_in_menus": true, + "live": true, + "depth": 4, + "content_type": ["tests", "eventpage"], + "path": "0001000100050001", + "url_path": "/home/secret-plans/steal-underpants/", + "slug": "steal-underpants" + } +}, +{ + "pk": 12, + "model": "tests.eventpage", + "fields": { + "date_from": "2015-07-04", + "audience": "private", + "location": "Marks and Spencer", + "body": "meet in the menswear department at noon
", + "cost": "free" + } +}, + { "pk": 1, "model": "wagtailcore.site", @@ -478,6 +562,14 @@ "submit_time": "2014-01-01T12:00:00.000Z" } }, +{ + "pk": 1, + "model": "tests.advert", + "fields": { + "text": "test_advert", + "url": "http://www.example.com" + } +}, { "pk": 1, "model": "wagtaildocs.Document", @@ -495,5 +587,14 @@ "width": 0, "height": 0 } +}, + +{ + "pk": 1, + "model": "wagtailcore.pageviewrestriction", + "fields": { + "page": 11, + "password": "swordfish" + } } ] diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py index ca6d411da..2f151c465 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 @@ -8,6 +11,7 @@ from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField from wagtail.wagtailsnippets.models import register_snippet +from wagtail.wagtailsearch import indexed EVENT_AUDIENCE_CHOICES = ( @@ -103,6 +107,19 @@ class SimplePage(Page): content = models.TextField() +class PageWithOldStyleRouteMethod(Page): + """ + Prior to Wagtail 0.4, the route() method on Page returned an HttpResponse + rather than a Page instance. As subclasses of Page may override route, + we need to continue accepting this convention (albeit as a deprecated API). + """ + content = models.TextField() + template = 'tests/simple_page.html' + + def route(self, request, path_components): + return self.serve(request) + + # Event page class EventPageCarouselItem(Orderable, CarouselItem): @@ -163,6 +180,8 @@ class EventPage(Page): indexed_fields = ('get_audience_display', 'location', 'body') search_name = "Event" + password_required_template = 'tests/event_page_password_required.html' + EventPage.content_panels = [ FieldPanel('title', classname="full title"), FieldPanel('date_from'), @@ -259,6 +278,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 +288,7 @@ class Advert(models.Model): FieldPanel('text'), ] - def __unicode__(self): + def __str__(self): return self.text @@ -281,18 +301,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 @@ -310,3 +332,60 @@ class BusinessSubIndex(Page): class BusinessChild(Page): subpage_types = [] + + +class SearchTest(models.Model, indexed.Indexed): + title = models.CharField(max_length=255) + content = models.TextField() + live = models.BooleanField(default=False) + published_date = models.DateField(null=True) + + search_fields = [ + indexed.SearchField('title', partial_match=True), + indexed.SearchField('content'), + indexed.SearchField('callable_indexed_field'), + indexed.FilterField('title'), + indexed.FilterField('live'), + indexed.FilterField('published_date'), + ] + + def callable_indexed_field(self): + return "Callable" + + +class SearchTestChild(SearchTest): + subtitle = models.CharField(max_length=255, null=True, blank=True) + extra_content = models.TextField() + + search_fields = SearchTest.search_fields + [ + indexed.SearchField('subtitle', partial_match=True), + indexed.SearchField('extra_content'), + ] + + +class SearchTestOldConfig(models.Model, indexed.Indexed): + """ + This tests that the Indexed class can correctly handle models that + use the old "indexed_fields" configuration format. + """ + indexed_fields = { + # A search field with predictive search and boosting + 'title': { + 'type': 'string', + 'analyzer': 'edgengram_analyzer', + 'boost': 100, + }, + + # A filter field + 'live': { + 'type': 'boolean', + 'index': 'not_analyzed', + }, + } + +class SearchTestOldConfigList(models.Model, indexed.Indexed): + """ + This tests that the Indexed class can correctly handle models that + use the old "indexed_fields" configuration format using a list. + """ + indexed_fields = ['title', 'content'] diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index 5cee3d6d8..103e19b99 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -28,9 +28,8 @@ STATICFILES_FINDERS = ( 'compressor.finders.CompressorFinder', ) -MEDIA_ROOT=MEDIA_ROOT - USE_TZ = True +TIME_ZONE = 'UTC' TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( 'django.core.context_processors.request', @@ -72,6 +71,7 @@ INSTALLED_APPS = [ 'wagtail.wagtailredirects', 'wagtail.wagtailforms', 'wagtail.contrib.wagtailstyleguide', + 'wagtail.contrib.wagtailsitemaps', 'wagtail.tests', ] diff --git a/wagtail/tests/templates/tests/event_page_password_required.html b/wagtail/tests/templates/tests/event_page_password_required.html new file mode 100644 index 000000000..e58d740ad --- /dev/null +++ b/wagtail/tests/templates/tests/event_page_password_required.html @@ -0,0 +1,15 @@ + + + +{{ self.title }}
+This event is invitation only. Please enter your password to see the details.
+ + + diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py index d04c871a3..c9ca98bba 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -3,18 +3,17 @@ from django.conf.urls import patterns, include, url 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 - -# Signal handlers -from wagtail.wagtailsearch import register_signal_handlers as wagtailsearch_register_signal_handlers -wagtailsearch_register_signal_handlers() +from wagtail.wagtailsearch import urls as wagtailsearch_urls +from wagtail.contrib.wagtailsitemaps.views import sitemap urlpatterns = patterns('', url(r'^admin/', include(wagtailadmin_urls)), - url(r'^search/', include(wagtailsearch_frontend_urls)), + url(r'^search/', include(wagtailsearch_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..2e95d0210 100644 --- a/wagtail/tests/utils.py +++ b/wagtail/tests/utils.py @@ -1,7 +1,8 @@ -from django.test import TestCase +from contextlib import contextmanager +import warnings + from django.contrib.auth.models import User -from django.utils.six.moves.urllib.parse import urlparse, ParseResult -from django.http import QueryDict +from django.utils import six # 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 @@ -24,3 +25,17 @@ class WagtailTestUtils(object): self.client.login(username='test', password='password') return user + + def assertRegex(self, *args, **kwargs): + six.assertRegex(self, *args, **kwargs) + + @staticmethod + @contextmanager + def ignore_deprecation_warnings(): + with warnings.catch_warnings(record=True) as warning_list: # catch all warnings + yield + + # rethrow all warnings that were not DeprecationWarnings + for w in warning_list: + if not issubclass(w.category, DeprecationWarning): + warnings.showwarning(message=w.message, category=w.category, filename=w.filename, lineno=w.lineno, file=w.file, line=w.line) diff --git a/wagtail/tests/wagtail_hooks.py b/wagtail/tests/wagtail_hooks.py index 5dccca666..8c398ed2c 100644 --- a/wagtail/tests/wagtail_hooks.py +++ b/wagtail/tests/wagtail_hooks.py @@ -1,4 +1,6 @@ -from wagtail.wagtailadmin import hooks +from django.http import HttpResponse + +from wagtail.wagtailcore import hooks from wagtail.wagtailcore.whitelist import attribute_rule, check_url, allow_without_attributes def editor_css(): @@ -17,3 +19,9 @@ def whitelister_element_rules(): 'a': attribute_rule({'href': check_url, 'target': True}), } hooks.register('construct_whitelister_element_rules', whitelister_element_rules) + + +def block_googlebot(page, request, serve_args, serve_kwargs): + if request.META.get('HTTP_USER_AGENT') == 'GoogleBot': + return HttpResponse("bad googlebot no cookie
") +hooks.register('before_serve_page', block_googlebot) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index a15440016..d2eb181c3 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-
- """
- 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,
})
@@ -562,6 +575,11 @@ class BaseInlinePanel(EditHandler):
child_edit_handler_class(instance=subform.instance, form=subform)
)
+ # if this formset is valid, it may have been re-ordered; respect that
+ # in case the parent form errored and we need to re-render
+ if self.formset.can_order and self.formset.is_valid():
+ self.children = sorted(self.children, key=lambda x: x.form.cleaned_data['ORDER'])
+
empty_form = self.formset.empty_form
empty_form.fields['DELETE'].widget = forms.HiddenInput()
if self.formset.can_order:
@@ -588,7 +606,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 +615,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 +640,7 @@ Page.promote_panels = [
FieldPanel('search_description'),
], ugettext_lazy('Common page configuration')),
]
+
+Page.settings_panels = [
+ PublishingPanel()
+]
diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py
index e55a831f4..e9b10f63c 100644
--- a/wagtail/wagtailadmin/forms.py
+++ b/wagtail/wagtailadmin/forms.py
@@ -75,3 +75,20 @@ class PasswordResetForm(PasswordResetForm):
raise forms.ValidationError(_("This email address is not recognised."))
return cleaned_data
+
+
+class PageViewRestrictionForm(forms.Form):
+ restriction_type = forms.ChoiceField(label="Visibility", choices=[
+ ('none', ugettext_lazy("Public")),
+ ('password', ugettext_lazy("Private, accessible with the following password")),
+ ], widget=forms.RadioSelect)
+ password = forms.CharField(required=False)
+
+ def clean(self):
+ cleaned_data = super(PageViewRestrictionForm, self).clean()
+
+ if cleaned_data.get('restriction_type') == 'password' and not cleaned_data.get('password'):
+ self._errors["password"] = self.error_class([_('This field is required.')])
+ del cleaned_data['password']
+
+ return cleaned_data
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/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 06dba9b90..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,7 +341,7 @@ $(function() {
/* Set up behaviour of preview button */
$('.action-preview').click(function(e) {
e.preventDefault();
- $this = $(this);
+ var $this = $(this);
var previewWindow = window.open($this.data('placeholder'), $this.data('windowname'));
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js
new file mode 100644
index 000000000..eb280f00e
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js
@@ -0,0 +1,18 @@
+$(function() {
+ /* Interface to set permissions from the explorer / editor */
+ $('a.action-set-privacy').click(function() {
+ ModalWorkflow({
+ 'url': this.href,
+ 'responses': {
+ 'setPermission': function(isPublic) {
+ if (isPublic) {
+ $('.privacy-indicator').removeClass('private').addClass('public');
+ } else {
+ $('.privacy-indicator').removeClass('public').addClass('private');
+ }
+ }
+ }
+ });
+ return false;
+ });
+});
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/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
index 97e915f36..b6f5ca03c 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
@@ -121,8 +121,8 @@
color:lighten($color-grey-2,30%);
-webkit-font-smoothing: auto;
font-size:0.80em;
- margin:0 0.5em;
- background:white url("#{$static-root}bg-dark-diag.svg");
+ margin:0 0.5em 0.5em;
+ background:white url( "#{$static-root}bg-dark-diag.svg");
&.primary{
color:$color-grey-2;
@@ -136,6 +136,26 @@ a.status-tag.primary:hover{
color:$color-teal;
}
+.privacy-indicator {
+ .label-private, .label-public{
+ &:before{
+ font-size:1.5em;
+ color:$color-teal;
+ }
+ }
+ &.public {
+ .label-private {
+ display: none;
+ }
+ }
+ &.private {
+ .label-public {
+ display: none;
+ }
+ }
+}
+
+
/* free tagging tags from taggit */
.tag{
background-color:$color-teal;
@@ -174,6 +194,7 @@ a.tag:hover{
}
}
+
/* make a block-level element inline */
.inline{
display:inline;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index efc7f9ea1..d71ff66da 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{
@@ -66,6 +69,10 @@ input, textarea, select, .richtext, .tagit{
outline:none;
background-color:$color-input-focus;
}
+ &:disabled, &[disabled], &:disabled:hover, &[disabled]:hover{
+ background-color:inherit;
+ cursor:not-allowed;
+ }
}
/* select boxes */
@@ -132,6 +139,7 @@ input[type=radio]:before{
display:block;
content:"K";
width: 1em;
+ height:1em;
line-height: 1.1em;
padding: 4px;
background-color: white;
@@ -261,7 +269,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);
@@ -275,7 +283,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
&:before{
width:2em;
font-size:0.9rem;
- line-height:2em;
+ line-height:1.65em;
}
}
@@ -300,21 +308,13 @@ input[type=submit], input[type=reset], input[type=button], button{
}
}
-button.icon{
- &:before,
- &:after{
- line-height:0;
- }
-}
-
.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 */
@@ -435,58 +435,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{
@@ -692,14 +746,20 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
.choice_field &,
.model_multiple_choice_field &,
.boolean_field &,
+ .choice_field &,
.model_choice_field &,
.image_field &,
.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;
}
}
@@ -715,11 +775,12 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
}
&.bicolor{
- padding-left:3.5em;
+ padding-left:3.7em;
&:before{
- width:2.2em;
- line-height:2.45em;
+ width:2em;
+ line-height:2.2em;
+ font-size:1.1rem;
}
}
@@ -758,8 +819,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..1e9905d27 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
@@ -5,6 +5,10 @@ header{
margin-bottom:2em;
color:white;
+ a{
+ color:white;
+ }
+
h1, h2{
margin:0;
color:white;
@@ -97,19 +101,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;
-}
-
-
@media screen and (min-width: $breakpoint-mobile){
header{
padding-top:1.5em;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 5a6773638..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{
@@ -236,6 +235,9 @@
.icon-date:before{
content:"7";
}
+.icon-time:before{
+ content:"8";
+}
.icon-success:before{
content:"9";
}
@@ -248,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 9d940362a..537465083 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -343,7 +343,6 @@ ul.listing{
background:$color-teal-darker;
}
}
-
}
}
ul.listing{
@@ -357,6 +356,8 @@ table.listing{
/* explorer specific tweaks */
.page-explorer .listing {
+ position:relative;
+
.index{
color:white;
background-color:$color-header-bg;
@@ -366,6 +367,14 @@ table.listing{
padding-bottom:1.5em;
}
+ .privacy-indicator{
+ font-size:1em;
+ opacity:1;
+ position:absolute;
+ right:5%;
+ top:2em;
+ }
+
.title{
h2{
color:white;
@@ -376,9 +385,15 @@ table.listing{
color:white;
}
}
+
}
}
+ .privacy-indicator{
+ font-size:0.9em;
+ opacity:0.7;
+ }
+
.table-headers{
.ord{
padding-right:0;
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/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 @@
- + {{ child.render_as_field }} + + {% endfor %} +
- - {{ child.render_as_field }} - +
- {{ child.render_as_field }} {% endfor %}
- +
-
{% 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 %} -+ {{ child.render_as_object }} {% endfor %} 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 @@-
- +{{ form.username.label_tag }} -+{{ form.username }}
- -
+{{ form.password.label_tag }} -@@ -22,8 +30,7 @@+diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html new file mode 100644 index 000000000..b1471ba25 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html @@ -0,0 +1,8 @@ +{% load i18n %} +{% trans "Page privacy" as title_str %} +{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %} + +{{ form.password }}+diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html new file mode 100644 index 000000000..6298d6f5f --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html @@ -0,0 +1,16 @@ +{% load i18n %} +{% trans "Page privacy" as title_str %} +{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %} + +{% trans "This page has been made private by a parent page." %}
+{% trans "You can edit the privacy settings on:" %} {{ page_with_restriction.title }} +
+diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js new file mode 100644 index 000000000..0a40c0f85 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js @@ -0,0 +1,19 @@ +function(modal) { + $('form', modal.body).submit(function() { + modal.postForm(this.action, $(this).serialize()); + return false; + }); + + var restrictionTypePasswordField = $("input[name='restriction_type'][value='password']", modal.body); + var passwordField = $("#id_password", modal.body); + function refreshFormFields() { + if (restrictionTypePasswordField.is(':checked')) { + passwordField.removeAttr('disabled'); + } else { + passwordField.attr('disabled', true); + } + } + refreshFormFields(); + + $("input[name='restriction_type']", modal.body).change(refreshFormFields); +} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js new file mode 100644 index 000000000..dafbc7b36 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js @@ -0,0 +1,4 @@ +function(modal) { + modal.respond('setPermission', {% if is_public %}true{% else %}false{% endif %}); + modal.close(); +} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index 3ddb8c1f3..a3185e096 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -16,13 +16,12 @@ - - + {% hook_output 'insert_editor_js' %} {% endcompress %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html new file mode 100644 index 000000000..53aa44800 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html @@ -0,0 +1,23 @@ +{% load i18n wagtailadmin_tags %} + +{% test_page_is_public page as is_public %} +{% if not page_perms %} + {% page_permissions page as page_perms %} +{% endif %} + +{% trans "Note: privacy changes apply to all children of this page too." %}
+ + ++ {% trans "Privacy" %} + {% if page_perms.can_set_view_restrictions %} + + {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #} + {% trans 'Public' %} + {% trans 'Private' %} + + {% else %} + {% if is_public %} + {% trans 'Public' %} + {% else %} + {% trans 'Private' %} + {% endif %} + {% endif %} +diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html index b87af8fae..f21b93a27 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html @@ -39,12 +39,12 @@- {% trans 'Preview' as preview_label %} - {% if display_modes|length > 1 %} + {% if preview_modes|length > 1 %}
- {% trans "Status:" %} {% if page.live %}{{ page.status_string }}{% else %}{{ page.status_string }}{% endif %} + {% trans "Status" %} + {% if page.live %} + {{ page.status_string }} + {% else %} + {{ page.status_string }} + {% endif %} + + {% include "wagtailadmin/pages/_privacy_indicator.html" with page=page page_perms=page_perms only %} - -
- {{ 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 %}
+
-
{% for child in self.children %}
-
-
{% for child in self.children %}
-