No, but seriously -- welcome to the admin homepage.
+{{ self.title }}
+ {{ self.intro|richtext }} + + + + +form_page_landing.html is a regular Wagtail template, displayed after the user makes a successful form submission. diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst index 626aa42c0..458de387b 100644 --- a/docs/gettingstarted.rst +++ b/docs/gettingstarted.rst @@ -4,7 +4,7 @@ Getting Started On Ubuntu ~~~~~~~~~ -If you have a fresh instance of Ubuntu 13.04 or 13.10, you can install Wagtail, +If you have a fresh instance of Ubuntu 13.04 or later, you can install Wagtail, along with a demonstration site containing a set of standard templates and page types, in one step. As the root user:: @@ -166,4 +166,4 @@ Once you've experimented with the demo app and are ready to build your pages via COMMIT; EOF rm -r demo media/images/* media/original_images/* - perl -pi -e"s/('demo',|WAGTAILSEARCH_RESULTS_TEMPLATE)/#\1/" $PROJECT/settingsbase.py + perl -pi -e"s/('demo',|WAGTAILSEARCH_RESULTS_TEMPLATE)/#\1/" $PROJECT/settings/base.py diff --git a/docs/index.rst b/docs/index.rst index 5b2b62bc4..abbb7fdbe 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -9,8 +9,13 @@ It supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 support :maxdepth: 3 gettingstarted - building_your_site + building_your_site/index + editing_api + snippets wagtail_search + form_builder + model_recipes + advanced_topics deploying performance static_site_generation diff --git a/docs/model_recipes.rst b/docs/model_recipes.rst new file mode 100644 index 000000000..6a4abed47 --- /dev/null +++ b/docs/model_recipes.rst @@ -0,0 +1,201 @@ + +.. _model_recipes: + +Model Recipes +============= + +Overriding the serve() Method +----------------------------- + +Wagtail defaults to serving ``Page``-derived models by passing ``self`` to a Django HTML template matching the model's name, but suppose you wanted to serve something other than HTML? You can override the ``serve()`` method provided by the ``Page`` class and handle the Django request and response more directly. + +Consider this example from the Wagtail demo site's ``models.py``, which serves an ``EventPage`` object as an iCal file if the ``format`` variable is set in the request: + +.. code-block:: python + + class EventPage(Page): + ... + def serve(self, request): + if "format" in request.GET: + if request.GET['format'] == 'ical': + # Export to ical format + response = HttpResponse( + export_event(self, 'ical'), + content_type='text/calendar', + ) + response['Content-Disposition'] = 'attachment; filename=' + self.slug + '.ics' + return response + else: + # Unrecognised format error + message = 'Could not export event\n\nUnrecognised format: ' + request.GET['format'] + return HttpResponse(message, content_type='text/plain') + else: + # Display event page as usual + return super(EventPage, self).serve(request) + +``serve()`` takes a Django request object and returns a Django response object. Wagtail returns a ``TemplateResponse`` object with the template and context which it generates, which allows middleware to function as intended, so keep in mind that a simpler response object like a ``HttpResponse`` will not receive these benefits. + +With this strategy, you could use Django or Python utilities to render your model in JSON or XML or any other format you'd like. + + +Adding Endpoints with Custom route() Methods +-------------------------------------------- + +Wagtail routes requests by iterating over the path components (separated with a forward slash ``/``), finding matching objects based on their slug, and delegating further routing to that object's model class. The Wagtail source is very instructive in figuring out what's happening. This is the default ``route()`` method of the ``Page`` class: + +.. code-block:: python + + class Page(...): + + ... + + def route(self, request, path_components): + if path_components: + # request is for a child of this page + child_slug = path_components[0] + remaining_components = path_components[1:] + + # find a matching child or 404 + try: + subpage = self.get_children().get(slug=child_slug) + except Page.DoesNotExist: + raise Http404 + + # delegate further routing + return subpage.specific.route(request, remaining_components) + + else: + # request is for this very page + if self.live: + # use the serve() method to render the request if the page is published + return self.serve(request) + else: + # the page matches the request, but isn't published, so 404 + raise Http404 + +The contract is pretty simple. ``route()`` takes the current object (``self``), the ``request`` object, and a list of the remaining ``path_components`` from the request URL. It either continues delegating routing by calling ``route()`` again on one of its children in the Wagtail tree, or ends the routing process by serving something -- either normally through the ``self.serve()`` method or by raising a 404 error. + +By overriding the ``route()`` method, we could create custom endpoints for each object in the Wagtail tree. One use case might be using an alternate template when encountering the ``print/`` endpoint in the path. Another might be a REST API which interacts with the current object. Just to see what's involved, lets make a simple model which prints out all of its child path components. + +First, ``models.py``: + +.. code-block:: python + + from django.shortcuts import render + + ... + + class Echoer(Page): + + def route(self, request, path_components): + if path_components: + return render(request, self.template, { + 'self': self, + 'echo': ' '.join(path_components), + }) + else: + if self.live: + return self.serve(request) + else: + raise Http404 + + Echoer.content_panels = [ + FieldPanel('title', classname="full title"), + ] + + Echoer.promote_panels = [ + MultiFieldPanel(COMMON_PANELS, "Common page configuration"), + ] + +This model, ``Echoer``, doesn't define any properties, but does subclass ``Page`` so objects will be able to have a custom title and slug. The template just has to display our ``{{ echo }}`` property. We're skipping the ``serve()`` method entirely, but you could include your render code there to stay consistent with Wagtail's conventions. + +Now, once creating a new ``Echoer`` page in the Wagtail admin titled "Echo Base," requests such as:: + + http://127.0.0.1:8000/echo-base/tauntaun/kennel/bed/and/breakfast/ + +Will return:: + + tauntaun kennel bed and breakfast + + +.. _tagging: + +Tagging +------- + +Wagtail provides tagging capability through the combination of two django modules, ``taggit`` and ``modelcluster``. ``taggit`` provides a model for tags which is extended by ``modelcluster``, which in turn provides some magical database abstraction which makes drafts and revisions possible in Wagtail. It's a tricky recipe, but the net effect is a many-to-many relationship between your model and a tag class reserved for your model. + +Using an example from the Wagtail demo site, here's what the tag model and the relationship field looks like in ``models.py``: + +.. code-block:: python + + from modelcluster.fields import ParentalKey + from modelcluster.tags import ClusterTaggableManager + from taggit.models import Tag, TaggedItemBase + ... + class BlogPageTag(TaggedItemBase): + content_object = ParentalKey('demo.BlogPage', related_name='tagged_items') + ... + class BlogPage(Page): + ... + tags = ClusterTaggableManager(through=BlogPageTag, blank=True) + + BlogPage.promote_panels = [ + ... + FieldPanel('tags'), + ] + +Wagtail's admin provides a nice interface for inputting tags into your content, with typeahead tag completion and friendly tag icons. + +Now that we have the many-to-many tag relationship in place, we can fit in a way to render both sides of the relation. Here's more of the Wagtail demo site ``models.py``, where the index model for ``BlogPage`` is extended with logic for filtering the index by tag: + +.. code-block:: python + + class BlogIndexPage(Page): + ... + def serve(self, request): + # Get blogs + blogs = self.blogs + + # Filter by tag + tag = request.GET.get('tag') + if tag: + blogs = blogs.filter(tags__name=tag) + + return render(request, self.template, { + 'self': self, + 'blogs': blogs, + }) + +Here, ``blogs.filter(tags__name=tag)`` invokes a reverse Django queryset filter on the ``BlogPageTag`` model to optionally limit the ``BlogPage`` objects sent to the template for rendering. Now, lets render both sides of the relation by showing the tags associated with an object and a way of showing all of the objects associated with each tag. This could be added to the ``blog_page.html`` template: + +.. code-block:: django + + {% for tag in self.tags.all %} + {{ tag }} + {% endfor %} + +Iterating through ``self.tags.all`` will display each tag associated with ``self``, while the link(s) back to the index make use of the filter option added to the ``BlogIndexPage`` model. A Django query could also use the ``tagged_items`` related name field to get ``BlogPage`` objects associated with a tag. + +This is just one possible way of creating a taxonomy for Wagtail objects. With all of the components for a taxonomy available through Wagtail, you should be able to fulfill even the most exotic taxonomic schemes. + + +Custom Page Contexts by Overriding get_context() +------------------------------------------------ + + + +Load Alternate Templates by Overriding get_template() +----------------------------------------------------- + + + +Page Modes +---------- + +get_page_modes +show_as_mode + + + + diff --git a/docs/roadmap.rst b/docs/roadmap.rst index c94692fac..bdc711470 100644 --- a/docs/roadmap.rst +++ b/docs/roadmap.rst @@ -10,7 +10,7 @@ https://raw.github.com/torchbox/wagtail/master/CHANGELOG.txt In summary: - * February 2013: Reduced dependencies, basic documentation, translations, tests + * February 2014: Reduced dependencies, basic documentation, translations, tests What's next ~~~~~~~~~~~ @@ -19,12 +19,10 @@ The `issue list{{ advert_placement.advert.text }}
+ {% endfor %} + {% endif %} + + diff --git a/docs/static_site_generation.rst b/docs/static_site_generation.rst index fe4b504ea..a9379cd67 100644 --- a/docs/static_site_generation.rst +++ b/docs/static_site_generation.rst @@ -1,20 +1,20 @@ Generating a static site ======================== -This document describes how to render your Wagtail site into static HTML files using `django medusa`_ and the 'wagtail.contrib.wagtailmedusa' module. +This document describes how to render your Wagtail site into static HTML files on your local filesystem, Amazon S3 or Google App Engine, using `django medusa`_ and the ``wagtail.contrib.wagtailmedusa`` module. Installing django-medusa ~~~~~~~~~~~~~~~~~~~~~~~~ -Firstly, install django medusa from pip: +First, install django medusa from pip: .. code:: pip install django-medusa -Then add 'django_medusa' and 'wagtail.contrib.wagtailmedusa' to INSTALLED_APPS: +Then add ``django_medusa`` and ``wagtail.contrib.wagtailmedusa`` to ``INSTALLED_APPS``: .. code:: python @@ -28,9 +28,9 @@ Then add 'django_medusa' and 'wagtail.contrib.wagtailmedusa' to INSTALLED_APPS: Replacing GET parameters with custom routing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Pages which require GET parameters (eg, pagination) don't generate suitable filenames for generated HTML files so they need to be changed to use custom routing instead. +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. -For example, lets say we have a Blog Index which uses pagination. We can override the 'route' method to make it respond on urls like '/page/1' and pass the page number through to the serve method: +For example, let's say we have a Blog Index which uses pagination. We can override the ``route`` method to make it respond on urls like '/page/1', and pass the page number through to the ``serve`` method: .. code:: python @@ -53,7 +53,7 @@ For example, lets say we have a Blog Index which uses pagination. We can overrid 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. +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. For example, the BlogIndex above would need to yield one URL for each page of results: @@ -75,7 +75,7 @@ For example, the BlogIndex above would need to yield one URL for each page of re Rendering ~~~~~~~~~ -To render a site, just 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. +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 docsSearch Results{% if request.GET.q %} for {{ request.GET.q }}{% endif %}
+-
+ {% for result in search_results %}
+
-
+
{{ result.specific }}
+ {% if result.specific.search_description %} + {{ result.specific.search_description|safe }} + {% endif %} +
+ {% empty %}
+ - No results found + {% endfor %} +
+
+ {% endif %}
+ {% endwith %}
+
+Asynchronous Search with JSON and AJAX
+--------------------------------------
+
+Wagtail provides JSON search results when queries are made to the ``wagtailsearch_suggest`` view. To take advantage of it, we need a way to make that URL available to a static script. Instead of hard-coding it, let's set a global variable in our ``base.html``:
+
+.. code-block:: django
+
+
+
+Now add a simple interface for the search with a ```` element to gather search terms and a ``Editors picks
+-
+ {% for editors_pick in editors_picks %}
+
-
+
+ + {{ editors_pick.page.title }} + +
+{{ editors_pick.description|safe }}
+
+ {% endfor %}
+
`` to display the results:
+
+.. code-block:: html
+
+
+
+
+Finally, we'll use JQuery to make the asynchronous requests and handle the interactivity:
+
+.. code-block:: guess
+
+ $(function() {
+
+ // cache the elements
+ var searchBox = $('#json-search'),
+ resultsBox = $('#json-results');
+ // when there's something in the input box, make the query
+ searchBox.on('input', function() {
+ if( searchBox.val() == ''){
+ resultsBox.html('');
+ return;
+ }
+ // make the request to the Wagtail JSON search view
+ $.ajax({
+ 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);
+ })
+ .error(function(data){
+ console.log(data);
+ });
+ });
+
+ });
+
+Results are returned as a JSON object with this structure:
+
+.. code-block:: guess
+
+ {
+ [
+ {
+ title: "Lumpy Space Princess",
+ url: "/oh-my-glob/"
+ },
+ {
+ title: "Lumpy Space",
+ url: "/no-smooth-posers/"
+ },
+ ...
+ ]
+ }
+
+What if you wanted access to the rest of the results context or didn't feel like using JSON? Wagtail also provides a generalized AJAX interface where you can use your own template to serve results asynchronously.
+
+The AJAX interface uses the same view as the normal HTML search, ``wagtailsearch_search``, but will serve different results if Django classifies the request as AJAX (``request.is_ajax()``). Another entry in your project settings will let you override the template used to serve this response:
+
+.. code-block:: python
+
+ WAGTAILSEARCH_RESULTS_TEMPLATE_AJAX = 'myapp/includes/search_listing.html'
+
+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 ``Search
+ + +``. If you need more flexibility, such as multiple formats/templates based on differing requests, you can set up a custom search view.
+
+.. _editors-picks:
+
+
+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 `elasticutils`_ and `pyelasticsearch`_ packages:
+
+.. code-block:: guess
+
+ pip install elasticutils pyelasticsearch
+
+.. note::
+ The dependency on pyelasticsearch is scheduled to be replaced by a dependency on `elasticsearch-py`_.
+
+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 elasticutils. 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
-- Update ``WAGTAILSEARCH_ES_URLS`` and ``WAGTAILSEARCH_ES_INDEX`` in
- your local settings
+- Configure ``URLS`` and ``INDEX`` in the Elasticsearch entry in ``WAGTAILSEARCH_BACKENDS``
- Run ``./manage.py update_index``
-.. _Elasticsearch: http://www.elasticsearch.org/
+.. _elasticutils: http://elasticutils.readthedocs.org
+.. _pyelasticsearch: http://pyelasticsearch.readthedocs.org
+.. _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
\ No newline at end of file
+.. _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``.
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 008d24d2e..d35d6b087 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,3 @@
-# Requirements essential for developing wagtail (not needed to run it)
-
-unittest2==0.5.1
-
# For coverage and PEP8 linting
coverage==3.7.1
flake8==2.1.0
diff --git a/runtests.py b/runtests.py
index ab7bc37c3..6fd37ebeb 100755
--- a/runtests.py
+++ b/runtests.py
@@ -26,6 +26,8 @@ if not settings.configured:
if has_elasticsearch:
WAGTAILSEARCH_BACKENDS['elasticsearch'] = {
'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch',
+ 'TIMEOUT': 10,
+ 'max_retries': 1,
}
settings.configure(
@@ -40,6 +42,7 @@ if not settings.configured:
STATIC_URL='/static/',
STATIC_ROOT=STATIC_ROOT,
MEDIA_ROOT=MEDIA_ROOT,
+ USE_TZ=True,
STATICFILES_FINDERS=(
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'compressor.finders.CompressorFinder',
@@ -80,6 +83,7 @@ if not settings.configured:
'wagtail.wagtailembeds',
'wagtail.wagtailsearch',
'wagtail.wagtailredirects',
+ 'wagtail.wagtailforms',
'wagtail.tests',
],
diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh
index d29d5acdc..ee08191ac 100644
--- a/scripts/install/debian.sh
+++ b/scripts/install/debian.sh
@@ -1,5 +1,7 @@
# Production-configured Wagtail installation.
# BUT, SECURE SERVICES/ACCOUNT FOR FULL PRODUCTION USE!
+# For a non-dummy email backend configure Django's EMAIL_BACKEND
+# in settings/production.py post-installation.
# Tested on Debian 7.0.
# Tom Dyson and Neal Todd
diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh
index c713cefa9..299e67a8d 100644
--- a/scripts/install/ubuntu.sh
+++ b/scripts/install/ubuntu.sh
@@ -1,5 +1,7 @@
# Production-configured Wagtail installation.
# BUT, SECURE SERVICES/ACCOUNT FOR FULL PRODUCTION USE!
+# For a non-dummy email backend configure Django's EMAIL_BACKEND
+# in settings/production.py post-installation.
# Tested on Ubuntu 13.04 and 13.10.
# Tom Dyson and Neal Todd
diff --git a/setup.py b/setup.py
index e8da542bc..7b26817cd 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ except ImportError:
setup(
name='wagtail',
- version='0.2',
+ version='0.3.1',
description='A Django content management system focused on flexibility and user experience',
author='Matthew Westcott',
author_email='matthew.westcott@torchbox.com',
@@ -51,6 +51,7 @@ setup(
"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
],
diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index 0a0fc0528..11b82d9f1 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": 1,
+ "numchild": 3,
"show_in_menus": false,
"live": true,
"depth": 2,
@@ -39,7 +39,7 @@
"model": "wagtailcore.page",
"fields": {
"title": "Events",
- "numchild": 2,
+ "numchild": 3,
"show_in_menus": true,
"live": true,
"depth": 3,
@@ -62,7 +62,7 @@
"model": "wagtailcore.page",
"fields": {
"title": "Christmas",
- "numchild": 1,
+ "numchild": 0,
"show_in_menus": true,
"live": true,
"depth": 4,
@@ -90,7 +90,7 @@
"model": "wagtailcore.page",
"fields": {
"title": "Tentative Unpublished Event",
- "numchild": 1,
+ "numchild": 0,
"show_in_menus": true,
"live": false,
"depth": 4,
@@ -118,7 +118,7 @@
"model": "wagtailcore.page",
"fields": {
"title": "Someone Else's Event",
- "numchild": 1,
+ "numchild": 0,
"show_in_menus": true,
"live": false,
"depth": 4,
@@ -164,6 +164,57 @@
}
},
+{
+ "pk": 8,
+ "model": "wagtailcore.page",
+ "fields": {
+ "title": "Contact us",
+ "numchild": 0,
+ "show_in_menus": true,
+ "live": true,
+ "depth": 3,
+ "content_type": ["tests", "formpage"],
+ "path": "000100010003",
+ "url_path": "/home/contact-us/",
+ "slug": "contact-us"
+ }
+},
+{
+ "pk": 8,
+ "model": "tests.formpage",
+ "fields": {
+ }
+},
+
+{
+ "pk": 1,
+ "model": "tests.formfield",
+ "fields": {
+ "sort_order": 1,
+ "label": "Your email",
+ "field_type": "email",
+ "required": true,
+ "choices": "",
+ "default_value": "",
+ "help_text": "",
+ "page": 8
+ }
+},
+{
+ "pk": 2,
+ "model": "tests.formfield",
+ "fields": {
+ "sort_order": 2,
+ "label": "Your message",
+ "field_type": "multiline",
+ "required": true,
+ "choices": "",
+ "default_value": "",
+ "help_text": "",
+ "page": 8
+ }
+},
+
{
"pk": 1,
"model": "wagtailcore.site",
@@ -201,6 +252,19 @@
]
}
},
+{
+ "pk": 5,
+ "model": "auth.group",
+ "fields": {
+ "name": "Site-wide editors",
+ "permissions": [
+ ["access_admin", "wagtailadmin", "admin"],
+ ["add_image", "wagtailimages", "image"],
+ ["change_image", "wagtailimages", "image"],
+ ["delete_image", "wagtailimages", "image"]
+ ]
+ }
+},
{
"pk": 1,
"model": "wagtailcore.grouppagepermission",
@@ -237,6 +301,15 @@
"permission_type": "publish"
}
},
+{
+ "pk": 5,
+ "model": "wagtailcore.grouppagepermission",
+ "fields": {
+ "group": ["Site-wide editors"],
+ "page": 2,
+ "permission_type": "edit"
+ }
+},
{
"pk": 1,
@@ -308,5 +381,42 @@
"password": "md5$seasalt$1e9bf2bf5606aa5c39852cc30f0f6f22",
"email": "inactiveuser@example.com"
}
+},
+{
+ "pk": 5,
+ "model": "auth.user",
+ "fields": {
+ "username": "siteeditor",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "groups": [
+ ["Site-wide editors"]
+ ],
+ "user_permissions": [],
+ "password": "md5$seasalt$1e9bf2bf5606aa5c39852cc30f0f6f22",
+ "email": "siteeditor@example.com"
+ }
+},
+
+{
+ "pk": 1,
+ "model": "wagtailforms.formsubmission",
+ "fields": {
+ "form_data": "{\"your-email\": \"old@example.com\", \"your-message\": \"this is a really old message\"}",
+ "page": 8,
+ "submit_time": "2013-01-01T12:00:00.000Z"
+ }
+},
+{
+ "pk": 2,
+ "model": "wagtailforms.formsubmission",
+ "fields": {
+ "form_data": "{\"your-email\": \"new@example.com\", \"your-message\": \"this is a fairly new message\"}",
+ "page": 8,
+ "submit_time": "2014-01-01T12:00:00.000Z"
+ }
}
]
diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index 97858df4d..e061a4bfe 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -6,6 +6,8 @@ from wagtail.wagtailcore.fields import RichTextField
from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel, InlinePanel, PageChooserPanel
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
EVENT_AUDIENCE_CHOICES = (
@@ -234,3 +236,61 @@ EventIndex.content_panels = [
FieldPanel('title', classname="full title"),
FieldPanel('intro', classname="full"),
]
+
+
+class FormField(AbstractFormField):
+ page = ParentalKey('FormPage', related_name='form_fields')
+
+class FormPage(AbstractEmailForm):
+ pass
+
+FormPage.content_panels = [
+ FieldPanel('title', classname="full title"),
+ InlinePanel(FormPage, 'form_fields', label="Form fields"),
+ MultiFieldPanel([
+ FieldPanel('to_address', classname="full"),
+ FieldPanel('from_address', classname="full"),
+ FieldPanel('subject', classname="full"),
+ ], "Email")
+]
+
+
+# Snippets
+
+# Snippets
+
+class Advert(models.Model):
+ url = models.URLField(null=True, blank=True)
+ text = models.CharField(max_length=255)
+
+ panels = [
+ FieldPanel('url'),
+ FieldPanel('text'),
+ ]
+
+ def __unicode__(self):
+ return self.text
+
+
+register_snippet(Advert)
+
+
+# AlphaSnippet and ZuluSnippet are for testing ordering of
+# snippets when registering. They are named as such to ensure
+# thier ordering is clear. They are registered during testing
+# to ensure specific [in]correct register ordering
+
+# AlphaSnippet is registered during TestSnippetOrdering
+class AlphaSnippet(models.Model):
+ text = models.CharField(max_length=255)
+
+ def __unicode__(self):
+ return self.text
+
+
+# ZuluSnippet is registered during TestSnippetOrdering
+class ZuluSnippet(models.Model):
+ text = models.CharField(max_length=255)
+
+ def __unicode__(self):
+ return self.text
diff --git a/wagtail/tests/templates/tests/form_page.html b/wagtail/tests/templates/tests/form_page.html
new file mode 100644
index 000000000..5fbd2ae9f
--- /dev/null
+++ b/wagtail/tests/templates/tests/form_page.html
@@ -0,0 +1,15 @@
+{% load pageurl %}
+
+
+
+ {{ self.title }}
+
+
+ {{ self.title }}
+
+
+ {{ self.title }}
+
+
+ \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: .\edit_handlers.py:81 .\edit_handlers.py:130 .\edit_handlers.py:134
+msgid "Please type a valid time"
+msgstr "請輸入一個有效的時間"
+
+#: .\edit_handlers.py:724
+msgid "Common page configuration"
+msgstr "一般頁面設定"
+
+#: .\forms.py:18
+msgid "Search term"
+msgstr "搜尋關鍵字"
+
+#: .\forms.py:42
+msgid "Enter your username"
+msgstr "請輸入您的帳號"
+
+#: .\forms.py:45
+msgid "Enter password"
+msgstr "請輸入密碼"
+
+#: .\forms.py:50
+msgid "Enter your email address to reset your password"
+msgstr "請輸入您的電子信箱來重新設定密碼"
+
+#: .\forms.py:59
+msgid "Please fill your email address."
+msgstr "請輸入您的電子信箱"
+
+#: .\forms.py:72
+msgid ""
+"Sorry, you cannot reset your password here as your user account is managed "
+"by another server."
+msgstr "對不起，您不能在此重新設定您的密碼，因為您的帳號是由其他伺服器所管理。"
+
+#: .\forms.py:75
+msgid "This email address is not recognised."
+msgstr "找不到這個電子信箱。"
+
+#: .\templates\wagtailadmin\base.html:7 .\templates\wagtailadmin\home.html:4
+msgid "Dashboard"
+msgstr "Dashboard"
+
+#: .\templates\wagtailadmin\base.html:31
+msgid "Menu"
+msgstr "選單"
+
+#: .\templates\wagtailadmin\home.html:22
+#, python-format
+msgid "Welcome to the %(site_name)s Wagtail CMS"
+msgstr "歡迎進入 %(site_name)s 的 Wagtail 內容管理系統"
+
+#: .\templates\wagtailadmin\home.html:33
+msgid ""
+"This is your dashboard on which helpful information about content you've "
+"created will be displayed."
+msgstr "這是您的 Dashboard，會顯示對於已建立的內容有幫助的訊息。"
+
+#: .\templates\wagtailadmin\login.html:4
+#: .\templates\wagtailadmin\login.html:55
+msgid "Sign in"
+msgstr "登入"
+
+#: .\templates\wagtailadmin\login.html:18
+msgid "Your username and password didn't match. Please try again."
+msgstr "您的帳號和密碼輸入錯誤，請再試一次。"
+
+#: .\templates\wagtailadmin\login.html:26
+msgid "Sign in to Wagtail"
+msgstr "登入 Wagtail"
+
+#: .\templates\wagtailadmin\login.html:42
+msgid "Forgotten it?"
+msgstr "忘記了嗎?"
+
+#: .\templates\wagtailadmin\account\account.html:4
+msgid "Account"
+msgstr "帳號"
+
+#: .\templates\wagtailadmin\account\account.html:11
+msgid "Set gravatar"
+msgstr "設定 gravatar"
+
+#: .\templates\wagtailadmin\account\account.html:15
+msgid ""
+"Your avatar image is provided by Gravatar and is connected to your email "
+"address. With a Gravatar account you can set an avatar for any number of "
+"other email addresses you use."
+msgstr "您的頭像是由 Gravatar 所提供，並且已經聯結你的電子信箱。一個 Gravatar 帳號可以設定多個電子信箱的頭像圖片。"
+
+#: .\templates\wagtailadmin\account\account.html:23
+#: .\templates\wagtailadmin\account\change_password.html:4
+msgid "Change password"
+msgstr "修改密碼"
+
+#: .\templates\wagtailadmin\account\account.html:27
+msgid "Change the password you use to log in."
+msgstr "修改登入用的密碼。"
+
+#: .\templates\wagtailadmin\account\change_password.html:16
+msgid "Change Password"
+msgstr "修改密碼"
+
+#: .\templates\wagtailadmin\account\change_password.html:19
+msgid ""
+"Your password can't be changed here. Please contact a site administrator."
+msgstr "您的密碼不能在這更改。請聯絡網站管理員。"
+
+#: .\templates\wagtailadmin\account\password_reset\complete.html:4
+#: .\templates\wagtailadmin\account\password_reset\confirm.html:42
+#: .\templates\wagtailadmin\account\password_reset\done.html:4
+#: .\templates\wagtailadmin\account\password_reset\form.html:37
+msgid "Reset password"
+msgstr "重新設定密碼"
+
+#: .\templates\wagtailadmin\account\password_reset\complete.html:15
+msgid "Password change successful"
+msgstr "密碼修改成功"
+
+#: .\templates\wagtailadmin\account\password_reset\complete.html:16
+msgid "Login"
+msgstr "登入"
+
+#: .\templates\wagtailadmin\account\password_reset\confirm.html:4
+#: .\templates\wagtailadmin\account\password_reset\confirm.html:26
+msgid "Set your new password"
+msgstr "設定您的新密碼"
+
+#: .\templates\wagtailadmin\account\password_reset\confirm.html:19
+msgid "The passwords do not match. Please try again."
+msgstr "密碼不一致，請再試一次。"
+
+#: .\templates\wagtailadmin\account\password_reset\done.html:15
+msgid "Check your email"
+msgstr "請檢查您的電子信箱"
+
+#: .\templates\wagtailadmin\account\password_reset\done.html:16
+msgid "A link to reset your password has been emailed to you."
+msgstr "一個重新設定密碼連結已經寄到您的電子信箱了"
+
+#: .\templates\wagtailadmin\account\password_reset\email.txt:2
+msgid "Please follow the link below to reset your password"
+msgstr "請點擊下面的連結來重新設定您的密碼"
+
+#: .\templates\wagtailadmin\account\password_reset\email_subject.txt:2
+msgid "Password reset"
+msgstr "密碼已經重新設定"
+
+#: .\templates\wagtailadmin\account\password_reset\form.html:27
+msgid "Reset your password"
+msgstr "重新設定您的密碼"
+
+#: .\templates\wagtailadmin\chooser\_link_types.html:5
+#: .\templates\wagtailadmin\chooser\_link_types.html:7
+msgid "Internal link"
+msgstr "內部連結"
+
+#: .\templates\wagtailadmin\chooser\_link_types.html:11
+#: .\templates\wagtailadmin\chooser\_link_types.html:13
+msgid "External link"
+msgstr "外部連結"
+
+#: .\templates\wagtailadmin\chooser\_link_types.html:17
+#: .\templates\wagtailadmin\chooser\_link_types.html:19
+msgid "Email link"
+msgstr "電子信箱連結"
+
+#: .\templates\wagtailadmin\chooser\_search_form.html:7
+#: .\templates\wagtailadmin\pages\search.html:3
+#: .\templates\wagtailadmin\pages\search.html:16
+#: .\templatetags\wagtailadmin_nav.py:44
+msgid "Search"
+msgstr "搜尋"
+
+#: .\templates\wagtailadmin\chooser\_search_results.html:3
+#: .\templatetags\wagtailadmin_nav.py:43
+msgid "Explorer"
+msgstr "瀏覽"
+
+#: .\templates\wagtailadmin\chooser\_search_results.html:5
+#: .\templates\wagtailadmin\pages\index.html:15
+#: .\templates\wagtailadmin\pages\move_choose_destination.html:10
+msgid "Home"
+msgstr "首頁"
+
+#: .\templates\wagtailadmin\chooser\_search_results.html:13
+#, python-format
+msgid ""
+"\n"
+" There is one match\n"
+" "
+msgid_plural ""
+"\n"
+" There are %(counter)s matches\n"
+" "
+msgstr[0] "\n 有一個符合"
+msgstr[1] "\n 有 $(counter)s 個符合"
+
+#: .\templates\wagtailadmin\chooser\browse.html:2
+#: .\templates\wagtailadmin\chooser\search.html:2
+#: .\templates\wagtailadmin\edit_handlers\page_chooser_panel.html:13
+msgid "Choose a page"
+msgstr "選擇一個頁面"
+
+#: .\templates\wagtailadmin\chooser\email_link.html:2
+msgid "Add an email link"
+msgstr "新增一個電子信箱"
+
+#: .\templates\wagtailadmin\chooser\email_link.html:14
+#: .\templates\wagtailadmin\chooser\external_link.html:14
+msgid "Insert link"
+msgstr "插入一個連結"
+
+#: .\templates\wagtailadmin\chooser\external_link.html:2
+msgid "Add an external link"
+msgstr "新增一個外部連結"
+
+#: .\templates\wagtailadmin\edit_handlers\chooser_panel.html:20
+msgid "Clear choice"
+msgstr "清除選擇"
+
+#: .\templates\wagtailadmin\edit_handlers\chooser_panel.html:22
+msgid "Choose another item"
+msgstr "選擇其他選項"
+
+#: .\templates\wagtailadmin\edit_handlers\chooser_panel.html:27
+msgid "Choose an item"
+msgstr "選擇一個選項"
+
+#: .\templates\wagtailadmin\edit_handlers\inline_panel_child.html:5
+msgid "Move up"
+msgstr "往上移動"
+
+#: .\templates\wagtailadmin\edit_handlers\inline_panel_child.html:6
+msgid "Move down"
+msgstr "往下移動"
+
+#: .\templates\wagtailadmin\edit_handlers\inline_panel_child.html:8
+#: .\templates\wagtailadmin\pages\confirm_delete.html:7
+#: .\templates\wagtailadmin\pages\edit.html:36
+#: .\templates\wagtailadmin\pages\list.html:68
+#: .\templates\wagtailadmin\pages\list.html:188
+msgid "Delete"
+msgstr "刪除"
+
+#: .\templates\wagtailadmin\edit_handlers\page_chooser_panel.html:12
+msgid "Choose another page"
+msgstr "選擇另外一個頁面"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:5
+msgid "Pages awaiting moderation"
+msgstr "這些頁面正等待審核"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:13
+#: .\templates\wagtailadmin\home\recent_edits.html:12
+#: .\templates\wagtailadmin\pages\list.html:101
+msgid "Title"
+msgstr "標題"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:14
+#: .\templates\wagtailadmin\pages\list.html:22
+msgid "Parent"
+msgstr "上一層"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:15
+#: .\templates\wagtailadmin\pages\list.html:24
+#: .\templates\wagtailadmin\pages\list.html:116
+msgid "Type"
+msgstr "類型"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:16
+msgid "Edited"
+msgstr "編輯"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:23
+#: .\templates\wagtailadmin\home\recent_edits.html:21
+#: .\templates\wagtailadmin\pages\list.html:167
+#: .\templates\wagtailadmin\pages\list.html:176
+msgid "Edit this page"
+msgstr "編輯這個頁面"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:28
+#: .\templates\wagtailadmin\pages\_moderator_userbar.html:12
+msgid "Approve"
+msgstr "通過"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:34
+#: .\templates\wagtailadmin\pages\_moderator_userbar.html:17
+msgid "Reject"
+msgstr "拒絕"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:37
+#: .\templates\wagtailadmin\home\recent_edits.html:23
+#: .\templates\wagtailadmin\pages\_moderator_userbar.html:9
+#: .\templates\wagtailadmin\pages\list.html:56
+#: .\templates\wagtailadmin\pages\list.html:176
+msgid "Edit"
+msgstr "編輯"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:38
+#: .\templates\wagtailadmin\pages\create.html:24
+#: .\templates\wagtailadmin\pages\edit.html:42
+msgid "Preview"
+msgstr "預覽"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:5
+msgid "Your most recent edits"
+msgstr "你最近的編輯"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:13
+msgid "Date"
+msgstr "日期"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:14
+#: .\templates\wagtailadmin\pages\list.html:25
+#: .\templates\wagtailadmin\pages\list.html:128
+msgid "Status"
+msgstr "狀態"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:25
+#: .\templates\wagtailadmin\pages\list.html:59
+#: .\templates\wagtailadmin\pages\list.html:179
+msgid "View draft"
+msgstr "觀看草稿"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:28
+#: .\templates\wagtailadmin\pages\list.html:62
+#: .\templates\wagtailadmin\pages\list.html:182
+msgid "View live"
+msgstr "觀看線上版"
+
+#: .\templates\wagtailadmin\home\site_summary.html:3
+msgid "Site summary"
+msgstr "網站摘要"
+
+#: .\templates\wagtailadmin\home\site_summary.html:6
+#, python-format
+msgid ""
+"\n"
+" %(total_pages)s Page\n"
+" "
+msgid_plural ""
+"\n"
+" %(total_pages)s Pages\n"
+" "
+msgstr[0] "\n %(total_pages)s 頁面\n "
+msgstr[1] "\n %(total_pages)s 頁面\n "
+
+#: .\templates\wagtailadmin\home\site_summary.html:13
+#, python-format
+msgid ""
+"\n"
+" %(total_images)s Image\n"
+" "
+msgid_plural ""
+"\n"
+" %(total_images)s Images\n"
+" "
+msgstr[0] "\n %(total_images)s 圖片\n "
+msgstr[1] "\n %(total_images)s 圖片\n "
+
+#: .\templates\wagtailadmin\home\site_summary.html:20
+#, python-format
+msgid ""
+"\n"
+" %(total_docs)s Document\n"
+" "
+msgid_plural ""
+"\n"
+" %(total_docs)s Documents\n"
+" "
+msgstr[0] "\n %(total_docs)s 文件\n "
+msgstr[1] "\n %(total_docs)s 文件\n "
+
+#: .\templates\wagtailadmin\notifications\approved.html:1
+#, python-format
+msgid "The page \"%(title)s\" has been approved"
+msgstr "這個頁面 \"%(title)s\" 已經通過"
+
+#: .\templates\wagtailadmin\notifications\approved.html:2
+#, python-format
+msgid "The page \"%(title)s\" has been approved."
+msgstr "這個頁面 \"%(title)s\" 已經通過"
+
+#: .\templates\wagtailadmin\notifications\approved.html:4
+msgid "You can view the page here:"
+msgstr "你可以在此觀看這個頁面"
+
+#: .\templates\wagtailadmin\notifications\rejected.html:1
+#, python-format
+msgid "The page \"%(title)s\" has been rejected"
+msgstr "這個頁面 \"%(title)s\" 已經被拒絕"
+
+#: .\templates\wagtailadmin\notifications\rejected.html:2
+#, python-format
+msgid "The page \"%(title)s\" has been rejected."
+msgstr "這個頁面 \"%(title)s\" 已經被拒絕"
+
+#: .\templates\wagtailadmin\notifications\rejected.html:4
+#: .\templates\wagtailadmin\notifications\submitted.html:5
+msgid "You can edit the page here:"
+msgstr "你可以在此編輯這個頁面："
+
+#: .\templates\wagtailadmin\notifications\submitted.html:1
+#, python-format
+msgid "The page \"%(page)s\" has been submitted for moderation"
+msgstr "這個頁面 \"%(page)s\" 已經送審"
+
+#: .\templates\wagtailadmin\notifications\submitted.html:2
+#, python-format
+msgid "The page \"%(page)s\" has been submitted for moderation."
+msgstr "這個頁面 \"%(page)s\" 已經送審。"
+
+#: .\templates\wagtailadmin\notifications\submitted.html:4
+msgid "You can preview the page here:"
+msgstr "你可以在此預覽這個頁面："
+
+#: .\templates\wagtailadmin\pages\_moderator_userbar.html:4
+#, python-format
+msgid ""
+"\n"
+" Previewing '%(title)s', submitted by %(submitted_by)s on %(submitted_on)s.\n"
+" "
+msgstr "\n 預覽 '%(title)s', %(submitted_by)s 在 %(submitted_on)s 送審。\n "
+
+#: .\templates\wagtailadmin\pages\add_subpage.html:6
+#, python-format
+msgid "Create a page in %(title)s"
+msgstr "以 %(title)s 為題建立一個頁面"
+
+#: .\templates\wagtailadmin\pages\add_subpage.html:9
+msgid "Create a page in"
+msgstr "在這建立一個頁面"
+
+#: .\templates\wagtailadmin\pages\add_subpage.html:13
+msgid "Choose which type of page you'd like to create."
+msgstr "選擇希望建立的頁面類型。"
+
+#: .\templates\wagtailadmin\pages\add_subpage.html:26
+#, python-format
+msgid "Pages using %(page_type)s"
+msgstr "%(page_type)s 類的頁面"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:3
+#, python-format
+msgid "Delete %(title)s"
+msgstr "刪除 %(title)s"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:12
+msgid "Are you sure you want to delete this page?"
+msgstr "你確定要刪除這頁嗎？"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:14
+#, python-format
+msgid ""
+"\n"
+" This will also delete one more subpage.\n"
+" "
+msgid_plural ""
+"\n"
+" This will also delete %(descendant_count)s more subpages.\n"
+" "
+msgstr[0] "\n 這也會刪除一個子頁面。 "
+msgstr[1] "\n 這也會刪除 %(descendant_count)s 個子頁面。 "
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:22
+msgid ""
+"Alternatively you can unpublish the page. This removes the page from public "
+"view and you can edit or publish it again later."
+msgstr "你可以選擇取消發佈此頁面。此頁面將將無法從外部觀看，你可以編輯後再次發。"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:26
+msgid "Delete it"
+msgstr "刪除"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:26
+msgid "Unpublish it"
+msgstr "取消發佈"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:3
+#, python-format
+msgid "Move %(title)s"
+msgstr "移動 %(title)s"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:6
+#: .\templates\wagtailadmin\pages\list.html:65
+#: .\templates\wagtailadmin\pages\list.html:185
+msgid "Move"
+msgstr "移動"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:11
+#, python-format
+msgid "Are you sure you want to move this page into '%(title)s'?"
+msgstr "你確定想要移動此頁面至 '%(title)s' 嗎？"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:13
+#, python-format
+msgid ""
+"Are you sure you want to move this page and all of its children into "
+"'%(title)s'?"
+msgstr "你確定要移動此頁面和其所有子頁面至 '%(title)s' 嗎？"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:18
+msgid "Yes, move this page"
+msgstr "是的，移動此頁面"
+
+#: .\templates\wagtailadmin\pages\confirm_unpublish.html:3
+#, python-format
+msgid "Unpublish %(title)s"
+msgstr "取消發佈 %(title)s"
+
+#: .\templates\wagtailadmin\pages\confirm_unpublish.html:6
+#: .\templates\wagtailadmin\pages\edit.html:33
+#: .\templates\wagtailadmin\pages\list.html:71
+#: .\templates\wagtailadmin\pages\list.html:191
+msgid "Unpublish"
+msgstr "取消發佈"
+
+#: .\templates\wagtailadmin\pages\confirm_unpublish.html:10
+msgid "Are you sure you want to unpublish this page?"
+msgstr "你確定想取消發佈此頁面嗎？"
+
+#: .\templates\wagtailadmin\pages\confirm_unpublish.html:13
+msgid "Yes, unpublish it"
+msgstr "是的，取消發佈"
+
+#: .\templates\wagtailadmin\pages\content_type_use.html:7
+msgid "Pages using"
+msgstr "頁面正在使用"
+
+#: .\templates\wagtailadmin\pages\create.html:5
+#, python-format
+msgid "New %(page_type)s"
+msgstr "新 %(page_type)s 分類"
+
+#: .\templates\wagtailadmin\pages\create.html:9
+msgid "New"
+msgstr "新"
+
+#: .\templates\wagtailadmin\pages\create.html:21
+msgid "Save as draft"
+msgstr "儲存為草稿"
+
+#: .\templates\wagtailadmin\pages\create.html:26
+#: .\templates\wagtailadmin\pages\edit.html:39
+msgid "Publish"
+msgstr "發佈"
+
+#: .\templates\wagtailadmin\pages\create.html:28
+#: .\templates\wagtailadmin\pages\edit.html:41
+msgid "Submit for moderation"
+msgstr "送審"
+
+#: .\templates\wagtailadmin\pages\edit.html:5
+#, python-format
+msgid "Editing %(title)s"
+msgstr "編輯 %(title)s"
+
+#: .\templates\wagtailadmin\pages\edit.html:12
+#, python-format
+msgid "Editing %(title)s"
+msgstr "編輯 %(title)s"
+
+#: .\templates\wagtailadmin\pages\edit.html:15
+msgid "Status:"
+msgstr "狀態："
+
+#: .\templates\wagtailadmin\pages\edit.html:29
+msgid "Save draft"
+msgstr "儲存草稿"
+
+#: .\templates\wagtailadmin\pages\edit.html:52
+#, python-format
+msgid "Last modified: %(last_mod)s"
+msgstr "上一次編輯：%(last_mod)s"
+
+#: .\templates\wagtailadmin\pages\edit.html:54
+#, python-format
+msgid "by %(modified_by)s"
+msgstr "作者 %(modified_by)s"
+
+#: .\templates\wagtailadmin\pages\index.html:4
+#, python-format
+msgid "Exploring %(title)s"
+msgstr "瀏覽%(title)s"
+
+#: .\templates\wagtailadmin\pages\list.html:53
+#: .\templates\wagtailadmin\pages\list.html:194
+msgid "Add child page"
+msgstr "新增子頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:94
+msgid "Disable ordering of child pages"
+msgstr "禁止子頁面的排序"
+
+#: .\templates\wagtailadmin\pages\list.html:94
+#: .\templates\wagtailadmin\pages\list.html:96
+msgid "Order"
+msgstr "排序"
+
+#: .\templates\wagtailadmin\pages\list.html:96
+msgid "Enable ordering of child pages"
+msgstr "開啟子頁面排序"
+
+#: .\templates\wagtailadmin\pages\list.html:149
+msgid "Drag"
+msgstr "拖曳"
+
+#: .\templates\wagtailadmin\pages\list.html:220
+#: .\templates\wagtailadmin\pages\list.html:224
+#, python-format
+msgid "Explorer subpages of '%(title)s'"
+msgstr "瀏覽 '%(title)s' 的子頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:220
+#: .\templates\wagtailadmin\pages\list.html:224
+#: .\templates\wagtailadmin\pages\list.html:228
+msgid "Explore"
+msgstr "瀏覽"
+
+#: .\templates\wagtailadmin\pages\list.html:228
+#, python-format
+msgid "Explorer child pages of '%(title)s'"
+msgstr "瀏覽 '%(title)s' 的子頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:230
+#, python-format
+msgid "Add a child page to '%(title)s'"
+msgstr "新增子頁面至 '%(title)s'"
+
+#: .\templates\wagtailadmin\pages\list.html:230
+msgid "Add subpage"
+msgstr "新增子頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:239
+msgid "No pages have been created."
+msgstr "沒有已儲存的頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:239
+#, python-format
+msgid "Why not add one?"
+msgstr "為什麼不 新增一個頁面呢？"
+
+#: .\templates\wagtailadmin\pages\move_choose_destination.html:3
+#, python-format
+msgid "Select a new parent page for %(title)s"
+msgstr "為 %(title)s 選擇一個新的母頁面"
+
+#: .\templates\wagtailadmin\pages\move_choose_destination.html:7
+#, python-format
+msgid "Select a new parent page for %(title)s"
+msgstr "為 %(title)s 選擇一個新的母頁面"
+
+#: .\templates\wagtailadmin\pages\search_results.html:6
+#, python-format
+msgid ""
+"\n"
+" There is one match\n"
+" "
+msgid_plural ""
+"\n"
+" There are %(counter)s matches\n"
+" "
+msgstr[0] "\n 有一個符合"
+msgstr[1] "\n 有 $(counter)s 個符合"
+
+#: .\templates\wagtailadmin\pages\search_results.html:17
+#, python-format
+msgid ""
+"\n"
+" Page %(page_number)s of %(num_pages)s.\n"
+" "
+msgstr "\n 第 %(page_number)s / %(num_pages)s頁。\n "
+
+#: .\templates\wagtailadmin\pages\search_results.html:24
+#: .\templates\wagtailadmin\pages\search_results.html:26
+#: .\templates\wagtailadmin\shared\pagination_nav.html:8
+#: .\templates\wagtailadmin\shared\pagination_nav.html:10
+#: .\templates\wagtailadmin\shared\pagination_nav.html:14
+msgid "Previous"
+msgstr "往前"
+
+#: .\templates\wagtailadmin\pages\search_results.html:33
+#: .\templates\wagtailadmin\pages\search_results.html:35
+#: .\templates\wagtailadmin\shared\pagination_nav.html:21
+#: .\templates\wagtailadmin\shared\pagination_nav.html:23
+#: .\templates\wagtailadmin\shared\pagination_nav.html:25
+msgid "Next"
+msgstr "往後"
+
+#: .\templates\wagtailadmin\pages\search_results.html:43
+#, python-format
+msgid "Sorry, no pages match \"%(query_string)s\""
+msgstr "對不起，沒有任何頁面符合 \"%(query_string)s\""
+
+#: .\templates\wagtailadmin\pages\search_results.html:45
+msgid "Enter a search term above"
+msgstr "請輸入關鍵字"
+
+#: .\templates\wagtailadmin\pages\select_location.html:3
+#, python-format
+msgid "Where do you want to create a %(page_type)s"
+msgstr "你想在哪建立 %(page_type)s"
+
+#: .\templates\wagtailadmin\pages\select_location.html:5
+msgid "Where do you want to create this"
+msgstr "你想在哪建立這個"
+
+#: .\templates\wagtailadmin\pages\select_type.html:3
+#: .\templates\wagtailadmin\pages\select_type.html:6
+msgid "Create a new page"
+msgstr "建立一個新頁面"
+
+#: .\templates\wagtailadmin\pages\select_type.html:10
+msgid ""
+"Your new page will be saved in the top level of your website. You "
+"can move it after saving."
+msgstr "你的新頁面將會儲存到網站的 最上層 你可以在儲存後移動它。"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:15
+msgid "Account settings"
+msgstr "帳號設定"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:16
+msgid "Log out"
+msgstr "登出"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:20
+msgid "More"
+msgstr "更多"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:22
+msgid "Redirects"
+msgstr "重導向"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:23
+msgid "Editors Picks"
+msgstr "編者精選"
+
+#: .\templates\wagtailadmin\shared\pagination_nav.html:3
+#, python-format
+msgid "Page %(page_num)s of %(total_pages)s."
+msgstr "第 %(page_num)s 頁 共 %(total_pages)s 頁"
+
+#: .\templatetags\wagtailadmin_nav.py:52
+msgid "Images"
+msgstr "圖片"
+
+#: .\templatetags\wagtailadmin_nav.py:56
+msgid "Documents"
+msgstr "文件"
+
+#: .\templatetags\wagtailadmin_nav.py:61
+msgid "Snippets"
+msgstr "片段"
+
+#: .\templatetags\wagtailadmin_nav.py:66
+msgid "Users"
+msgstr "使用者"
+
+#: .\views\account.py:26
+msgid "Your password has been changed successfully!"
+msgstr "您的密碼已經更改成功。"
+
+#: .\views\pages.py:99
+msgid "Sorry, you do not have access to create a page of type '{0}'."
+msgstr "對不起，你沒有建立 '{0}' 類型頁面的權限。"
+
+#: .\views\pages.py:103
+msgid ""
+"Pages of this type can only be created as children of '{0}'. This "
+"new page will be saved there."
+msgstr "這一類的頁面只能建立為 '{0}' 的子頁面。此頁面將會儲存在那邊。"
+
+#: .\views\pages.py:166
+msgid "This slug is already in use"
+msgstr "這個地址已被使用"
+
+#: .\views\pages.py:187 .\views\pages.py:254 .\views\pages.py:589
+msgid "Page '{0}' published."
+msgstr "第 '{0}' 頁已發佈。"
+
+#: .\views\pages.py:189 .\views\pages.py:256
+msgid "Page '{0}' submitted for moderation."
+msgstr "第 '{0}' 頁已送審。"
+
+#: .\views\pages.py:192
+msgid "Page '{0}' created."
+msgstr "第 '{0}' 頁已建立。"
+
+#: .\views\pages.py:201
+msgid "The page could not be created due to errors."
+msgstr "這頁面因有錯誤而無法建立。"
+
+#: .\views\pages.py:259
+msgid "Page '{0}' updated."
+msgstr "第 '{0}' 頁已更新"
+
+#: .\views\pages.py:268
+msgid "The page could not be saved due to validation errors"
+msgstr "這頁面因有驗證錯誤而無法儲存。"
+
+#: .\views\pages.py:280
+msgid "This page is currently awaiting moderation"
+msgstr "這頁正等待審核"
+
+#: .\views\pages.py:298
+msgid "Page '{0}' deleted."
+msgstr "第 '{0}' 頁已刪除"
+
+#: .\views\pages.py:428
+msgid "Page '{0}' unpublished."
+msgstr "第 '{0}' 頁已取消發佈"
+
+#: .\views\pages.py:479
+msgid "Page '{0}' moved."
+msgstr "第 '{0}' 頁已移動。"
+
+#: .\views\pages.py:584 .\views\pages.py:602 .\views\pages.py:621
+msgid "The page '{0}' is not currently awaiting moderation."
+msgstr "第 '{0}' 頁目前不需要等待審核。"
+
+#: .\views\pages.py:608
+msgid "Page '{0}' rejected for publication."
+msgstr "第 '{0}' 頁已被拒絕發佈。"
diff --git a/wagtail/wagtailadmin/modal_workflow.py b/wagtail/wagtailadmin/modal_workflow.py
index a4d86f501..998dfdec3 100644
--- a/wagtail/wagtailadmin/modal_workflow.py
+++ b/wagtail/wagtailadmin/modal_workflow.py
@@ -23,4 +23,4 @@ def render_modal_workflow(request, html_template, js_template, template_vars={})
response_text = "{%s}" % ','.join(response_keyvars)
- return HttpResponse(response_text, mimetype="text/javascript")
+ return HttpResponse(response_text, content_type="text/javascript")
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/core.js b/wagtail/wagtailadmin/static/wagtailadmin/js/core.js
index e5895e34f..85c4ca31e 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/core.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/core.js
@@ -93,17 +93,6 @@ $(function(){
});
});
- $(".nav-main .more > a").bind('click keydown', function(){
- var currentAlt = $(this).data('altstate');
- var newAlt = $(this).html();
-
- $(this).html(currentAlt);
- $(this).data('altstate', newAlt);
- $(this).toggleClass('icon-arrow-up icon-arrow-down');
- $(this).parent().find('ul').toggle('fast');
- return false;
- });
-
$('#menu-search input').bind('focus', function(){
$('#menu-search').addClass('focussed');
}).bind('blur', function(){
@@ -128,7 +117,7 @@ $(function(){
$(window.headerSearch.termInput).trigger('focus');
function search () {
- var workingClasses = "working icon icon-spinner";
+ var workingClasses = "icon-spinner";
$(window.headerSearch.termInput).parent().addClass(workingClasses);
search_next_index++;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index cbff2c8af..4e8e1b02d 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -181,6 +181,17 @@ function InlinePanel(opts) {
self.updateMoveButtonDisabledStates();
});
}
+
+ /* Hide container on page load if it is marked as deleted. Remove the error
+ message so that it doesn't count towards the number of errors on the tab at the
+ top of the page. */
+ if ( $('#' + deleteInputId).val() === "1" ) {
+ $('#' + childId).hide(0, function() {
+ self.updateMoveButtonDisabledStates();
+ self.setHasContent();
+ });
+ $('#' + childId).find(".error-message").remove();
+ }
};
self.formsUl = $('#' + opts.formsetPrefix + '-FORMS');
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
index 569821e10..bc2b02a8c 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
@@ -177,4 +177,9 @@ a.tag:hover{
/* make a block-level element inline */
.inline{
display:inline;
+}
+
+/* utility class to allow things to be scrollable if their contents can't wrap more nicely */
+.overflow{
+ overflow:auto;
}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 9ef27297c..29c44b4f3 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -21,22 +21,13 @@ legend{
@include visuallyhidden();
}
-.fields li{
- padding-top:0.5em;
- padding-bottom:0.5em;
-}
-
-.field{
- padding:0 0 0.6em 0;
-}
-
label{
font-weight:bold;
color:$color-grey-1;
font-size:1.1em;
display:block;
padding:0 0 0.8em 0;
- line-height:1em;
+ line-height:1.3em;
.checkbox &,
.radio &{
@@ -47,10 +38,10 @@ label{
input, textarea, select, .richtext, .tagit{
@include border-radius(6px);
@include border-box();
- font-family:Open Sans,Arial,sans-serif;
width:100%;
- border:1px dashed $color-input-border;
- padding:1.2em;
+ font-family:Open Sans,Arial,sans-serif;
+ border:1px solid $color-input-border;
+ padding:0.9em 1.2em;
background-color:$color-fieldset-hover;
-webkit-appearance: none;
color:$color-text-input;
@@ -76,10 +67,44 @@ input, textarea, select, .richtext, .tagit{
}
}
-input[type=radio],input[type=checkbox]{
+/* select boxes */
+.typed_choice_field .input{
+ position:relative;
+
+ select{
+ outline:none;
+ }
+
+ &:after{
+ @include border-radius(0 6px 6px 0);
+ z-index:0;
+ position:absolute;
+ right:1px;
+ top:1px;
+ height:95%;
+ width:1.5em;
+ font-family:wagtail;
+ content:"q";
+ border:1px solid $color-input-border;
+ border-width:0 0 0 1px;
+ text-align:center;
+ line-height:1.4em;
+ font-size:3em;
+ pointer-events:none;
+ color:$color-grey-3;
+ background-color:$color-fieldset-hover;
+ margin:0px 1px 0 0;
+ }
+
+ .ie &:after{
+ display:none;
+ }
+}
+
+/* radio and check boxes */
+input[type=radio], input[type=checkbox]{
@include border-radius(0);
cursor:pointer;
- float:left;
border:0;
}
@@ -350,18 +375,15 @@ button.icon{
.help, .error-message{
font-size:0.85em;
font-weight:normal;
- margin:0 0 0.5em 0;
+ margin:0.5em 0 0 0;
+}
+.error-message{
+ color:$color-red;
}
.help{
color:$color-grey-2;
}
-/* permanently show checkbox/radio help as they have no focus state */
-.boolean_field .help, .radio .help{
- opacity:1;
-}
-
-
fieldset:hover > .help,
.field.focused + .help,
.field:focus + .help,
@@ -380,18 +402,77 @@ li.focused > .help{
font-size:13px;
}
-.error-message{
- margin:0;
- color:$color-red;
- clear:both;
-}
-
.error input, .error textarea, .error select, .error .tagit{
border-color:$color-red;
background-color:$color-input-error-bg;
}
+/* Layouts for particular kinds of of fields */
+
+/* permanently show checkbox/radio help as they have no focus state */
+.boolean_field .help, .radio .help{
+ opacity:1;
+}
+.iconfield {
+ position:relative;
+
+ 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;
+ }
+
+ /* 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{
+ padding-top:0.5em;
+ padding-bottom:1.2em;
+}
+
+.field-content .input li{
+ label{
+ width:auto;
+ float:none;
+ }
+}
+
+.input{
+ clear:both;
+}
+
/* field sizing */
+
+.field-small{
+ input, textarea, select, .richtext, .tagit{
+ @include border-radius(3px);
+ padding:0.4em 1em;
+ }
+}
+
.field{
&.col1,
&.col2,
@@ -453,7 +534,7 @@ ul.inline li:first-child, li.inline:first-child{
display:block;
float:left;
color:$color-grey-3;
- line-height:0.85em;
+ line-height:1em;
font-size:2.5em;
margin-right:0.3em;
}
@@ -495,7 +576,6 @@ ul.inline li:first-child, li.inline:first-child{
.unchosen, .chosen{
&:before{
content:"b";
- margin-left:-0.1em; /* this glyphs appear to have left padding, counteracted here */
}
}
}
@@ -568,112 +648,6 @@ ul.tagit li.tagit-choice-editable{
}
}
-
-/* search bars (search integrated into header area) */
-.search-bar{
- margin-top:-2em;
- padding-top:1em;
- padding-bottom:1em;
- margin-bottom:2em;
-
- &.full-width{
- @include nice-padding();
- background-color:$color-header-bg;
- border-bottom:1px solid $color-grey-4;
- }
-
- label{
- display:none;
- }
-
- .fields{
- position:relative;
- clear:both;
-
- .field input{
- padding-left:3em;
-
- &:focus{
- background-color:white;
- }
- }
- .field:before, .field:after{
- font-family:wagtail;
- position:absolute;
- top:1em;
- font-size:25px;
-
- }
- .field:before{
- left:0.5em;
- content:"f";
- color:$color-grey-3;
- }
- .field:after{
- color:$color-teal;
- opacity:0.8;
- font-size:20px;
- width:20px;
- height:20px;
- line-height:23px;
- text-align:center;
- top:0.3em;
- right:0.5em;
- }
- }
- .submit{
- display:none;
- position:absolute;
- right:0;
- top:0;
- input{
- padding:1.55em 2em;
- }
- }
- .taglist{
- font-size:0.9em;
- line-height:2.4em;
- h3{
- display:inline;
- }
- a{
- white-space: nowrap
- }
- }
-
- &.small{
- margin:0;
- padding:0;
- .fields{
- li{
- padding:0;
- }
- .field{
- padding:0;
- }
- .field input{
- padding:0.4em 1.4em 0.4em 2em;
-
- &:focus{
- background-color:white;
- }
- }
- .field:before{
- font-size:1.1rem;
- top:0.45em;
- }
-
- }
- }
-}
-
-/* mozilla specific hack */
-@-moz-document url-prefix() {
- .search-bar .fields .field:after{
- line-height:20px;
- }
-}
-
/* Transitions */
fieldset, input, textarea, select{
@include transition(background-color 0.2s ease);
@@ -686,11 +660,22 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
}
@media screen and (min-width: $breakpoint-mobile){
- .help{
- opacity:1;
- }
- .fields{
- max-width:800px;
+ label{
+ @include column(2);
+ padding-top:1.2em;
+ padding-left:0;
+
+ .model_multiple_choice_field &,
+ .boolean_field &,
+ .model_choice_field &,
+ .image_field &,
+ .file_field &{
+ padding-top:0;
+ }
+
+ .boolean_field &{
+ padding-bottom:0;
+ }
}
input[type=submit], input[type=reset], input[type=button], .button, button{
@@ -706,4 +691,20 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
}
}
}
+
+ .help{
+ opacity:1;
+ }
+ .fields{
+ max-width:800px;
+ }
+
+ .field{
+ @include row();
+ }
+
+ .field-content{
+ @include column(10);
+ padding-right: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
new file mode 100644
index 000000000..849420ae0
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
@@ -0,0 +1,156 @@
+header{
+ padding-top:1em;
+ padding-bottom:1em;
+ background-color: $color-header-bg;
+ margin-bottom:2em;
+ color:white;
+
+ h1, h2{
+ margin:0;
+ color:white;
+ }
+
+ h1{
+ padding:0.2em 0;
+
+ &.icon:before{
+ width:1em;
+ display:none;
+ margin-right:0.4em;
+ font-size:1.5em;
+ }
+ }
+
+ .col{
+ float:left;
+ margin-right:2em;
+ }
+ .left{
+ float:left;
+
+ .hasform &:first-child{
+ padding-bottom:0.5em;
+ float:none;
+ }
+ }
+ .right{
+ text-align:right;
+ float:right;
+ }
+
+ /* For case where content below header should merge with it */
+ &.merged{
+ margin-bottom:0;
+ }
+ &.tab-merged, &.no-border{
+ border:0;
+ }
+ &.merged.no-border{
+ padding-bottom:0;
+ }
+ &.no-v-padding{
+ padding-top:0;
+ padding-bottom:0;
+ }
+ /*
+ &.hasform h1{
+ margin-top:0.2em;
+ }
+ */
+ .button{
+ background-color:$color-teal-darker;
+ &:hover{
+ background-color:$color-teal-dark;
+ }
+ }
+
+ /* necessary on mobile only to make way for hamburger menu */
+ &.nice-padding{
+ padding-left:4em;
+ }
+
+ label{
+ @include visuallyhidden();
+ }
+
+ input[type=text], select{
+ border-width:0;
+
+ &:focus{
+ background-color:white;
+ }
+ }
+
+ .fields{
+ margin-top:-0.5em;
+ li{
+ padding-bottom:0;
+ }
+ .field{
+ padding:0;
+ }
+ }
+
+ .field-content{
+ width:auto;
+ padding:0;
+ }
+}
+
+/* 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;
+ padding-bottom:1.5em;
+
+ .left{
+ float:left;
+ margin-right:0;
+
+ &:first-child{
+ padding-bottom:0;
+ float:left;
+ }
+ }
+ .second{
+ clear:none;
+
+ .right, .left{
+ float:right;
+ }
+ }
+
+ h1.icon:before{
+ display:inline-block;
+ }
+
+ .col3{
+ @include column(3);
+ }
+ .col3.addbutton{
+ width:auto;
+ }
+ .col6{
+ @include column(6);
+ }
+ .col9{
+ @include column(9);
+ }
+ .breadcrumb{
+ margin-left:-($desktop-nice-padding);
+ margin-right:-($desktop-nice-padding);
+ }
+ }
+}
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 9a1351d9a..4de3aa131 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -231,14 +231,20 @@
.icon-collapse-up:before{
content:"6";
}
+.icon-date:before{
+ content:"7";
+}
+.icon-success:before{
+ content:"9";
+}
.icon-help:before{
content:"?";
}
.icon-warning:before{
content:"!";
}
-.icon-success:before{
- content:"9";
+.icon-form:before{
+ content:"$";
}
.icon.text-replace{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
index 2c1232091..60200de20 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
@@ -11,6 +11,7 @@
@import "components/listing.scss";
@import "components/messages.scss";
@import "components/formatters.scss";
+@import "components/header.scss";
@import "fonts.scss";
@@ -225,19 +226,6 @@ img{
}
}
- .more{
- border:0;
-
- > a{
- &:before{
- margin-right:0.4em;
- }
- font-size:0.8em;
- padding:0.2em 1.2em;
- background-color:$color-grey-1-1;
- }
- }
-
.avatar{
display:none;
}
@@ -311,10 +299,6 @@ img{
}
}
- .js .nav-main .more ul{
- display:none;
- }
-
.explorer{
position:absolute;
margin-top:70px;
@@ -385,88 +369,6 @@ body.explorer-open {
}
}
-header{
- padding-top:1em;
- padding-bottom:1em;
- background-color: $color-header-bg;
- margin-bottom:2em;
- color:white;
-
- h1, h2{
- margin:0;
- color:white;
- }
-
- h1{
- padding:0.2em 0;
-
- &.icon:before{
- width:1em;
- display:none;
- margin-right:0.4em;
- font-size:1.3em;
- }
- }
-
- .col{
- float:left;
- margin-right:2em;
- }
- .left{
- float:left;
-
- .hasform &:first-child{
- padding-bottom:0.5em;
- float:none;
- }
- }
- .search-bar input{
- @include border-radius(3px);
- width:auto;
- border-width:0;
- }
- .right{
- text-align:right;
- float:right;
- }
-
- /* For case where content below header should merge with it */
- &.merged{
- margin-bottom:0;
- }
- &.tab-merged, &.no-border{
- border:0;
- }
- &.merged.no-border{
- padding-bottom:0;
- }
- &.no-v-padding{
- padding-top:0;
- padding-bottom:0;
- }
- /*
- &.hasform h1{
- margin-top:0.2em;
- }
- */
- .button{
- background-color:$color-teal-darker;
- &:hover{
- background-color:$color-teal-dark;
- }
- }
- /* necessary on mobile only to make way for hamburger menu */
- &.nice-padding{
- padding-left:4em;
- }
-}
-
-.page-explorer header{
- margin-bottom:0;
- padding-bottom:0em;
-}
-
-
footer{
@include row();
@include border-radius(3px 3px 0 0);
@@ -707,7 +609,7 @@ footer, .logo{
padding-right:$desktop-nice-padding;
}
- body{
+ .wrapper{
margin-left:$menu-width;
}
@@ -726,7 +628,7 @@ footer, .logo{
left:0;
height:100%;
width:$menu-width;
- margin-left: -$menu-width;
+ margin-left: 0;
.inner{
height:100%;
@@ -832,52 +734,6 @@ footer, .logo{
}
}
- header{
- padding-top:1.5em;
- padding-bottom:1.5em;
-
- &.nice-padding{
- @include nice-padding();
- }
-
- .left{
- float:left;
- margin-right:0;
-
- &:first-child{
- padding-bottom:0;
- float:left;
- }
- }
- .second{
- clear:none;
-
- .right, .left{
- float:right;
- }
- }
-
- h1.icon:before{
- display:inline-block;
- }
-
- .col3{
- @include column(3);
- }
- .col3.addbutton{
- width:auto;
- }
- .col6{
- @include column(6);
- }
- .col9{
- @include column(9);
- }
- .breadcrumb{
- margin-left:-($desktop-nice-padding);
- margin-right:-($desktop-nice-padding);
- }
- }
footer{
width:80%;
margin-left:50px;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot
index f55be6906..6ac63514a 100644
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 188de85f2..9bded54bf 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg
@@ -67,6 +67,8 @@
{{ self.title }}
+ + + diff --git a/wagtail/tests/templates/tests/form_page_landing.html b/wagtail/tests/templates/tests/form_page_landing.html new file mode 100644 index 000000000..e29a6a942 --- /dev/null +++ b/wagtail/tests/templates/tests/form_page_landing.html @@ -0,0 +1,11 @@ +{% load pageurl %} + + + +{{ self.title }}
+Thank you for your feedback.
+ + diff --git a/wagtail/tests/templates/tests/simple_page.html b/wagtail/tests/templates/tests/simple_page.html new file mode 100644 index 000000000..3413b3aa2 --- /dev/null +++ b/wagtail/tests/templates/tests/simple_page.html @@ -0,0 +1,11 @@ +{% load pageurl %} + + + +{{ self.title }}
+Simple page
+ + diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py index 7b6557a78..6590e6dcc 100644 --- a/wagtail/tests/utils.py +++ b/wagtail/tests/utils.py @@ -14,7 +14,9 @@ except ImportError: def login(client): # Create a user - User.objects.create_superuser(username='test', email='test@email.com', password='password') + user = User.objects.create_superuser(username='test', email='test@email.com', password='password') # Login client.login(username='test', password='password') + + return user diff --git a/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po b/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po index 80a75d43f..c43755acc 100644 --- a/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po +++ b/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po @@ -31,11 +31,11 @@ msgstr "搜索词" #: .\forms.py:42 msgid "Enter your username" -msgstr "" +msgstr "请输入用户名" #: .\forms.py:45 msgid "Enter password" -msgstr "" +msgstr "请输入密码" #: .\forms.py:50 msgid "Enter your email address to reset your password" @@ -89,7 +89,7 @@ msgstr "登录Wagtail" #: .\templates\wagtailadmin\login.html:42 msgid "Forgotten it?" -msgstr "忘记了？" +msgstr "忘记密码？" #: .\templates\wagtailadmin\account\account.html:4 msgid "Account" @@ -104,7 +104,7 @@ msgid "" "Your avatar image is provided by Gravatar and is connected to your email " "address. With a Gravatar account you can set an avatar for any number of " "other email addresses you use." -msgstr "您的头像图片是由Gravatar提供的，并且关联了您的电子邮件地址。一个Gravatar账号可以设置多个电子邮件地址的头像图片。" +msgstr "您的头像图片是由Gravatar提供的，并且关联了您的电子邮箱。一个Gravatar账号可以设置多个电子邮箱的头像图片。" #: .\templates\wagtailadmin\account\account.html:23 #: .\templates\wagtailadmin\account\change_password.html:4 @@ -113,7 +113,7 @@ msgstr "修改密码" #: .\templates\wagtailadmin\account\account.html:27 msgid "Change the password you use to log in." -msgstr "修改您用于登录的密码。" +msgstr "修改登录密码。" #: .\templates\wagtailadmin\account\change_password.html:16 msgid "Change Password" diff --git a/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.mo b/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.mo new file mode 100644 index 000000000..a00aa643b Binary files /dev/null and b/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.mo differ diff --git a/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.po new file mode 100644 index 000000000..f4d70b60e --- /dev/null +++ b/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.po @@ -0,0 +1,843 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Wagtail\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-14 23:02+0200\n" +"PO-Revision-Date: 2014-05-01 12:09+0000\n" +"Last-Translator: wdv4758h
- {% if field_type != "boolean_field" %}{{ field.label_tag }}{% endif %}
- {% block form_field %}
- {{ field }}
- {% endblock %}
- {% if field_type = "boolean_field" %}{{ field.label_tag }}{% endif %}
+ {{ field.label_tag }}
+
-{% if field.errors %}
-
-{% endif %}
-{% if field.help_text %}
-
+
+ {% block form_field %}
+ {{ field }}
+ {% endblock %}
+
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %} + + {% if field.errors %} + + {% endif %} +{{ field.help_text }}
-{% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html index 9cb28ed86..012dd32f8 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html @@ -28,15 +28,19 @@-
- +{% if search_url %} - {% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html index f7eb6528a..ce06d895c 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html @@ -10,19 +10,5 @@ {% trans "Log out" %}{{ form.username.label_tag }} - {{ form.username }} ++ {{ form.username }} +
- -
\ 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 3ea5d4d10..59340d2d8 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html @@ -5,12 +5,12 @@+{{ form.password.label_tag }} - {{ form.password }} +{% if show_password_reset %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html index 7078834ae..7258c5429 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html @@ -229,4 +229,24 @@+ {{ form.password }} +{% endif %} - \ No newline at end of file + + +{% if parent_page and pages and pages.paginator %} + ++{% endif %} \ 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 af4ba73a3..678dd67fd 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html @@ -1,21 +1,25 @@ {% load wagtailadmin_tags %} -{% blocktrans with page_number=pages.number num_pages=pages.paginator.num_pages%} + Page {{ page_number }} of {{ num_pages }}. + {% endblocktrans %}
+-
+
- + {% if pages.has_previous %} + {% trans "Previous" %} + {% endif %} + +
- + {% if pages.has_next %} + {% trans 'Next' %} + {% endif %} + +
- +
- {% if field|fieldtype != "boolean_field" %}{{ field.label_tag }}{% endif %} - {% block form_field %} - {{ field }} - {% endblock %} - {% if field|fieldtype = "boolean_field" %}{{ field.label_tag }}{% endif %} -+ {{ field.label_tag }} ++++ {% block form_field %} + {{ field }} + {% endblock %} + ++ {% if field.help_text %} +{{ field.help_text }}
+ {% endif %} - {% if field.errors %} - - {% endif %} - {% if field.help_text %} -{{ field.help_text }}
- {% endif %} + {% if field.errors %} + + {% endif %} +{{ title }} {{ subtitle }}
- {% if request.user.is_superuser %} {# for now, 'More' links will be superuser-only #}
- - -
-
- {% trans 'More' %}
-
-
-
-
- {% get_wagtailadmin_tab_urls as wagtailadmin_tab_urls %}
- {% for name, title in wagtailadmin_tab_urls %}
-
- {% endfor %}
-
- {% endif %}
-
{% endif %}{% blocktrans with page_num=items.number total_pages=items.paginator.num_pages %}Page {{ page_num }} of {{ total_pages }}.{% endblocktrans %}
-
@@ -7,11 +19,9 @@
{% if is_ajax %}
{% trans 'Previous' %}
{% elif is_searching %}
- {% trans 'Previous' %}
- {% elif is_ajax %}
-
+ {% trans 'Previous' %}
{% else %}
- {% trans 'Previous' %}
+ {% trans 'Previous' %}
{% endif %}
{% endif %}
@@ -20,9 +30,9 @@
{% if is_ajax %}
{% trans 'Next' %}
{% elif is_searching %}
- {% trans 'Next' %}
+ {% trans 'Next' %}
{% else %}
- {% trans 'Next' %}
+ {% trans 'Next' %}
{% endif %}
{% endif %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
index bc9475695..ac5038056 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
@@ -1,9 +1,10 @@
{% load compress %}
-
-
-
-
+
+
+
+
+
diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
index 30b4b2b6b..2d85c355e 100644
--- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
+++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
@@ -8,6 +8,7 @@ from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailcore.models import get_navigation_menu_items, UserPagePermissionsProxy
from wagtail.wagtailcore.util import camelcase_to_underscore
+
register = template.Library()
@@ -25,17 +26,6 @@ def explorer_subnav(nodes):
}
-@register.assignment_tag
-def get_wagtailadmin_tab_urls():
- resolver = urlresolvers.get_resolver(None)
- return [
- (key, value[2].get("title", key))
- for key, value
- in resolver.reverse_dict.items()
- if isinstance(key, basestring) and key.startswith('wagtailadmin_tab_')
- ]
-
-
@register.inclusion_tag('wagtailadmin/shared/main_nav.html', takes_context=True)
def main_nav(context):
menu_items = [
diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py
deleted file mode 100644
index c6bf6c8e6..000000000
--- a/wagtail/wagtailadmin/tests.py
+++ /dev/null
@@ -1,301 +0,0 @@
-from django.test import TestCase
-from wagtail.tests.models import SimplePage, EventPage
-from wagtail.tests.utils import login, unittest
-from wagtail.wagtailcore.models import Page
-from django.core.urlresolvers import reverse
-
-
-class TestHome(TestCase):
- def setUp(self):
- # Login
- login(self.client)
-
- def test_status_code(self):
- response = self.client.get(reverse('wagtailadmin_home'))
- self.assertEqual(response.status_code, 200)
-
-
-class TestPageExplorer(TestCase):
- def setUp(self):
- # Find root page
- self.root_page = Page.objects.get(id=2)
-
- # Add child page
- self.child_page = SimplePage()
- self.child_page.title = "Hello world!"
- self.child_page.slug = "hello-world"
- self.root_page.add_child(instance=self.child_page)
-
- # Login
- login(self.client)
-
- def test_explore(self):
- response = self.client.get(reverse('wagtailadmin_explore', args=(self.root_page.id, )))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(self.root_page, response.context['parent_page'])
- self.assertTrue(response.context['pages'].filter(id=self.child_page.id).exists())
-
-
-class TestPageCreation(TestCase):
- def setUp(self):
- # Find root page
- self.root_page = Page.objects.get(id=2)
-
- # Login
- login(self.client)
-
- def test_add_subpage(self):
- response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.root_page.id, )))
- self.assertEqual(response.status_code, 200)
-
- def test_add_subpage_nonexistantparent(self):
- response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(100000, )))
- self.assertEqual(response.status_code, 404)
-
- def test_create_simplepage(self):
- response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)))
- self.assertEqual(response.status_code, 200)
-
- def test_create_simplepage_post(self):
- post_data = {
- 'title': "New page!",
- 'content': "Some content",
- 'slug': 'hello-world',
- }
- response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
-
- # Should be redirected to explorer page
- self.assertEqual(response.status_code, 302)
-
- # Find the page and check it
- page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
- self.assertEqual(page.title, post_data['title'])
- self.assertIsInstance(page, SimplePage)
- self.assertFalse(page.live)
-
- def test_create_simplepage_post_publish(self):
- post_data = {
- 'title': "New page!",
- 'content': "Some content",
- 'slug': 'hello-world',
- 'action-publish': "Publish",
- }
- response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
-
- # Should be redirected to explorer page
- self.assertEqual(response.status_code, 302)
-
- # Find the page and check it
- page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
- self.assertEqual(page.title, post_data['title'])
- self.assertIsInstance(page, SimplePage)
- self.assertTrue(page.live)
-
- def test_create_simplepage_post_existingslug(self):
- # This tests the existing slug checking on page save
-
- # Create a page
- self.child_page = SimplePage()
- self.child_page.title = "Hello world!"
- self.child_page.slug = "hello-world"
- self.root_page.add_child(instance=self.child_page)
-
- # Attempt to create a new one with the same slug
- post_data = {
- 'title': "New page!",
- 'content': "Some content",
- 'slug': 'hello-world',
- 'action-publish': "Publish",
- }
- response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
-
- # Should not be redirected (as the save should fail)
- self.assertEqual(response.status_code, 200)
-
- def test_create_nonexistantparent(self):
- response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', 100000)))
- self.assertEqual(response.status_code, 404)
-
- @unittest.expectedFailure # FIXME: Crashes!
- def test_create_nonpagetype(self):
- response = self.client.get(reverse('wagtailadmin_pages_create', args=('wagtailimages', 'image', self.root_page.id)))
- self.assertEqual(response.status_code, 404)
-
-
-class TestPageEdit(TestCase):
- def setUp(self):
- # Find root page
- self.root_page = Page.objects.get(id=2)
-
- # Add child page
- self.child_page = SimplePage()
- self.child_page.title = "Hello world!"
- self.child_page.slug = "hello-world"
- self.child_page.live = True
- self.root_page.add_child(instance=self.child_page)
- self.child_page.save_revision()
-
- # Add event page (to test edit handlers)
- self.event_page = EventPage()
- self.event_page.title = "Event page"
- self.event_page.slug = "event-page"
- self.root_page.add_child(instance=self.event_page)
-
- # Login
- login(self.client)
-
- def test_edit_page(self):
- # Tests that the edit page loads
- response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )))
- self.assertEqual(response.status_code, 200)
-
- def test_edit_post(self):
- # Tests simple editing
- post_data = {
- 'title': "I've been edited!",
- 'content': "Some content",
- 'slug': 'hello-world',
- }
- response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
-
- # Should be redirected to explorer page
- self.assertEqual(response.status_code, 302)
-
- # The page should have "has_unpublished_changes" flag set
- child_page_new = SimplePage.objects.get(id=self.child_page.id)
- self.assertTrue(child_page_new.has_unpublished_changes)
-
- def test_edit_post_publish(self):
- # Tests publish from edit page
- post_data = {
- 'title': "I've been edited!",
- 'content': "Some content",
- 'slug': 'hello-world',
- 'action-publish': "Publish",
- }
- response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
-
- # Should be redirected to explorer page
- self.assertEqual(response.status_code, 302)
-
- # Check that the page was edited
- child_page_new = SimplePage.objects.get(id=self.child_page.id)
- self.assertEqual(child_page_new.title, post_data['title'])
-
- # The page shouldn't have "has_unpublished_changes" flag set
- self.assertFalse(child_page_new.has_unpublished_changes)
-
-
-class TestPageDelete(TestCase):
- def setUp(self):
- # Find root page
- self.root_page = Page.objects.get(id=2)
-
- # Add child page
- self.child_page = SimplePage()
- self.child_page.title = "Hello world!"
- self.child_page.slug = "hello-world"
- self.root_page.add_child(instance=self.child_page)
-
- # Login
- login(self.client)
-
- def test_delete(self):
- response = self.client.get(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )))
- self.assertEqual(response.status_code, 200)
-
- def test_delete_post(self):
- post_data = {'hello': 'world'} # For some reason, this test doesn't work without a bit of POST data
- response = self.client.post(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )), post_data)
-
- # Should be redirected to explorer page
- self.assertEqual(response.status_code, 302)
-
- # Check that the page is gone
- self.assertEqual(Page.objects.filter(path__startswith=self.root_page.path, slug='hello-world').count(), 0)
-
-
-class TestPageSearch(TestCase):
- def setUp(self):
- # Login
- login(self.client)
-
- def get(self, params={}):
- return self.client.get(reverse('wagtailadmin_pages_search'), params)
-
- def test_status_code(self):
- self.assertEqual(self.get().status_code, 200)
-
- def test_search(self):
- response = self.get({'q': "Hello"})
- self.assertEqual(response.status_code, 200)
- self.assertEqual(response.context['query_string'], "Hello")
-
- def test_pagination(self):
- pages = ['0', '1', '-1', '9999', 'Not a page']
- for page in pages:
- response = self.get({'p': page})
- self.assertEqual(response.status_code, 200)
-
- def test_root_can_appear_in_search_results(self):
- response = self.client.get('/admin/pages/search/?q=roo')
- self.assertEqual(response.status_code, 200)
- # 'pages' list in the response should contain root
- results = response.context['pages']
- self.assertTrue(any([r.slug == 'root' for r in results]))
-
-
-class TestPageMove(TestCase):
- def setUp(self):
- # Find root page
- self.root_page = Page.objects.get(id=2)
-
- # Create two sections
- self.section_a = SimplePage()
- self.section_a.title = "Section A"
- self.section_a.slug = "section-a"
- self.root_page.add_child(instance=self.section_a)
-
- self.section_b = SimplePage()
- self.section_b.title = "Section B"
- self.section_b.slug = "section-b"
- self.root_page.add_child(instance=self.section_b)
-
- # Add test page into section A
- self.test_page = SimplePage()
- self.test_page.title = "Hello world!"
- self.test_page.slug = "hello-world"
- self.section_a.add_child(instance=self.test_page)
-
- # Login
- login(self.client)
-
- def test_page_move(self):
- response = self.client.get(reverse('wagtailadmin_pages_move', args=(self.test_page.id, )))
- self.assertEqual(response.status_code, 200)
-
- def test_page_move_confirm(self):
- response = self.client.get(reverse('wagtailadmin_pages_move_confirm', args=(self.test_page.id, self.section_b.id)))
- self.assertEqual(response.status_code, 200)
-
- def test_page_set_page_position(self):
- response = self.client.get(reverse('wagtailadmin_pages_set_page_position', args=(self.test_page.id, )))
- self.assertEqual(response.status_code, 200)
-
-
-class TestEditorHooks(TestCase):
- def setUp(self):
- self.homepage = Page.objects.get(id=2)
- login(self.client)
-
- def test_editor_css_and_js_hooks_on_add(self):
- response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.homepage.id)))
- self.assertEqual(response.status_code, 200)
- self.assertContains(response, '')
- self.assertContains(response, '')
-
- def test_editor_css_and_js_hooks_on_edit(self):
- response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.homepage.id, )))
- self.assertEqual(response.status_code, 200)
- self.assertContains(response, '')
- self.assertContains(response, '')
diff --git a/wagtail/wagtailadmin/tests/__init__.py b/wagtail/wagtailadmin/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
new file mode 100644
index 000000000..95d54d7d9
--- /dev/null
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -0,0 +1,320 @@
+from django.test import TestCase
+from wagtail.tests.utils import login, unittest
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
+from django.contrib.auth.tokens import PasswordResetTokenGenerator
+from django.core import mail
+
+
+class TestAuthentication(TestCase):
+ """
+ This tests that users can login and logout of the admin interface
+ """
+ def setUp(self):
+ login(self.client)
+
+ def test_login_view(self):
+ """
+ This tests that the login view responds with a login page
+ """
+ # Logout so we can test the login view
+ self.client.logout()
+
+ # Get login page
+ response = self.client.get(reverse('wagtailadmin_login'))
+
+ # Check that the user recieved a login page
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/login.html')
+
+ def test_login_view_post(self):
+ """
+ This posts user credentials to the login view and checks that
+ the user was logged in successfully
+ """
+ # Logout so we can test the login view
+ self.client.logout()
+
+ # Post credentials to the login page
+ post_data = {
+ 'username': 'test',
+ 'password': 'password',
+ }
+ response = self.client.post(reverse('wagtailadmin_login'), post_data)
+
+ # Check that the user was redirected to the dashboard
+ self.assertEqual(response.status_code, 302)
+
+ # Check that the user was logged in
+ self.assertTrue('_auth_user_id' in self.client.session)
+ self.assertEqual(self.client.session['_auth_user_id'], User.objects.get(username='test').id)
+
+ @unittest.expectedFailure # See: https://github.com/torchbox/wagtail/issues/25
+ def test_already_logged_in_redirect(self):
+ """
+ This tests that a user who is already logged in is automatically
+ redirected to the admin dashboard if they try to access the login
+ page
+ """
+ # Get login page
+ response = self.client.get(reverse('wagtailadmin_login'))
+
+ # Check that the user was redirected to the dashboard
+ self.assertEqual(response.status_code, 302)
+
+ def test_logout(self):
+ """
+ This tests that the user can logout
+ """
+ # Get logout page page
+ response = self.client.get(reverse('wagtailadmin_logout'))
+
+ # Check that the user was redirected to the login page
+ self.assertEqual(response.status_code, 302)
+
+ # Check that the user was logged out
+ self.assertFalse('_auth_user_id' in self.client.session)
+
+
+class TestAccountSection(TestCase):
+ """
+ This tests that the accounts section is working
+ """
+ def setUp(self):
+ login(self.client)
+
+ def test_account_view(self):
+ """
+ This tests that the login view responds with a login page
+ """
+ # Get account page
+ response = self.client.get(reverse('wagtailadmin_account'))
+
+ # Check that the user recieved an account page
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/account/account.html')
+
+ def test_change_password_view(self):
+ """
+ This tests that the change password view responds with a change password page
+ """
+ # Get change password page
+ response = self.client.get(reverse('wagtailadmin_account_change_password'))
+
+ # Check that the user recieved a change password page
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/account/change_password.html')
+
+ def test_change_password_view_post(self):
+ """
+ This posts a new password to the change password view and checks
+ that the users password was changed
+ """
+ # Post new password to change password page
+ post_data = {
+ 'new_password1': 'newpassword',
+ 'new_password2': 'newpassword',
+ }
+ response = self.client.post(reverse('wagtailadmin_account_change_password'), post_data)
+
+ # Check that the user was redirected
+ self.assertEqual(response.status_code, 302)
+
+ # Check that the password was changed
+ self.assertTrue(User.objects.get(username='test').check_password('newpassword'))
+
+ def test_change_password_view_post_password_mismatch(self):
+ """
+ This posts a two passwords that don't match to the password change
+ view and checks that a validation error was raised
+ """
+ # Post new password to change password page
+ post_data = {
+ 'new_password1': 'newpassword',
+ 'new_password2': 'badpassword',
+ }
+ response = self.client.post(reverse('wagtailadmin_account_change_password'), post_data)
+
+ # Check that the user wasn't redirected
+ self.assertEqual(response.status_code, 200)
+
+ # Check that a validation error was raised
+ self.assertTrue('new_password2' in response.context['form'].errors.keys())
+ self.assertTrue("The two password fields didn't match." in response.context['form'].errors['new_password2'])
+
+ # Check that the password was not changed
+ self.assertTrue(User.objects.get(username='test').check_password('password'))
+
+
+class TestPasswordReset(TestCase):
+ """
+ This tests that the password reset is working
+ """
+ def setUp(self):
+ # Create a user
+ User.objects.create_superuser(username='test', email='test@email.com', password='password')
+
+ def test_password_reset_view(self):
+ """
+ This tests that the password reset view returns a password reset page
+ """
+ # Get password reset page
+ response = self.client.get(reverse('password_reset'))
+
+ # Check that the user recieved a password reset page
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/account/password_reset/form.html')
+
+ def test_password_reset_view_post(self):
+ """
+ This posts an email address to the password reset view and
+ checks that a password reset email was sent
+ """
+ # Post email address to password reset view
+ post_data = {
+ 'email': 'test@email.com',
+ }
+ response = self.client.post(reverse('password_reset'), post_data)
+
+ # Check that the user was redirected
+ self.assertEqual(response.status_code, 302)
+
+ # Check that a password reset email was sent to the user
+ self.assertEqual(len(mail.outbox), 1)
+ self.assertEqual(mail.outbox[0].to, ['test@email.com'])
+ self.assertEqual(mail.outbox[0].subject, "Password reset")
+
+ def test_password_reset_view_post_unknown_email(self):
+ """
+ This posts an unknown email address to the password reset view and
+ checks that the password reset form raises a validation error
+ """
+ post_data = {
+ 'email': 'unknown@email.com',
+ }
+ response = self.client.post(reverse('password_reset'), post_data)
+
+ # Check that the user wasn't redirected
+ self.assertEqual(response.status_code, 200)
+
+ # Check that a validation error was raised
+ self.assertTrue('__all__' in response.context['form'].errors.keys())
+ self.assertTrue("This email address is not recognised." in response.context['form'].errors['__all__'])
+
+ # Check that an email was not sent
+ self.assertEqual(len(mail.outbox), 0)
+
+ def test_password_reset_view_post_invalid_email(self):
+ """
+ This posts an incalid email address to the password reset view and
+ checks that the password reset form raises a validation error
+ """
+ post_data = {
+ 'email': 'Hello world!',
+ }
+ response = self.client.post(reverse('password_reset'), post_data)
+
+ # Check that the user wasn't redirected
+ self.assertEqual(response.status_code, 200)
+
+ # Check that a validation error was raised
+ self.assertTrue('email' in response.context['form'].errors.keys())
+ self.assertTrue("Enter a valid email address." in response.context['form'].errors['email'])
+
+ # Check that an email was not sent
+ self.assertEqual(len(mail.outbox), 0)
+
+ def setup_password_reset_confirm_tests(self):
+ from django.utils.encoding import force_bytes
+ from django.utils.http import urlsafe_base64_encode
+
+ # Get user
+ self.user = User.objects.get(username='test')
+
+ # Generate a password reset token
+ self.password_reset_token = PasswordResetTokenGenerator().make_token(self.user)
+
+ # Generate a password reset uid
+ self.password_reset_uid = urlsafe_base64_encode(force_bytes(self.user.pk))
+
+ # Create url_args
+ self.url_kwargs = dict(uidb64=self.password_reset_uid, token=self.password_reset_token)
+
+ def test_password_reset_confirm_view(self):
+ """
+ This tests that the password reset confirm view returns a password reset confirm page
+ """
+ self.setup_password_reset_confirm_tests()
+
+ # Get password reset confirm page
+ response = self.client.get(reverse('password_reset_confirm', kwargs=self.url_kwargs))
+
+ # Check that the user recieved a password confirm done page
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/account/password_reset/confirm.html')
+
+ def test_password_reset_confirm_view_post(self):
+ """
+ This posts a new password to the password reset confirm view and checks
+ that the users password was changed
+ """
+ self.setup_password_reset_confirm_tests()
+
+ # Post new password to change password page
+ post_data = {
+ 'new_password1': 'newpassword',
+ 'new_password2': 'newpassword',
+ }
+ response = self.client.post(reverse('password_reset_confirm', kwargs=self.url_kwargs), post_data)
+
+ # Check that the user was redirected
+ self.assertEqual(response.status_code, 302)
+
+ # Check that the password was changed
+ self.assertTrue(User.objects.get(username='test').check_password('newpassword'))
+
+ def test_password_reset_confirm_view_post_password_mismatch(self):
+ """
+ This posts a two passwords that don't match to the password reset
+ confirm view and checks that a validation error was raised
+ """
+ self.setup_password_reset_confirm_tests()
+
+ # Post new password to change password page
+ post_data = {
+ 'new_password1': 'newpassword',
+ 'new_password2': 'badpassword',
+ }
+ response = self.client.post(reverse('password_reset_confirm', kwargs=self.url_kwargs), post_data)
+
+ # Check that the user wasn't redirected
+ self.assertEqual(response.status_code, 200)
+
+ # Check that a validation error was raised
+ self.assertTrue('new_password2' in response.context['form'].errors.keys())
+ self.assertTrue("The two password fields didn't match." in response.context['form'].errors['new_password2'])
+
+ # Check that the password was not changed
+ self.assertTrue(User.objects.get(username='test').check_password('password'))
+
+ def test_password_reset_done_view(self):
+ """
+ This tests that the password reset done view returns a password reset done page
+ """
+ # Get password reset done page
+ response = self.client.get(reverse('password_reset_done'))
+
+ # Check that the user recieved a password reset done page
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/account/password_reset/done.html')
+
+ def test_password_reset_complete_view(self):
+ """
+ This tests that the password reset complete view returns a password reset complete page
+ """
+ # Get password reset complete page
+ response = self.client.get(reverse('password_reset_complete'))
+
+ # Check that the user recieved a password reset complete page
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/account/password_reset/complete.html')
diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
new file mode 100644
index 000000000..14e57a35e
--- /dev/null
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -0,0 +1,661 @@
+from django.test import TestCase
+from wagtail.tests.models import SimplePage, EventPage
+from wagtail.tests.utils import login, unittest
+from wagtail.wagtailcore.models import Page, PageRevision
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User, Permission
+from django.core import mail
+
+
+class TestPageExplorer(TestCase):
+ def setUp(self):
+ # Find root page
+ self.root_page = Page.objects.get(id=2)
+
+ # Add child page
+ self.child_page = SimplePage()
+ self.child_page.title = "Hello world!"
+ self.child_page.slug = "hello-world"
+ self.root_page.add_child(instance=self.child_page)
+
+ # Login
+ login(self.client)
+
+ def test_explore(self):
+ response = self.client.get(reverse('wagtailadmin_explore', args=(self.root_page.id, )))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(self.root_page, response.context['parent_page'])
+ self.assertTrue(response.context['pages'].paginator.object_list.filter(id=self.child_page.id).exists())
+
+
+class TestPageCreation(TestCase):
+ def setUp(self):
+ # Find root page
+ self.root_page = Page.objects.get(id=2)
+
+ # Login
+ self.user = login(self.client)
+
+ def test_add_subpage(self):
+ response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.root_page.id, )))
+ self.assertEqual(response.status_code, 200)
+
+ def test_add_subpage_bad_permissions(self):
+ # Remove privileges from user
+ self.user.is_superuser = False
+ self.user.user_permissions.add(
+ Permission.objects.get(content_type__app_label='wagtailadmin', codename='access_admin')
+ )
+ self.user.save()
+
+ # Get add subpage page
+ response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.root_page.id, )))
+
+ # Check that the user recieved a 403 response
+ self.assertEqual(response.status_code, 403)
+
+ def test_add_subpage_nonexistantparent(self):
+ response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(100000, )))
+ self.assertEqual(response.status_code, 404)
+
+ def test_create_simplepage(self):
+ response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)))
+ self.assertEqual(response.status_code, 200)
+
+ def test_create_simplepage_bad_permissions(self):
+ # Remove privileges from user
+ self.user.is_superuser = False
+ self.user.user_permissions.add(
+ Permission.objects.get(content_type__app_label='wagtailadmin', codename='access_admin')
+ )
+ self.user.save()
+
+ # Get page
+ response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id, )))
+
+ # Check that the user recieved a 403 response
+ self.assertEqual(response.status_code, 403)
+
+ def test_create_simplepage_post(self):
+ post_data = {
+ 'title': "New page!",
+ 'content': "Some content",
+ 'slug': 'hello-world',
+ }
+ response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+ # Should be redirected to explorer page
+ self.assertEqual(response.status_code, 302)
+
+ # Find the page and check it
+ page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
+ self.assertEqual(page.title, post_data['title'])
+ self.assertIsInstance(page, SimplePage)
+ self.assertFalse(page.live)
+
+ def test_create_simplepage_post_publish(self):
+ post_data = {
+ 'title': "New page!",
+ 'content': "Some content",
+ 'slug': 'hello-world',
+ 'action-publish': "Publish",
+ }
+ response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+ # Should be redirected to explorer page
+ self.assertEqual(response.status_code, 302)
+
+ # Find the page and check it
+ page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
+ self.assertEqual(page.title, post_data['title'])
+ self.assertIsInstance(page, SimplePage)
+ self.assertTrue(page.live)
+
+ def test_create_simplepage_post_submit(self):
+ # Create a moderator user for testing email
+ moderator = User.objects.create_superuser('moderator', 'moderator@email.com', 'password')
+
+ # Submit
+ post_data = {
+ 'title': "New page!",
+ 'content': "Some content",
+ 'slug': 'hello-world',
+ 'action-submit': "Submit",
+ }
+ response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+ # Should be redirected to explorer page
+ self.assertEqual(response.status_code, 302)
+
+ # Find the page and check it
+ page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
+ self.assertEqual(page.title, post_data['title'])
+ self.assertIsInstance(page, SimplePage)
+ self.assertFalse(page.live)
+
+ # The latest revision for the page should now be in moderation
+ self.assertTrue(page.get_latest_revision().submitted_for_moderation)
+
+ # Check that the moderator got an email
+ self.assertEqual(len(mail.outbox), 1)
+ self.assertEqual(mail.outbox[0].to, ['moderator@email.com'])
+ self.assertEqual(mail.outbox[0].subject, 'The page "New page!" has been submitted for moderation')
+
+ def test_create_simplepage_post_existingslug(self):
+ # This tests the existing slug checking on page save
+
+ # Create a page
+ self.child_page = SimplePage()
+ self.child_page.title = "Hello world!"
+ self.child_page.slug = "hello-world"
+ self.root_page.add_child(instance=self.child_page)
+
+ # Attempt to create a new one with the same slug
+ post_data = {
+ 'title': "New page!",
+ 'content': "Some content",
+ 'slug': 'hello-world',
+ 'action-publish': "Publish",
+ }
+ response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+ # Should not be redirected (as the save should fail)
+ self.assertEqual(response.status_code, 200)
+
+ def test_create_nonexistantparent(self):
+ response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', 100000)))
+ self.assertEqual(response.status_code, 404)
+
+ @unittest.expectedFailure # FIXME: Crashes!
+ def test_create_nonpagetype(self):
+ response = self.client.get(reverse('wagtailadmin_pages_create', args=('wagtailimages', 'image', self.root_page.id)))
+ self.assertEqual(response.status_code, 404)
+
+ def test_preview_on_create(self):
+ post_data = {
+ 'title': "New page!",
+ 'content': "Some content",
+ 'slug': 'hello-world',
+ 'action-submit': "Submit",
+ }
+ response = self.client.post(reverse('wagtailadmin_pages_preview_on_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
+
+ # Check the response
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'tests/simple_page.html')
+ self.assertContains(response, "New page!")
+
+
+class TestPageEdit(TestCase):
+ def setUp(self):
+ # Find root page
+ self.root_page = Page.objects.get(id=2)
+
+ # Add child page
+ self.child_page = SimplePage()
+ self.child_page.title = "Hello world!"
+ self.child_page.slug = "hello-world"
+ self.child_page.live = True
+ self.root_page.add_child(instance=self.child_page)
+ self.child_page.save_revision()
+
+ # Add event page (to test edit handlers)
+ self.event_page = EventPage()
+ self.event_page.title = "Event page"
+ self.event_page.slug = "event-page"
+ self.root_page.add_child(instance=self.event_page)
+
+ # Login
+ self.user = login(self.client)
+
+ def test_page_edit(self):
+ # Tests that the edit page loads
+ response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )))
+ self.assertEqual(response.status_code, 200)
+
+ def test_page_edit_bad_permissions(self):
+ # Remove privileges from user
+ self.user.is_superuser = False
+ self.user.user_permissions.add(
+ Permission.objects.get(content_type__app_label='wagtailadmin', codename='access_admin')
+ )
+ self.user.save()
+
+ # Get edit page
+ response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )))
+
+ # Check that the user recieved a 403 response
+ self.assertEqual(response.status_code, 403)
+
+ def test_page_edit_post(self):
+ # Tests simple editing
+ post_data = {
+ 'title': "I've been edited!",
+ 'content': "Some content",
+ 'slug': 'hello-world',
+ }
+ response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+ # Should be redirected to explorer page
+ self.assertEqual(response.status_code, 302)
+
+ # The page should have "has_unpublished_changes" flag set
+ child_page_new = SimplePage.objects.get(id=self.child_page.id)
+ self.assertTrue(child_page_new.has_unpublished_changes)
+
+ def test_page_edit_post_publish(self):
+ # Tests publish from edit page
+ post_data = {
+ 'title': "I've been edited!",
+ 'content': "Some content",
+ 'slug': 'hello-world',
+ 'action-publish': "Publish",
+ }
+ response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+ # Should be redirected to explorer page
+ self.assertEqual(response.status_code, 302)
+
+ # Check that the page was edited
+ child_page_new = SimplePage.objects.get(id=self.child_page.id)
+ self.assertEqual(child_page_new.title, post_data['title'])
+
+ # The page shouldn't have "has_unpublished_changes" flag set
+ self.assertFalse(child_page_new.has_unpublished_changes)
+
+ def test_page_edit_post_submit(self):
+ # Create a moderator user for testing email
+ moderator = User.objects.create_superuser('moderator', 'moderator@email.com', 'password')
+
+ # Tests submitting from edit page
+ post_data = {
+ 'title': "I've been edited!",
+ 'content': "Some content",
+ 'slug': 'hello-world',
+ 'action-submit': "Submit",
+ }
+ response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
+
+ # Should be redirected to explorer page
+ self.assertEqual(response.status_code, 302)
+
+ # The page should have "has_unpublished_changes" flag set
+ child_page_new = SimplePage.objects.get(id=self.child_page.id)
+ self.assertTrue(child_page_new.has_unpublished_changes)
+
+ # The latest revision for the page should now be in moderation
+ self.assertTrue(child_page_new.get_latest_revision().submitted_for_moderation)
+
+ # Check that the moderator got an email
+ self.assertEqual(len(mail.outbox), 1)
+ self.assertEqual(mail.outbox[0].to, ['moderator@email.com'])
+ self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been submitted for moderation') # Note: should this be "I've been edited!"?
+
+ def test_preview_on_edit(self):
+ post_data = {
+ 'title': "I've been edited!",
+ 'content': "Some content",
+ 'slug': 'hello-world',
+ 'action-submit': "Submit",
+ }
+ response = self.client.post(reverse('wagtailadmin_pages_preview_on_edit', args=(self.child_page.id, )), post_data)
+
+ # Check the response
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'tests/simple_page.html')
+ self.assertContains(response, "I've been edited!")
+
+
+class TestPageDelete(TestCase):
+ def setUp(self):
+ # Find root page
+ self.root_page = Page.objects.get(id=2)
+
+ # Add child page
+ self.child_page = SimplePage()
+ self.child_page.title = "Hello world!"
+ self.child_page.slug = "hello-world"
+ self.root_page.add_child(instance=self.child_page)
+
+ # Login
+ self.user = login(self.client)
+
+ def test_page_delete(self):
+ response = self.client.get(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )))
+ self.assertEqual(response.status_code, 200)
+
+ def test_page_delete_bad_permissions(self):
+ # Remove privileges from user
+ self.user.is_superuser = False
+ self.user.user_permissions.add(
+ Permission.objects.get(content_type__app_label='wagtailadmin', codename='access_admin')
+ )
+ self.user.save()
+
+ # Get delete page
+ response = self.client.get(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )))
+
+ # Check that the user recieved a 403 response
+ self.assertEqual(response.status_code, 403)
+
+ def test_page_delete_post(self):
+ post_data = {'hello': 'world'} # For some reason, this test doesn't work without a bit of POST data
+ response = self.client.post(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )), post_data)
+
+ # Should be redirected to explorer page
+ self.assertEqual(response.status_code, 302)
+
+ # Check that the page is gone
+ self.assertEqual(Page.objects.filter(path__startswith=self.root_page.path, slug='hello-world').count(), 0)
+
+
+class TestPageSearch(TestCase):
+ def setUp(self):
+ # Login
+ login(self.client)
+
+ def get(self, params=None, **extra):
+ return self.client.get(reverse('wagtailadmin_pages_search'), params or {}, **extra)
+
+ def test_view(self):
+ response = self.get()
+ self.assertTemplateUsed(response, 'wagtailadmin/pages/search.html')
+ self.assertEqual(response.status_code, 200)
+
+ def test_search(self):
+ response = self.get({'q': "Hello"})
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/pages/search.html')
+ self.assertEqual(response.context['query_string'], "Hello")
+
+ def test_ajax(self):
+ response = self.get({'q': "Hello"}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateNotUsed(response, 'wagtailadmin/pages/search.html')
+ self.assertTemplateUsed(response, 'wagtailadmin/pages/search_results.html')
+ self.assertEqual(response.context['query_string'], "Hello")
+
+ def test_pagination(self):
+ pages = ['0', '1', '-1', '9999', 'Not a page']
+ for page in pages:
+ response = self.get({'q': "Hello", 'p': page})
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/pages/search.html')
+
+ def test_root_can_appear_in_search_results(self):
+ response = self.get({'q': "roo"})
+ self.assertEqual(response.status_code, 200)
+ # 'pages' list in the response should contain root
+ results = response.context['pages']
+ self.assertTrue(any([r.slug == 'root' for r in results]))
+
+
+class TestPageMove(TestCase):
+ def setUp(self):
+ # Find root page
+ self.root_page = Page.objects.get(id=2)
+
+ # Create two sections
+ self.section_a = SimplePage()
+ self.section_a.title = "Section A"
+ self.section_a.slug = "section-a"
+ self.root_page.add_child(instance=self.section_a)
+
+ self.section_b = SimplePage()
+ self.section_b.title = "Section B"
+ self.section_b.slug = "section-b"
+ self.root_page.add_child(instance=self.section_b)
+
+ # Add test page into section A
+ self.test_page = SimplePage()
+ self.test_page.title = "Hello world!"
+ self.test_page.slug = "hello-world"
+ self.section_a.add_child(instance=self.test_page)
+
+ # Login
+ self.user = login(self.client)
+
+ def test_page_move(self):
+ response = self.client.get(reverse('wagtailadmin_pages_move', args=(self.test_page.id, )))
+ self.assertEqual(response.status_code, 200)
+
+ def test_page_move_bad_permissions(self):
+ # Remove privileges from user
+ self.user.is_superuser = False
+ self.user.user_permissions.add(
+ Permission.objects.get(content_type__app_label='wagtailadmin', codename='access_admin')
+ )
+ self.user.save()
+
+ # Get move page
+ response = self.client.get(reverse('wagtailadmin_pages_move', args=(self.test_page.id, )))
+
+ # Check that the user recieved a 403 response
+ self.assertEqual(response.status_code, 403)
+
+ def test_page_move_confirm(self):
+ response = self.client.get(reverse('wagtailadmin_pages_move_confirm', args=(self.test_page.id, self.section_b.id)))
+ self.assertEqual(response.status_code, 200)
+
+ def test_page_set_page_position(self):
+ response = self.client.get(reverse('wagtailadmin_pages_set_page_position', args=(self.test_page.id, )))
+ self.assertEqual(response.status_code, 200)
+
+
+class TestPageUnpublish(TestCase):
+ def setUp(self):
+ self.user = login(self.client)
+
+ # Create a page to unpublish
+ root_page = Page.objects.get(id=2)
+ self.page = SimplePage(
+ title="Hello world!",
+ slug='hello-world',
+ live=True,
+ )
+ root_page.add_child(instance=self.page)
+
+ def test_unpublish_view(self):
+ """
+ This tests that the unpublish view responds with an unpublish confirm page
+ """
+ # Get unpublish page
+ response = self.client.get(reverse('wagtailadmin_pages_unpublish', args=(self.page.id, )))
+
+ # Check that the user recieved an unpublish confirm page
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/pages/confirm_unpublish.html')
+
+ def test_unpublish_view_invalid_page_id(self):
+ """
+ This tests that the unpublish view returns an error if the page id is invalid
+ """
+ # Get unpublish page
+ response = self.client.get(reverse('wagtailadmin_pages_unpublish', args=(12345, )))
+
+ # Check that the user recieved a 404 response
+ self.assertEqual(response.status_code, 404)
+
+ def test_unpublish_view_bad_permissions(self):
+ """
+ This tests that the unpublish view doesn't allow users without unpublish permissions
+ """
+ # Remove privileges from user
+ self.user.is_superuser = False
+ self.user.user_permissions.add(
+ Permission.objects.get(content_type__app_label='wagtailadmin', codename='access_admin')
+ )
+ self.user.save()
+
+ # Get unpublish page
+ response = self.client.get(reverse('wagtailadmin_pages_unpublish', args=(self.page.id, )))
+
+ # Check that the user recieved a 403 response
+ self.assertEqual(response.status_code, 403)
+
+ def test_unpublish_view_post(self):
+ """
+ This posts to the unpublish view and checks that the page was unpublished
+ """
+ # Post to the unpublish page
+ response = self.client.post(reverse('wagtailadmin_pages_unpublish', args=(self.page.id, )), {
+ 'foo': "Must post something or the view won't see this as a POST request",
+ })
+
+ # Check that the user was redirected
+ self.assertEqual(response.status_code, 302)
+
+ # Check that the page was unpublished
+ self.assertFalse(SimplePage.objects.get(id=self.page.id).live)
+
+
+class TestApproveRejectModeration(TestCase):
+ def setUp(self):
+ self.submitter = User.objects.create_superuser(
+ username='submitter',
+ email='submitter@email.com',
+ password='password',
+ )
+
+ self.user = login(self.client)
+
+ # Create a page and submit it for moderation
+ root_page = Page.objects.get(id=2)
+ self.page = SimplePage(
+ title="Hello world!",
+ slug='hello-world',
+ live=False,
+ )
+ root_page.add_child(instance=self.page)
+
+ self.page.save_revision(user=self.submitter, submitted_for_moderation=True)
+ self.revision = self.page.get_latest_revision()
+
+ def test_approve_moderation_view(self):
+ """
+ This posts to the approve moderation view and checks that the page was approved
+ """
+ # Post
+ response = self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(self.revision.id, )), {
+ 'foo': "Must post something or the view won't see this as a POST request",
+ })
+
+ # Check that the user was redirected
+ self.assertEqual(response.status_code, 302)
+
+ # Page must be live
+ self.assertTrue(Page.objects.get(id=self.page.id).live)
+
+ # Submitter must recieve an approved email
+ self.assertEqual(len(mail.outbox), 1)
+ self.assertEqual(mail.outbox[0].to, ['submitter@email.com'])
+ self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been approved')
+
+ def test_approve_moderation_view_bad_revision_id(self):
+ """
+ This tests that the approve moderation view handles invalid revision ids correctly
+ """
+ # Post
+ response = self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(12345, )), {
+ 'foo': "Must post something or the view won't see this as a POST request",
+ })
+
+ # Check that the user recieved a 404 response
+ self.assertEqual(response.status_code, 404)
+
+ def test_approve_moderation_view_bad_permissions(self):
+ """
+ This tests that the approve moderation view doesn't allow users without moderation permissions
+ """
+ # Remove privileges from user
+ self.user.is_superuser = False
+ self.user.user_permissions.add(
+ Permission.objects.get(content_type__app_label='wagtailadmin', codename='access_admin')
+ )
+ self.user.save()
+
+ # Post
+ response = self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(self.revision.id, )), {
+ 'foo': "Must post something or the view won't see this as a POST request",
+ })
+
+ # Check that the user recieved a 403 response
+ self.assertEqual(response.status_code, 403)
+
+ def test_reject_moderation_view(self):
+ """
+ This posts to the reject moderation view and checks that the page was rejected
+ """
+ # Post
+ response = self.client.post(reverse('wagtailadmin_pages_reject_moderation', args=(self.revision.id, )), {
+ 'foo': "Must post something or the view won't see this as a POST request",
+ })
+
+ # Check that the user was redirected
+ self.assertEqual(response.status_code, 302)
+
+ # Page must not be live
+ self.assertFalse(Page.objects.get(id=self.page.id).live)
+
+ # Revision must no longer be submitted for moderation
+ self.assertFalse(PageRevision.objects.get(id=self.revision.id).submitted_for_moderation)
+
+ # Submitter must recieve a rejected email
+ self.assertEqual(len(mail.outbox), 1)
+ self.assertEqual(mail.outbox[0].to, ['submitter@email.com'])
+ self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been rejected')
+
+ def test_reject_moderation_view_bad_revision_id(self):
+ """
+ This tests that the reject moderation view handles invalid revision ids correctly
+ """
+ # Post
+ response = self.client.post(reverse('wagtailadmin_pages_reject_moderation', args=(12345, )), {
+ 'foo': "Must post something or the view won't see this as a POST request",
+ })
+
+ # Check that the user recieved a 404 response
+ self.assertEqual(response.status_code, 404)
+
+ def test_reject_moderation_view_bad_permissions(self):
+ """
+ This tests that the reject moderation view doesn't allow users without moderation permissions
+ """
+ # Remove privileges from user
+ self.user.is_superuser = False
+ self.user.user_permissions.add(
+ Permission.objects.get(content_type__app_label='wagtailadmin', codename='access_admin')
+ )
+ self.user.save()
+
+ # Post
+ response = self.client.post(reverse('wagtailadmin_pages_reject_moderation', args=(self.revision.id, )), {
+ 'foo': "Must post something or the view won't see this as a POST request",
+ })
+
+ # Check that the user recieved a 403 response
+ self.assertEqual(response.status_code, 403)
+
+ def test_preview_for_moderation(self):
+ response = self.client.get(reverse('wagtailadmin_pages_preview_for_moderation', args=(self.revision.id, )))
+
+ # Check response
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'tests/simple_page.html')
+ self.assertContains(response, "Hello world!")
+
+
+class TestContentTypeUse(TestCase):
+ fixtures = ['test.json']
+
+ def setUp(self):
+ self.user = login(self.client)
+
+ def test_content_type_use(self):
+ # Get use of event page
+ response = self.client.get(reverse('wagtailadmin_pages_type_use', args=('tests', 'eventpage')))
+
+ # Check response
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'wagtailadmin/pages/content_type_use.html')
+ self.assertContains(response, "Christmas")
diff --git a/wagtail/wagtailadmin/tests/tests.py b/wagtail/wagtailadmin/tests/tests.py
new file mode 100644
index 000000000..12aa28a0b
--- /dev/null
+++ b/wagtail/wagtailadmin/tests/tests.py
@@ -0,0 +1,46 @@
+from django.test import TestCase
+from wagtail.tests.models import SimplePage, EventPage
+from wagtail.tests.utils import login, unittest
+from wagtail.wagtailcore.models import Page
+from wagtail.wagtailadmin.tasks import send_email_task
+from django.core.urlresolvers import reverse
+from django.core import mail
+
+
+class TestHome(TestCase):
+ def setUp(self):
+ # Login
+ login(self.client)
+
+ def test_status_code(self):
+ response = self.client.get(reverse('wagtailadmin_home'))
+ self.assertEqual(response.status_code, 200)
+
+
+class TestEditorHooks(TestCase):
+ def setUp(self):
+ self.homepage = Page.objects.get(id=2)
+ login(self.client)
+
+ def test_editor_css_and_js_hooks_on_add(self):
+ response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.homepage.id)))
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, '')
+ self.assertContains(response, '')
+
+ def test_editor_css_and_js_hooks_on_edit(self):
+ response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.homepage.id, )))
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, '')
+ self.assertContains(response, '')
+
+
+class TestSendEmailTask(TestCase):
+ def test_send_email(self):
+ send_email_task("Test subject", "Test content", ["nobody@email.com"], "test@email.com")
+
+ # Check that the email was sent
+ self.assertEqual(len(mail.outbox), 1)
+ self.assertEqual(mail.outbox[0].subject, "Test subject")
+ self.assertEqual(mail.outbox[0].body, "Test content")
+ self.assertEqual(mail.outbox[0].to, ["nobody@email.com"])
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 308f6fdd4..69e6b7f4f 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -5,7 +5,7 @@ from django.contrib import messages
from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.decorators import permission_required
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext as _
from django.views.decorators.vary import vary_on_headers
from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList
@@ -33,6 +33,17 @@ def index(request, parent_page_id=None):
else:
ordering = 'title'
+ # Pagination
+ if ordering != 'ord':
+ p = request.GET.get('p', 1)
+ paginator = Paginator(pages, 50)
+ try:
+ pages = paginator.page(p)
+ except PageNotAnInteger:
+ pages = paginator.page(1)
+ except EmptyPage:
+ pages = paginator.page(paginator.num_pages)
+
return render(request, 'wagtailadmin/pages/index.html', {
'parent_page': parent_page,
'ordering': ordering,
@@ -349,6 +360,10 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p
if form.is_valid():
form.save(commit=False)
+ # ensure that our unsaved page instance has a suitable url set
+ parent_page = get_object_or_404(Page, id=parent_page_id).specific
+ page.set_url_path(parent_page)
+
# This view will generally be invoked as an AJAX request; as such, in the case of
# an error Django will return a plaintext response. This isn't what we want, since
# we will be writing the response back to an HTML page regardless of success or
diff --git a/wagtail/wagtailadmin/views/tags.py b/wagtail/wagtailadmin/views/tags.py
index 31281d958..bef3043ae 100644
--- a/wagtail/wagtailadmin/views/tags.py
+++ b/wagtail/wagtailadmin/views/tags.py
@@ -16,4 +16,4 @@ def autocomplete(request):
response = json.dumps([tag.name for tag in tags])
- return HttpResponse(response, mimetype='text/javascript')
+ return HttpResponse(response, content_type='text/javascript')
diff --git a/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.mo b/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..db50be133
Binary files /dev/null and b/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 000000000..a5da59aff
--- /dev/null
+++ b/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Wagtail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-10 12:24+0200\n"
+"PO-Revision-Date: 2014-02-28 16:07+0000\n"
+"Last-Translator: wdv4758h
Christmas
') - self.assertContains(response, 'Event
') - - def test_serve_unknown_page_returns_404(self): - response = self.client.get('/events/quinquagesima/') - self.assertEqual(response.status_code, 404) - - def test_serve_unpublished_page_returns_404(self): - response = self.client.get('/events/tentative-unpublished-event/') - self.assertEqual(response.status_code, 404) - - def test_serve_with_multiple_sites(self): - events_page = Page.objects.get(url_path='/home/events/') - Site.objects.create(hostname='events.example.com', root_page=events_page) - - response = self.client.get('/christmas/', HTTP_HOST='events.example.com') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.templates[0].name, 'tests/event_page.html') - christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') - self.assertEqual(response.context['self'], christmas_page) - - self.assertContains(response, 'Christmas
') - self.assertContains(response, 'Event
') - - # same request to the default host should return a 404 - c = Client() - response = c.get('/christmas/', HTTP_HOST='localhost') - self.assertEqual(response.status_code, 404) - - def test_serve_with_custom_context(self): - response = self.client.get('/events/') - self.assertEqual(response.status_code, 200) - - # should render the whole page - self.assertContains(response, 'Events
') - - # response should contain data from the custom 'events' context variable - self.assertContains(response, 'Christmas') - - def test_ajax_response(self): - response = self.client.get('/events/', HTTP_X_REQUESTED_WITH='XMLHttpRequest') - self.assertEqual(response.status_code, 200) - - # should only render the content of includes/event_listing.html, not the whole page - self.assertNotContains(response, 'Events
') - self.assertContains(response, 'Christmas') - - -class TestStaticSitePaths(TestCase): - def setUp(self): - self.root_page = Page.objects.get(id=1) - - # For simple tests - self.home_page = self.root_page.add_child(instance=SimplePage(title="Homepage", slug="home")) - self.about_page = self.home_page.add_child(instance=SimplePage(title="About us", slug="about")) - self.contact_page = self.home_page.add_child(instance=SimplePage(title="Contact", slug="contact")) - - # For custom tests - self.event_index = self.root_page.add_child(instance=EventIndex(title="Events", slug="events")) - for i in range(20): - self.event_index.add_child(instance=EventPage(title="Event " + str(i), slug="event" + str(i))) - - def test_local_static_site_paths(self): - paths = list(self.about_page.get_static_site_paths()) - - self.assertEqual(paths, ['/']) - - def test_child_static_site_paths(self): - paths = list(self.home_page.get_static_site_paths()) - - self.assertEqual(paths, ['/', '/about/', '/contact/']) - - def test_custom_static_site_paths(self): - paths = list(self.event_index.get_static_site_paths()) - - # Event index path - expected_paths = ['/'] - - # One path for each page of results - expected_paths.extend(['/' + str(i + 1) + '/' for i in range(5)]) - - # One path for each event page - expected_paths.extend(['/event' + str(i) + '/' for i in range(20)]) - - paths.sort() - expected_paths.sort() - self.assertEqual(paths, expected_paths) - - -class TestPageUrlTags(TestCase): - fixtures = ['test.json'] - - def test_pageurl_tag(self): - response = self.client.get('/events/') - self.assertEqual(response.status_code, 200) - self.assertContains(response, 'Christmas') - - def test_slugurl_tag(self): - response = self.client.get('/events/christmas/') - self.assertEqual(response.status_code, 200) - self.assertContains(response, 'Back to events index') - - -class TestPagePermission(TestCase): - fixtures = ['test.json'] - - def test_nonpublisher_page_permissions(self): - event_editor = User.objects.get(username='eventeditor') - homepage = Page.objects.get(url_path='/home/') - christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') - unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') - someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/') - - homepage_perms = homepage.permissions_for_user(event_editor) - christmas_page_perms = christmas_page.permissions_for_user(event_editor) - unpub_perms = unpublished_event_page.permissions_for_user(event_editor) - someone_elses_event_perms = someone_elses_event_page.permissions_for_user(event_editor) - - self.assertFalse(homepage_perms.can_add_subpage()) - self.assertTrue(christmas_page_perms.can_add_subpage()) - self.assertTrue(unpub_perms.can_add_subpage()) - self.assertTrue(someone_elses_event_perms.can_add_subpage()) - - self.assertFalse(homepage_perms.can_edit()) - self.assertTrue(christmas_page_perms.can_edit()) - self.assertTrue(unpub_perms.can_edit()) - self.assertFalse(someone_elses_event_perms.can_edit()) # basic 'add' permission doesn't allow editing pages owned by someone else - - self.assertFalse(homepage_perms.can_delete()) - self.assertFalse(christmas_page_perms.can_delete()) # cannot delete because it is published - self.assertTrue(unpub_perms.can_delete()) - self.assertFalse(someone_elses_event_perms.can_delete()) - - self.assertFalse(homepage_perms.can_publish()) - self.assertFalse(christmas_page_perms.can_publish()) - self.assertFalse(unpub_perms.can_publish()) - - self.assertFalse(homepage_perms.can_unpublish()) - self.assertFalse(christmas_page_perms.can_unpublish()) - self.assertFalse(unpub_perms.can_unpublish()) - - self.assertFalse(homepage_perms.can_publish_subpage()) - self.assertFalse(christmas_page_perms.can_publish_subpage()) - self.assertFalse(unpub_perms.can_publish_subpage()) - - self.assertFalse(homepage_perms.can_reorder_children()) - self.assertFalse(christmas_page_perms.can_reorder_children()) - self.assertFalse(unpub_perms.can_reorder_children()) - - self.assertFalse(homepage_perms.can_move()) - self.assertFalse(christmas_page_perms.can_move()) # cannot move because this would involve unpublishing from its current location - self.assertTrue(unpub_perms.can_move()) - self.assertFalse(someone_elses_event_perms.can_move()) - - self.assertFalse(christmas_page_perms.can_move_to(unpublished_event_page)) # cannot move because this would involve unpublishing from its current location - self.assertTrue(unpub_perms.can_move_to(christmas_page)) - self.assertFalse(unpub_perms.can_move_to(homepage)) # no permission to create pages at destination - self.assertFalse(unpub_perms.can_move_to(unpublished_event_page)) # cannot make page a child of itself - - - def test_publisher_page_permissions(self): - event_moderator = User.objects.get(username='eventmoderator') - homepage = Page.objects.get(url_path='/home/') - christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') - unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') - - homepage_perms = homepage.permissions_for_user(event_moderator) - christmas_page_perms = christmas_page.permissions_for_user(event_moderator) - unpub_perms = unpublished_event_page.permissions_for_user(event_moderator) - - self.assertFalse(homepage_perms.can_add_subpage()) - self.assertTrue(christmas_page_perms.can_add_subpage()) - self.assertTrue(unpub_perms.can_add_subpage()) - - self.assertFalse(homepage_perms.can_edit()) - self.assertTrue(christmas_page_perms.can_edit()) - self.assertTrue(unpub_perms.can_edit()) - - self.assertFalse(homepage_perms.can_delete()) - self.assertTrue(christmas_page_perms.can_delete()) # cannot delete because it is published - self.assertTrue(unpub_perms.can_delete()) - - self.assertFalse(homepage_perms.can_publish()) - self.assertTrue(christmas_page_perms.can_publish()) - self.assertTrue(unpub_perms.can_publish()) - - self.assertFalse(homepage_perms.can_unpublish()) - self.assertTrue(christmas_page_perms.can_unpublish()) - self.assertFalse(unpub_perms.can_unpublish()) # cannot unpublish a page that isn't published - - self.assertFalse(homepage_perms.can_publish_subpage()) - self.assertTrue(christmas_page_perms.can_publish_subpage()) - self.assertTrue(unpub_perms.can_publish_subpage()) - - self.assertFalse(homepage_perms.can_reorder_children()) - self.assertTrue(christmas_page_perms.can_reorder_children()) - self.assertTrue(unpub_perms.can_reorder_children()) - - self.assertFalse(homepage_perms.can_move()) - self.assertTrue(christmas_page_perms.can_move()) - self.assertTrue(unpub_perms.can_move()) - - self.assertTrue(christmas_page_perms.can_move_to(unpublished_event_page)) - self.assertTrue(unpub_perms.can_move_to(christmas_page)) - self.assertFalse(unpub_perms.can_move_to(homepage)) # no permission to create pages at destination - self.assertFalse(unpub_perms.can_move_to(unpublished_event_page)) # cannot make page a child of itself - - def test_inactive_user_has_no_permissions(self): - user = User.objects.get(username='inactiveuser') - christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') - unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') - - christmas_page_perms = christmas_page.permissions_for_user(user) - unpub_perms = unpublished_event_page.permissions_for_user(user) - - self.assertFalse(unpub_perms.can_add_subpage()) - self.assertFalse(unpub_perms.can_edit()) - self.assertFalse(unpub_perms.can_delete()) - self.assertFalse(unpub_perms.can_publish()) - self.assertFalse(christmas_page_perms.can_unpublish()) - self.assertFalse(unpub_perms.can_publish_subpage()) - self.assertFalse(unpub_perms.can_reorder_children()) - self.assertFalse(unpub_perms.can_move()) - self.assertFalse(unpub_perms.can_move_to(christmas_page)) - - def test_superuser_has_full_permissions(self): - user = User.objects.get(username='superuser') - homepage = Page.objects.get(url_path='/home/') - root = Page.objects.get(url_path='/') - unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') - - homepage_perms = homepage.permissions_for_user(user) - root_perms = root.permissions_for_user(user) - unpub_perms = unpublished_event_page.permissions_for_user(user) - - self.assertTrue(homepage_perms.can_add_subpage()) - self.assertTrue(root_perms.can_add_subpage()) - - self.assertTrue(homepage_perms.can_edit()) - self.assertFalse(root_perms.can_edit()) # root is not a real editable page, even to superusers - - self.assertTrue(homepage_perms.can_delete()) - self.assertFalse(root_perms.can_delete()) - - self.assertTrue(homepage_perms.can_publish()) - self.assertFalse(root_perms.can_publish()) - - self.assertTrue(homepage_perms.can_unpublish()) - self.assertFalse(root_perms.can_unpublish()) - self.assertFalse(unpub_perms.can_unpublish()) - - self.assertTrue(homepage_perms.can_publish_subpage()) - self.assertTrue(root_perms.can_publish_subpage()) - - self.assertTrue(homepage_perms.can_reorder_children()) - self.assertTrue(root_perms.can_reorder_children()) - - self.assertTrue(homepage_perms.can_move()) - self.assertFalse(root_perms.can_move()) - - self.assertTrue(homepage_perms.can_move_to(root)) - self.assertFalse(homepage_perms.can_move_to(unpublished_event_page)) - - -class TestPageQuerySet(TestCase): - fixtures = ['test.json'] - - def test_live(self): - pages = Page.objects.live() - - # All pages must be live - for page in pages: - self.assertTrue(page.live) - - # Check that the homepage is in the results - homepage = Page.objects.get(url_path='/home/') - self.assertTrue(pages.filter(id=homepage.id).exists()) - - def test_not_live(self): - pages = Page.objects.not_live() - - # All pages must not be live - for page in pages: - self.assertFalse(page.live) - - # Check that "someone elses event" is in the results - event = Page.objects.get(url_path='/home/events/someone-elses-event/') - self.assertTrue(pages.filter(id=event.id).exists()) - - def test_page(self): - homepage = Page.objects.get(url_path='/home/') - pages = Page.objects.page(homepage) - - # Should only select the homepage - self.assertEqual(pages.count(), 1) - self.assertEqual(pages.first(), homepage) - - def test_not_page(self): - homepage = Page.objects.get(url_path='/home/') - pages = Page.objects.not_page(homepage) - - # Should select everything except for the homepage - self.assertEqual(pages.count(), Page.objects.all().count() - 1) - for page in pages: - self.assertNotEqual(page, homepage) - - def test_descendant_of(self): - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.descendant_of(events_index) - - # Check that all pages descend from events index - for page in pages: - self.assertTrue(page.get_ancestors().filter(id=events_index.id).exists()) - - def test_descendant_of_inclusive(self): - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.descendant_of(events_index, inclusive=True) - - # Check that all pages descend from events index, includes event index - for page in pages: - self.assertTrue(page == events_index or page.get_ancestors().filter(id=events_index.id).exists()) - - # Check that event index was included - self.assertTrue(pages.filter(id=events_index.id).exists()) - - def test_not_descendant_of(self): - homepage = Page.objects.get(url_path='/home/') - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.not_descendant_of(events_index) - - # Check that no pages descend from events_index - for page in pages: - self.assertFalse(page.get_ancestors().filter(id=events_index.id).exists()) - - # As this is not inclusive, events index should be in the results - self.assertTrue(pages.filter(id=events_index.id).exists()) - - def test_not_descendant_of_inclusive(self): - homepage = Page.objects.get(url_path='/home/') - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.not_descendant_of(events_index, inclusive=True) - - # Check that all pages descend from homepage but not events index - for page in pages: - self.assertFalse(page.get_ancestors().filter(id=events_index.id).exists()) - - # As this is inclusive, events index should not be in the results - self.assertFalse(pages.filter(id=events_index.id).exists()) - - def test_child_of(self): - homepage = Page.objects.get(url_path='/home/') - pages = Page.objects.child_of(homepage) - - # Check that all pages are children of homepage - for page in pages: - self.assertEqual(page.get_parent(), homepage) - - def test_not_child_of(self): - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.not_child_of(events_index) - - # Check that all pages are not children of events_index - for page in pages: - self.assertNotEqual(page.get_parent(), events_index) - - def test_ancestor_of(self): - root_page = Page.objects.get(id=1) - homepage = Page.objects.get(url_path='/home/') - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.ancestor_of(events_index) - - self.assertEqual(pages.count(), 2) - self.assertEqual(pages[0], root_page) - self.assertEqual(pages[1], homepage) - - def test_ancestor_of_inclusive(self): - root_page = Page.objects.get(id=1) - homepage = Page.objects.get(url_path='/home/') - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.ancestor_of(events_index, inclusive=True) - - self.assertEqual(pages.count(), 3) - self.assertEqual(pages[0], root_page) - self.assertEqual(pages[1], homepage) - self.assertEqual(pages[2], events_index) - - def test_not_ancestor_of(self): - root_page = Page.objects.get(id=1) - homepage = Page.objects.get(url_path='/home/') - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.not_ancestor_of(events_index) - - # Test that none of the ancestors are in pages - for page in pages: - self.assertNotEqual(page, root_page) - self.assertNotEqual(page, homepage) - - # Test that events index is in pages - self.assertTrue(pages.filter(id=events_index.id).exists()) - - def test_not_ancestor_of_inclusive(self): - root_page = Page.objects.get(id=1) - homepage = Page.objects.get(url_path='/home/') - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.not_ancestor_of(events_index, inclusive=True) - - # Test that none of the ancestors or the events_index are in pages - for page in pages: - self.assertNotEqual(page, root_page) - self.assertNotEqual(page, homepage) - self.assertNotEqual(page, events_index) - - def test_parent_of(self): - homepage = Page.objects.get(url_path='/home/') - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.parent_of(events_index) - - # Pages must only contain homepage - self.assertEqual(pages.count(), 1) - self.assertEqual(pages[0], homepage) - - def test_not_parent_of(self): - homepage = Page.objects.get(url_path='/home/') - events_index = Page.objects.get(url_path='/home/events/') - pages = Page.objects.not_parent_of(events_index) - - # Pages must not contain homepage - for page in pages: - self.assertNotEqual(page, homepage) - - # Test that events index is in pages - self.assertTrue(pages.filter(id=events_index.id).exists()) - - def test_sibling_of(self): - events_index = Page.objects.get(url_path='/home/events/') - event = Page.objects.get(url_path='/home/events/christmas/') - pages = Page.objects.sibling_of(event) - - # Check that all pages are children of events_index - for page in pages: - self.assertEqual(page.get_parent(), events_index) - - # Check that the event is not included - self.assertFalse(pages.filter(id=event.id).exists()) - - def test_sibling_of_inclusive(self): - events_index = Page.objects.get(url_path='/home/events/') - event = Page.objects.get(url_path='/home/events/christmas/') - pages = Page.objects.sibling_of(event, inclusive=True) - - # Check that all pages are children of events_index - for page in pages: - self.assertEqual(page.get_parent(), events_index) - - # Check that the event is included - self.assertTrue(pages.filter(id=event.id).exists()) - - def test_not_sibling_of(self): - events_index = Page.objects.get(url_path='/home/events/') - event = Page.objects.get(url_path='/home/events/christmas/') - pages = Page.objects.not_sibling_of(event) - - # Check that all pages are not children of events_index - for page in pages: - if page != event: - self.assertNotEqual(page.get_parent(), events_index) - - # Check that the event is included - self.assertTrue(pages.filter(id=event.id).exists()) - - # Test that events index is in pages - self.assertTrue(pages.filter(id=events_index.id).exists()) - - def test_not_sibling_of_inclusive(self): - events_index = Page.objects.get(url_path='/home/events/') - event = Page.objects.get(url_path='/home/events/christmas/') - pages = Page.objects.not_sibling_of(event, inclusive=True) - - # Check that all pages are not children of events_index - for page in pages: - self.assertNotEqual(page.get_parent(), events_index) - - # Check that the event is not included - self.assertFalse(pages.filter(id=event.id).exists()) - - # Test that events index is in pages - self.assertTrue(pages.filter(id=events_index.id).exists()) - - def test_type(self): - pages = Page.objects.type(EventPage) - - # Check that all objects are EventPages - for page in pages: - self.assertIsInstance(page.specific, EventPage) - - # Check that "someone elses event" is in the results - event = Page.objects.get(url_path='/home/events/someone-elses-event/') - self.assertTrue(pages.filter(id=event.id).exists()) - - def test_not_type(self): - pages = Page.objects.not_type(EventPage) - - # Check that no objects are EventPages - for page in pages: - self.assertNotIsInstance(page.specific, EventPage) - - # Check that the homepage is in the results - homepage = Page.objects.get(url_path='/home/') - self.assertTrue(pages.filter(id=homepage.id).exists()) - - -class TestMovePage(TestCase): - fixtures = ['test.json'] - - def test_move_page(self): - about_us_page = SimplePage.objects.get(url_path='/home/about-us/') - events_index = EventIndex.objects.get(url_path='/home/events/') - - events_index.move(about_us_page, pos='last-child') - - # re-fetch events index to confirm that db fields have been updated - events_index = EventIndex.objects.get(id=events_index.id) - self.assertEqual(events_index.url_path, '/home/about-us/events/') - self.assertEqual(events_index.depth, 4) - self.assertEqual(events_index.get_parent().id, about_us_page.id) - - # children of events_index should also have been updated - christmas = events_index.get_children().get(slug='christmas') - self.assertEqual(christmas.depth, 5) - self.assertEqual(christmas.url_path, '/home/about-us/events/christmas/') - - -class TestIssue7(TestCase): - """ - This tests for an issue where if a site root page was moved, all the page - urls in that site would change to None. - - The issue was caused by the 'wagtail_site_root_paths' cache variable not being - cleared when a site root page was moved. Which left all the child pages - thinking that they are no longer in the site and return None as their url. - - Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682 - Discussion: https://github.com/torchbox/wagtail/issues/7 - """ - - fixtures = ['test.json'] - - def test_issue7(self): - # Get homepage, root page and site - root_page = Page.objects.get(id=1) - homepage = Page.objects.get(url_path='/home/') - default_site = Site.objects.get(is_default_site=True) - - # Create a new homepage under current homepage - new_homepage = SimplePage(title="New Homepage", slug="new-homepage") - homepage.add_child(instance=new_homepage) - - # Set new homepage as the site root page - default_site.root_page = new_homepage - default_site.save() - - # Warm up the cache by getting the url - _ = homepage.url - - # Move new homepage to root - new_homepage.move(root_page, pos='last-child') - - # Get fresh instance of new_homepage - new_homepage = Page.objects.get(id=new_homepage.id) - - # Check url - self.assertEqual(new_homepage.url, '/') - - -class TestIssue157(TestCase): - """ - This tests for an issue where if a site root pages slug was changed, all the page - urls in that site would change to None. - - The issue was caused by the 'wagtail_site_root_paths' cache variable not being - cleared when a site root page was changed. Which left all the child pages - thinking that they are no longer in the site and return None as their url. - - Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682 - Discussion: https://github.com/torchbox/wagtail/issues/157 - """ - - fixtures = ['test.json'] - - def test_issue157(self): - # Get homepage - homepage = Page.objects.get(url_path='/home/') - - # Warm up the cache by getting the url - _ = homepage.url - - # Change homepage title and slug - homepage.title = "New home" - homepage.slug = "new-home" - homepage.save() - - # Get fresh instance of homepage - homepage = Page.objects.get(id=homepage.id) - - # Check url - self.assertEqual(homepage.url, '/') diff --git a/wagtail/wagtailcore/tests/__init__.py b/wagtail/wagtailcore/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/wagtail/wagtailcore/tests/test_management_commands.py b/wagtail/wagtailcore/tests/test_management_commands.py new file mode 100644 index 000000000..787b808b5 --- /dev/null +++ b/wagtail/wagtailcore/tests/test_management_commands.py @@ -0,0 +1,89 @@ +from StringIO import StringIO + +from django.test import TestCase, Client +from django.http import HttpRequest, Http404 +from django.core import management +from django.contrib.auth.models import User + +from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy +from wagtail.tests.models import EventPage, EventIndex, SimplePage + + +class TestFixTreeCommand(TestCase): + fixtures = ['test.json'] + + def run_command(self): + management.call_command('fixtree', interactive=False, stdout=StringIO()) + + def test_fixes_numchild(self): + # Get homepage and save old value + homepage = Page.objects.get(url_path='/home/') + old_numchild = homepage.numchild + + # Break it + homepage.numchild = 12345 + homepage.save() + + # Check that its broken + self.assertEqual(Page.objects.get(url_path='/home/').numchild, 12345) + + # Call command + self.run_command() + + # Check if its fixed + self.assertEqual(Page.objects.get(url_path='/home/').numchild, old_numchild) + + def test_fixes_depth(self): + # Get homepage and save old value + homepage = Page.objects.get(url_path='/home/') + old_depth = homepage.depth + + # Break it + homepage.depth = 12345 + homepage.save() + + # Check that its broken + self.assertEqual(Page.objects.get(url_path='/home/').depth, 12345) + + # Call command + self.run_command() + + # Check if its fixed + self.assertEqual(Page.objects.get(url_path='/home/').depth, old_depth) + + +class TestMovePagesCommand(TestCase): + fixtures = ['test.json'] + + def run_command(self, from_, to): + management.call_command('move_pages', str(from_), str(to), interactive=False, stdout=StringIO()) + + def test_move_pages(self): + # Get pages + events_index = Page.objects.get(url_path='/home/events/') + about_us = Page.objects.get(url_path='/home/about-us/') + page_ids = events_index.get_children().values_list('id', flat=True) + + # Move all events into "about us" + self.run_command(events_index.id, about_us.id) + + # Check that all pages moved + for page_id in page_ids: + self.assertEqual(Page.objects.get(id=page_id).get_parent(), about_us) + + +class TestReplaceTextCommand(TestCase): + fixtures = ['test.json'] + + def run_command(self, from_text, to_text): + management.call_command('replace_text', from_text, to_text, interactive=False, stdout=StringIO()) + + def test_replace_text(self): + # Check that the christmas page is definitely about christmas + self.assertEqual(Page.objects.get(url_path='/home/events/christmas/').title, "Christmas") + + # Make it about easter + self.run_command("Christmas", "Easter") + + # Check that its now about easter + self.assertEqual(Page.objects.get(url_path='/home/events/christmas/').title, "Easter") diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py new file mode 100644 index 000000000..1bae57952 --- /dev/null +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -0,0 +1,226 @@ +from StringIO import StringIO + +from django.test import TestCase, Client +from django.http import HttpRequest, Http404 +from django.core import management +from django.contrib.auth.models import User + +from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy +from wagtail.tests.models import EventPage, EventIndex, SimplePage + + +class TestRouting(TestCase): + fixtures = ['test.json'] + + def test_find_site_for_request(self): + default_site = Site.objects.get(is_default_site=True) + events_page = Page.objects.get(url_path='/home/events/') + events_site = Site.objects.create(hostname='events.example.com', root_page=events_page) + + # requests without a Host: header should be directed to the default site + request = HttpRequest() + request.path = '/' + self.assertEqual(Site.find_for_request(request), default_site) + + # requests with a known Host: header should be directed to the specific site + request = HttpRequest() + request.path = '/' + request.META['HTTP_HOST'] = 'events.example.com' + self.assertEqual(Site.find_for_request(request), events_site) + + # requests with an unrecognised Host: header should be directed to the default site + request = HttpRequest() + request.path = '/' + request.META['HTTP_HOST'] = 'unknown.example.com' + self.assertEqual(Site.find_for_request(request), default_site) + + def test_urls(self): + default_site = Site.objects.get(is_default_site=True) + homepage = Page.objects.get(url_path='/home/') + christmas_page = Page.objects.get(url_path='/home/events/christmas/') + + # Basic installation only has one site configured, so page.url will return local URLs + self.assertEqual(homepage.full_url, 'http://localhost/') + self.assertEqual(homepage.url, '/') + self.assertEqual(homepage.relative_url(default_site), '/') + + self.assertEqual(christmas_page.full_url, 'http://localhost/events/christmas/') + self.assertEqual(christmas_page.url, '/events/christmas/') + self.assertEqual(christmas_page.relative_url(default_site), '/events/christmas/') + + def test_urls_with_multiple_sites(self): + events_page = Page.objects.get(url_path='/home/events/') + events_site = Site.objects.create(hostname='events.example.com', root_page=events_page) + + default_site = Site.objects.get(is_default_site=True) + homepage = Page.objects.get(url_path='/home/') + christmas_page = Page.objects.get(url_path='/home/events/christmas/') + + # with multiple sites, page.url will return full URLs to ensure that + # they work across sites + self.assertEqual(homepage.full_url, 'http://localhost/') + self.assertEqual(homepage.url, 'http://localhost/') + self.assertEqual(homepage.relative_url(default_site), '/') + self.assertEqual(homepage.relative_url(events_site), 'http://localhost/') + + self.assertEqual(christmas_page.full_url, 'http://events.example.com/christmas/') + self.assertEqual(christmas_page.url, 'http://events.example.com/christmas/') + self.assertEqual(christmas_page.relative_url(default_site), 'http://events.example.com/christmas/') + self.assertEqual(christmas_page.relative_url(events_site), '/christmas/') + + def test_request_routing(self): + homepage = Page.objects.get(url_path='/home/') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + + request = HttpRequest() + request.path = '/events/christmas/' + response = homepage.route(request, ['events', 'christmas']) + + self.assertEqual(response.status_code, 200) + self.assertEqual(response.context_data['self'], christmas_page) + used_template = response.resolve_template(response.template_name) + self.assertEqual(used_template.name, 'tests/event_page.html') + + def test_route_to_unknown_page_returns_404(self): + homepage = Page.objects.get(url_path='/home/') + + request = HttpRequest() + request.path = '/events/quinquagesima/' + with self.assertRaises(Http404): + homepage.route(request, ['events', 'quinquagesima']) + + def test_route_to_unpublished_page_returns_404(self): + homepage = Page.objects.get(url_path='/home/') + + request = HttpRequest() + request.path = '/events/tentative-unpublished-event/' + with self.assertRaises(Http404): + homepage.route(request, ['events', 'tentative-unpublished-event']) + + +class TestServeView(TestCase): + fixtures = ['test.json'] + + def setUp(self): + # Explicitly clear the cache of site root paths. Normally this would be kept + # in sync by the Site.save logic, but this is bypassed when the database is + # rolled back between tests using transactions. + from django.core.cache import cache + cache.delete('wagtail_site_root_paths') + + def test_serve(self): + response = self.client.get('/events/christmas/') + + self.assertEqual(response.status_code, 200) + self.assertEqual(response.templates[0].name, 'tests/event_page.html') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + self.assertEqual(response.context['self'], christmas_page) + + self.assertContains(response, 'Christmas
') + self.assertContains(response, 'Event
') + + def test_serve_unknown_page_returns_404(self): + response = self.client.get('/events/quinquagesima/') + self.assertEqual(response.status_code, 404) + + def test_serve_unpublished_page_returns_404(self): + response = self.client.get('/events/tentative-unpublished-event/') + self.assertEqual(response.status_code, 404) + + def test_serve_with_multiple_sites(self): + events_page = Page.objects.get(url_path='/home/events/') + Site.objects.create(hostname='events.example.com', root_page=events_page) + + response = self.client.get('/christmas/', HTTP_HOST='events.example.com') + self.assertEqual(response.status_code, 200) + self.assertEqual(response.templates[0].name, 'tests/event_page.html') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + self.assertEqual(response.context['self'], christmas_page) + + self.assertContains(response, 'Christmas
') + self.assertContains(response, 'Event
') + + # same request to the default host should return a 404 + c = Client() + response = c.get('/christmas/', HTTP_HOST='localhost') + self.assertEqual(response.status_code, 404) + + def test_serve_with_custom_context(self): + response = self.client.get('/events/') + self.assertEqual(response.status_code, 200) + + # should render the whole page + self.assertContains(response, 'Events
') + + # response should contain data from the custom 'events' context variable + self.assertContains(response, 'Christmas') + + def test_ajax_response(self): + response = self.client.get('/events/', HTTP_X_REQUESTED_WITH='XMLHttpRequest') + self.assertEqual(response.status_code, 200) + + # should only render the content of includes/event_listing.html, not the whole page + self.assertNotContains(response, 'Events
') + self.assertContains(response, 'Christmas') + + +class TestStaticSitePaths(TestCase): + def setUp(self): + self.root_page = Page.objects.get(id=1) + + # For simple tests + self.home_page = self.root_page.add_child(instance=SimplePage(title="Homepage", slug="home")) + self.about_page = self.home_page.add_child(instance=SimplePage(title="About us", slug="about")) + self.contact_page = self.home_page.add_child(instance=SimplePage(title="Contact", slug="contact")) + + # For custom tests + self.event_index = self.root_page.add_child(instance=EventIndex(title="Events", slug="events")) + for i in range(20): + self.event_index.add_child(instance=EventPage(title="Event " + str(i), slug="event" + str(i))) + + def test_local_static_site_paths(self): + paths = list(self.about_page.get_static_site_paths()) + + self.assertEqual(paths, ['/']) + + def test_child_static_site_paths(self): + paths = list(self.home_page.get_static_site_paths()) + + self.assertEqual(paths, ['/', '/about/', '/contact/']) + + def test_custom_static_site_paths(self): + paths = list(self.event_index.get_static_site_paths()) + + # Event index path + expected_paths = ['/'] + + # One path for each page of results + expected_paths.extend(['/' + str(i + 1) + '/' for i in range(5)]) + + # One path for each event page + expected_paths.extend(['/event' + str(i) + '/' for i in range(20)]) + + paths.sort() + expected_paths.sort() + self.assertEqual(paths, expected_paths) + + +class TestMovePage(TestCase): + fixtures = ['test.json'] + + def test_move_page(self): + about_us_page = SimplePage.objects.get(url_path='/home/about-us/') + events_index = EventIndex.objects.get(url_path='/home/events/') + + events_index.move(about_us_page, pos='last-child') + + # re-fetch events index to confirm that db fields have been updated + events_index = EventIndex.objects.get(id=events_index.id) + self.assertEqual(events_index.url_path, '/home/about-us/events/') + self.assertEqual(events_index.depth, 4) + self.assertEqual(events_index.get_parent().id, about_us_page.id) + + # children of events_index should also have been updated + christmas = events_index.get_children().get(slug='christmas') + self.assertEqual(christmas.depth, 5) + self.assertEqual(christmas.url_path, '/home/about-us/events/christmas/') diff --git a/wagtail/wagtailcore/tests/test_page_permissions.py b/wagtail/wagtailcore/tests/test_page_permissions.py new file mode 100644 index 000000000..dbe35e39b --- /dev/null +++ b/wagtail/wagtailcore/tests/test_page_permissions.py @@ -0,0 +1,226 @@ +from StringIO import StringIO + +from django.test import TestCase, Client +from django.http import HttpRequest, Http404 +from django.core import management +from django.contrib.auth.models import User + +from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy +from wagtail.tests.models import EventPage, EventIndex, SimplePage + + +class TestPagePermission(TestCase): + fixtures = ['test.json'] + + def test_nonpublisher_page_permissions(self): + event_editor = User.objects.get(username='eventeditor') + homepage = Page.objects.get(url_path='/home/') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') + someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/') + + homepage_perms = homepage.permissions_for_user(event_editor) + christmas_page_perms = christmas_page.permissions_for_user(event_editor) + unpub_perms = unpublished_event_page.permissions_for_user(event_editor) + someone_elses_event_perms = someone_elses_event_page.permissions_for_user(event_editor) + + self.assertFalse(homepage_perms.can_add_subpage()) + self.assertTrue(christmas_page_perms.can_add_subpage()) + self.assertTrue(unpub_perms.can_add_subpage()) + self.assertTrue(someone_elses_event_perms.can_add_subpage()) + + self.assertFalse(homepage_perms.can_edit()) + self.assertTrue(christmas_page_perms.can_edit()) + self.assertTrue(unpub_perms.can_edit()) + self.assertFalse(someone_elses_event_perms.can_edit()) # basic 'add' permission doesn't allow editing pages owned by someone else + + self.assertFalse(homepage_perms.can_delete()) + self.assertFalse(christmas_page_perms.can_delete()) # cannot delete because it is published + self.assertTrue(unpub_perms.can_delete()) + self.assertFalse(someone_elses_event_perms.can_delete()) + + self.assertFalse(homepage_perms.can_publish()) + self.assertFalse(christmas_page_perms.can_publish()) + self.assertFalse(unpub_perms.can_publish()) + + self.assertFalse(homepage_perms.can_unpublish()) + self.assertFalse(christmas_page_perms.can_unpublish()) + self.assertFalse(unpub_perms.can_unpublish()) + + self.assertFalse(homepage_perms.can_publish_subpage()) + self.assertFalse(christmas_page_perms.can_publish_subpage()) + self.assertFalse(unpub_perms.can_publish_subpage()) + + self.assertFalse(homepage_perms.can_reorder_children()) + self.assertFalse(christmas_page_perms.can_reorder_children()) + self.assertFalse(unpub_perms.can_reorder_children()) + + self.assertFalse(homepage_perms.can_move()) + self.assertFalse(christmas_page_perms.can_move()) # cannot move because this would involve unpublishing from its current location + self.assertTrue(unpub_perms.can_move()) + self.assertFalse(someone_elses_event_perms.can_move()) + + self.assertFalse(christmas_page_perms.can_move_to(unpublished_event_page)) # cannot move because this would involve unpublishing from its current location + self.assertTrue(unpub_perms.can_move_to(christmas_page)) + self.assertFalse(unpub_perms.can_move_to(homepage)) # no permission to create pages at destination + self.assertFalse(unpub_perms.can_move_to(unpublished_event_page)) # cannot make page a child of itself + + + def test_publisher_page_permissions(self): + event_moderator = User.objects.get(username='eventmoderator') + homepage = Page.objects.get(url_path='/home/') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') + + homepage_perms = homepage.permissions_for_user(event_moderator) + christmas_page_perms = christmas_page.permissions_for_user(event_moderator) + unpub_perms = unpublished_event_page.permissions_for_user(event_moderator) + + self.assertFalse(homepage_perms.can_add_subpage()) + self.assertTrue(christmas_page_perms.can_add_subpage()) + self.assertTrue(unpub_perms.can_add_subpage()) + + self.assertFalse(homepage_perms.can_edit()) + self.assertTrue(christmas_page_perms.can_edit()) + self.assertTrue(unpub_perms.can_edit()) + + self.assertFalse(homepage_perms.can_delete()) + self.assertTrue(christmas_page_perms.can_delete()) # cannot delete because it is published + self.assertTrue(unpub_perms.can_delete()) + + self.assertFalse(homepage_perms.can_publish()) + self.assertTrue(christmas_page_perms.can_publish()) + self.assertTrue(unpub_perms.can_publish()) + + self.assertFalse(homepage_perms.can_unpublish()) + self.assertTrue(christmas_page_perms.can_unpublish()) + self.assertFalse(unpub_perms.can_unpublish()) # cannot unpublish a page that isn't published + + self.assertFalse(homepage_perms.can_publish_subpage()) + self.assertTrue(christmas_page_perms.can_publish_subpage()) + self.assertTrue(unpub_perms.can_publish_subpage()) + + self.assertFalse(homepage_perms.can_reorder_children()) + self.assertTrue(christmas_page_perms.can_reorder_children()) + self.assertTrue(unpub_perms.can_reorder_children()) + + self.assertFalse(homepage_perms.can_move()) + self.assertTrue(christmas_page_perms.can_move()) + self.assertTrue(unpub_perms.can_move()) + + self.assertTrue(christmas_page_perms.can_move_to(unpublished_event_page)) + self.assertTrue(unpub_perms.can_move_to(christmas_page)) + self.assertFalse(unpub_perms.can_move_to(homepage)) # no permission to create pages at destination + self.assertFalse(unpub_perms.can_move_to(unpublished_event_page)) # cannot make page a child of itself + + def test_inactive_user_has_no_permissions(self): + user = User.objects.get(username='inactiveuser') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') + + christmas_page_perms = christmas_page.permissions_for_user(user) + unpub_perms = unpublished_event_page.permissions_for_user(user) + + self.assertFalse(unpub_perms.can_add_subpage()) + self.assertFalse(unpub_perms.can_edit()) + self.assertFalse(unpub_perms.can_delete()) + self.assertFalse(unpub_perms.can_publish()) + self.assertFalse(christmas_page_perms.can_unpublish()) + self.assertFalse(unpub_perms.can_publish_subpage()) + self.assertFalse(unpub_perms.can_reorder_children()) + self.assertFalse(unpub_perms.can_move()) + self.assertFalse(unpub_perms.can_move_to(christmas_page)) + + def test_superuser_has_full_permissions(self): + user = User.objects.get(username='superuser') + homepage = Page.objects.get(url_path='/home/') + root = Page.objects.get(url_path='/') + unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') + + homepage_perms = homepage.permissions_for_user(user) + root_perms = root.permissions_for_user(user) + unpub_perms = unpublished_event_page.permissions_for_user(user) + + self.assertTrue(homepage_perms.can_add_subpage()) + self.assertTrue(root_perms.can_add_subpage()) + + self.assertTrue(homepage_perms.can_edit()) + self.assertFalse(root_perms.can_edit()) # root is not a real editable page, even to superusers + + self.assertTrue(homepage_perms.can_delete()) + self.assertFalse(root_perms.can_delete()) + + self.assertTrue(homepage_perms.can_publish()) + self.assertFalse(root_perms.can_publish()) + + self.assertTrue(homepage_perms.can_unpublish()) + self.assertFalse(root_perms.can_unpublish()) + self.assertFalse(unpub_perms.can_unpublish()) + + self.assertTrue(homepage_perms.can_publish_subpage()) + self.assertTrue(root_perms.can_publish_subpage()) + + self.assertTrue(homepage_perms.can_reorder_children()) + self.assertTrue(root_perms.can_reorder_children()) + + self.assertTrue(homepage_perms.can_move()) + self.assertFalse(root_perms.can_move()) + + self.assertTrue(homepage_perms.can_move_to(root)) + self.assertFalse(homepage_perms.can_move_to(unpublished_event_page)) + + def test_editable_pages_for_user_with_add_permission(self): + event_editor = User.objects.get(username='eventeditor') + homepage = Page.objects.get(url_path='/home/') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') + someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/') + + editable_pages = UserPagePermissionsProxy(event_editor).editable_pages() + + self.assertFalse(editable_pages.filter(id=homepage.id).exists()) + self.assertTrue(editable_pages.filter(id=christmas_page.id).exists()) + self.assertTrue(editable_pages.filter(id=unpublished_event_page.id).exists()) + self.assertFalse(editable_pages.filter(id=someone_elses_event_page.id).exists()) + + def test_editable_pages_for_user_with_edit_permission(self): + event_moderator = User.objects.get(username='eventmoderator') + homepage = Page.objects.get(url_path='/home/') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') + someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/') + + editable_pages = UserPagePermissionsProxy(event_moderator).editable_pages() + + self.assertFalse(editable_pages.filter(id=homepage.id).exists()) + self.assertTrue(editable_pages.filter(id=christmas_page.id).exists()) + self.assertTrue(editable_pages.filter(id=unpublished_event_page.id).exists()) + self.assertTrue(editable_pages.filter(id=someone_elses_event_page.id).exists()) + + def test_editable_pages_for_inactive_user(self): + user = User.objects.get(username='inactiveuser') + homepage = Page.objects.get(url_path='/home/') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') + someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/') + + editable_pages = UserPagePermissionsProxy(user).editable_pages() + + self.assertFalse(editable_pages.filter(id=homepage.id).exists()) + self.assertFalse(editable_pages.filter(id=christmas_page.id).exists()) + self.assertFalse(editable_pages.filter(id=unpublished_event_page.id).exists()) + self.assertFalse(editable_pages.filter(id=someone_elses_event_page.id).exists()) + + def test_editable_pages_for_superuser(self): + user = User.objects.get(username='superuser') + homepage = Page.objects.get(url_path='/home/') + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + unpublished_event_page = EventPage.objects.get(url_path='/home/events/tentative-unpublished-event/') + someone_elses_event_page = EventPage.objects.get(url_path='/home/events/someone-elses-event/') + + editable_pages = UserPagePermissionsProxy(user).editable_pages() + + self.assertTrue(editable_pages.filter(id=homepage.id).exists()) + self.assertTrue(editable_pages.filter(id=christmas_page.id).exists()) + self.assertTrue(editable_pages.filter(id=unpublished_event_page.id).exists()) + self.assertTrue(editable_pages.filter(id=someone_elses_event_page.id).exists()) diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/wagtailcore/tests/test_page_queryset.py new file mode 100644 index 000000000..06f2c3e21 --- /dev/null +++ b/wagtail/wagtailcore/tests/test_page_queryset.py @@ -0,0 +1,256 @@ +from StringIO import StringIO + +from django.test import TestCase, Client +from django.http import HttpRequest, Http404 +from django.core import management +from django.contrib.auth.models import User + +from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy +from wagtail.tests.models import EventPage, EventIndex, SimplePage + + +class TestPageQuerySet(TestCase): + fixtures = ['test.json'] + + def test_live(self): + pages = Page.objects.live() + + # All pages must be live + for page in pages: + self.assertTrue(page.live) + + # Check that the homepage is in the results + homepage = Page.objects.get(url_path='/home/') + self.assertTrue(pages.filter(id=homepage.id).exists()) + + def test_not_live(self): + pages = Page.objects.not_live() + + # All pages must not be live + for page in pages: + self.assertFalse(page.live) + + # Check that "someone elses event" is in the results + event = Page.objects.get(url_path='/home/events/someone-elses-event/') + self.assertTrue(pages.filter(id=event.id).exists()) + + def test_page(self): + homepage = Page.objects.get(url_path='/home/') + pages = Page.objects.page(homepage) + + # Should only select the homepage + self.assertEqual(pages.count(), 1) + self.assertEqual(pages.first(), homepage) + + def test_not_page(self): + homepage = Page.objects.get(url_path='/home/') + pages = Page.objects.not_page(homepage) + + # Should select everything except for the homepage + self.assertEqual(pages.count(), Page.objects.all().count() - 1) + for page in pages: + self.assertNotEqual(page, homepage) + + def test_descendant_of(self): + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.descendant_of(events_index) + + # Check that all pages descend from events index + for page in pages: + self.assertTrue(page.get_ancestors().filter(id=events_index.id).exists()) + + def test_descendant_of_inclusive(self): + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.descendant_of(events_index, inclusive=True) + + # Check that all pages descend from events index, includes event index + for page in pages: + self.assertTrue(page == events_index or page.get_ancestors().filter(id=events_index.id).exists()) + + # Check that event index was included + self.assertTrue(pages.filter(id=events_index.id).exists()) + + def test_not_descendant_of(self): + homepage = Page.objects.get(url_path='/home/') + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.not_descendant_of(events_index) + + # Check that no pages descend from events_index + for page in pages: + self.assertFalse(page.get_ancestors().filter(id=events_index.id).exists()) + + # As this is not inclusive, events index should be in the results + self.assertTrue(pages.filter(id=events_index.id).exists()) + + def test_not_descendant_of_inclusive(self): + homepage = Page.objects.get(url_path='/home/') + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.not_descendant_of(events_index, inclusive=True) + + # Check that all pages descend from homepage but not events index + for page in pages: + self.assertFalse(page.get_ancestors().filter(id=events_index.id).exists()) + + # As this is inclusive, events index should not be in the results + self.assertFalse(pages.filter(id=events_index.id).exists()) + + def test_child_of(self): + homepage = Page.objects.get(url_path='/home/') + pages = Page.objects.child_of(homepage) + + # Check that all pages are children of homepage + for page in pages: + self.assertEqual(page.get_parent(), homepage) + + def test_not_child_of(self): + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.not_child_of(events_index) + + # Check that all pages are not children of events_index + for page in pages: + self.assertNotEqual(page.get_parent(), events_index) + + def test_ancestor_of(self): + root_page = Page.objects.get(id=1) + homepage = Page.objects.get(url_path='/home/') + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.ancestor_of(events_index) + + self.assertEqual(pages.count(), 2) + self.assertEqual(pages[0], root_page) + self.assertEqual(pages[1], homepage) + + def test_ancestor_of_inclusive(self): + root_page = Page.objects.get(id=1) + homepage = Page.objects.get(url_path='/home/') + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.ancestor_of(events_index, inclusive=True) + + self.assertEqual(pages.count(), 3) + self.assertEqual(pages[0], root_page) + self.assertEqual(pages[1], homepage) + self.assertEqual(pages[2], events_index) + + def test_not_ancestor_of(self): + root_page = Page.objects.get(id=1) + homepage = Page.objects.get(url_path='/home/') + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.not_ancestor_of(events_index) + + # Test that none of the ancestors are in pages + for page in pages: + self.assertNotEqual(page, root_page) + self.assertNotEqual(page, homepage) + + # Test that events index is in pages + self.assertTrue(pages.filter(id=events_index.id).exists()) + + def test_not_ancestor_of_inclusive(self): + root_page = Page.objects.get(id=1) + homepage = Page.objects.get(url_path='/home/') + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.not_ancestor_of(events_index, inclusive=True) + + # Test that none of the ancestors or the events_index are in pages + for page in pages: + self.assertNotEqual(page, root_page) + self.assertNotEqual(page, homepage) + self.assertNotEqual(page, events_index) + + def test_parent_of(self): + homepage = Page.objects.get(url_path='/home/') + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.parent_of(events_index) + + # Pages must only contain homepage + self.assertEqual(pages.count(), 1) + self.assertEqual(pages[0], homepage) + + def test_not_parent_of(self): + homepage = Page.objects.get(url_path='/home/') + events_index = Page.objects.get(url_path='/home/events/') + pages = Page.objects.not_parent_of(events_index) + + # Pages must not contain homepage + for page in pages: + self.assertNotEqual(page, homepage) + + # Test that events index is in pages + self.assertTrue(pages.filter(id=events_index.id).exists()) + + def test_sibling_of(self): + events_index = Page.objects.get(url_path='/home/events/') + event = Page.objects.get(url_path='/home/events/christmas/') + pages = Page.objects.sibling_of(event) + + # Check that all pages are children of events_index + for page in pages: + self.assertEqual(page.get_parent(), events_index) + + # Check that the event is not included + self.assertFalse(pages.filter(id=event.id).exists()) + + def test_sibling_of_inclusive(self): + events_index = Page.objects.get(url_path='/home/events/') + event = Page.objects.get(url_path='/home/events/christmas/') + pages = Page.objects.sibling_of(event, inclusive=True) + + # Check that all pages are children of events_index + for page in pages: + self.assertEqual(page.get_parent(), events_index) + + # Check that the event is included + self.assertTrue(pages.filter(id=event.id).exists()) + + def test_not_sibling_of(self): + events_index = Page.objects.get(url_path='/home/events/') + event = Page.objects.get(url_path='/home/events/christmas/') + pages = Page.objects.not_sibling_of(event) + + # Check that all pages are not children of events_index + for page in pages: + if page != event: + self.assertNotEqual(page.get_parent(), events_index) + + # Check that the event is included + self.assertTrue(pages.filter(id=event.id).exists()) + + # Test that events index is in pages + self.assertTrue(pages.filter(id=events_index.id).exists()) + + def test_not_sibling_of_inclusive(self): + events_index = Page.objects.get(url_path='/home/events/') + event = Page.objects.get(url_path='/home/events/christmas/') + pages = Page.objects.not_sibling_of(event, inclusive=True) + + # Check that all pages are not children of events_index + for page in pages: + self.assertNotEqual(page.get_parent(), events_index) + + # Check that the event is not included + self.assertFalse(pages.filter(id=event.id).exists()) + + # Test that events index is in pages + self.assertTrue(pages.filter(id=events_index.id).exists()) + + def test_type(self): + pages = Page.objects.type(EventPage) + + # Check that all objects are EventPages + for page in pages: + self.assertIsInstance(page.specific, EventPage) + + # Check that "someone elses event" is in the results + event = Page.objects.get(url_path='/home/events/someone-elses-event/') + self.assertTrue(pages.filter(id=event.id).exists()) + + def test_not_type(self): + pages = Page.objects.not_type(EventPage) + + # Check that no objects are EventPages + for page in pages: + self.assertNotIsInstance(page.specific, EventPage) + + # Check that the homepage is in the results + homepage = Page.objects.get(url_path='/home/') + self.assertTrue(pages.filter(id=homepage.id).exists()) diff --git a/wagtail/wagtailcore/tests/tests.py b/wagtail/wagtailcore/tests/tests.py new file mode 100644 index 000000000..d10474bba --- /dev/null +++ b/wagtail/wagtailcore/tests/tests.py @@ -0,0 +1,99 @@ +from StringIO import StringIO + +from django.test import TestCase, Client +from django.http import HttpRequest, Http404 +from django.core import management +from django.contrib.auth.models import User + +from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy +from wagtail.tests.models import EventPage, EventIndex, SimplePage + + +class TestPageUrlTags(TestCase): + fixtures = ['test.json'] + + def test_pageurl_tag(self): + response = self.client.get('/events/') + self.assertEqual(response.status_code, 200) + self.assertContains(response, 'Christmas') + + def test_slugurl_tag(self): + response = self.client.get('/events/christmas/') + self.assertEqual(response.status_code, 200) + self.assertContains(response, 'Back to events index') + + +class TestIssue7(TestCase): + """ + This tests for an issue where if a site root page was moved, all the page + urls in that site would change to None. + + The issue was caused by the 'wagtail_site_root_paths' cache variable not being + cleared when a site root page was moved. Which left all the child pages + thinking that they are no longer in the site and return None as their url. + + Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682 + Discussion: https://github.com/torchbox/wagtail/issues/7 + """ + + fixtures = ['test.json'] + + def test_issue7(self): + # Get homepage, root page and site + root_page = Page.objects.get(id=1) + homepage = Page.objects.get(url_path='/home/') + default_site = Site.objects.get(is_default_site=True) + + # Create a new homepage under current homepage + new_homepage = SimplePage(title="New Homepage", slug="new-homepage") + homepage.add_child(instance=new_homepage) + + # Set new homepage as the site root page + default_site.root_page = new_homepage + default_site.save() + + # Warm up the cache by getting the url + _ = homepage.url + + # Move new homepage to root + new_homepage.move(root_page, pos='last-child') + + # Get fresh instance of new_homepage + new_homepage = Page.objects.get(id=new_homepage.id) + + # Check url + self.assertEqual(new_homepage.url, '/') + + +class TestIssue157(TestCase): + """ + This tests for an issue where if a site root pages slug was changed, all the page + urls in that site would change to None. + + The issue was caused by the 'wagtail_site_root_paths' cache variable not being + cleared when a site root page was changed. Which left all the child pages + thinking that they are no longer in the site and return None as their url. + + Fix: d6cce69a397d08d5ee81a8cbc1977ab2c9db2682 + Discussion: https://github.com/torchbox/wagtail/issues/157 + """ + + fixtures = ['test.json'] + + def test_issue157(self): + # Get homepage + homepage = Page.objects.get(url_path='/home/') + + # Warm up the cache by getting the url + _ = homepage.url + + # Change homepage title and slug + homepage.title = "New home" + homepage.slug = "new-home" + homepage.save() + + # Get fresh instance of homepage + homepage = Page.objects.get(id=homepage.id) + + # Check url + self.assertEqual(homepage.url, '/') diff --git a/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.mo b/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.mo new file mode 100644 index 000000000..65fb219cc Binary files /dev/null and b/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.mo differ diff --git a/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.po new file mode 100644 index 000000000..f5bff5468 --- /dev/null +++ b/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.po @@ -0,0 +1,157 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Wagtail\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-14 23:09+0200\n" +"PO-Revision-Date: 2014-03-14 21:12+0000\n" +"Last-Translator: wdv4758h
- {{ embed.html }}
+ {{ embed.html|safe }}
diff --git a/wagtail/wagtailforms/__init__.py b/wagtail/wagtailforms/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/wagtailforms/forms.py b/wagtail/wagtailforms/forms.py
new file mode 100644
index 000000000..f17023a77
--- /dev/null
+++ b/wagtail/wagtailforms/forms.py
@@ -0,0 +1,87 @@
+import django.forms
+from django.utils.datastructures import SortedDict
+
+
+class BaseForm(django.forms.Form):
+ def __init__(self, *args, **kwargs):
+ kwargs.setdefault('label_suffix', '')
+ return super(BaseForm, self).__init__(*args, **kwargs)
+
+
+class FormBuilder():
+ formfields = SortedDict()
+
+ def __init__(self, fields):
+ for field in fields:
+ options = self.get_options(field)
+ f = getattr(self, "create_"+field.field_type+"_field")(field, options)
+ self.formfields[field.clean_name] = f
+
+ def get_options(self, field):
+ options = {}
+ options['label'] = field.label
+ options['help_text'] = field.help_text
+ options['required'] = field.required
+ options['initial'] = field.default_value
+ return options
+
+ def create_singleline_field(self, field, options):
+ # TODO: This is a default value - it may need to be changed
+ options['max_length'] = 255
+ return django.forms.CharField(**options)
+
+ def create_multiline_field(self, field, options):
+ return django.forms.CharField(widget=django.forms.Textarea, **options)
+
+ def create_date_field(self, field, options):
+ return django.forms.DateField(**options)
+
+ def create_datetime_field(self, field, options):
+ return django.forms.DateTimeField(**options)
+
+ def create_email_field(self, field, options):
+ return django.forms.EmailField(**options)
+
+ def create_url_field(self, field, options):
+ return django.forms.URLField(**options)
+
+ def create_number_field(self, field, options):
+ return django.forms.DecimalField(**options)
+
+ def create_dropdown_field(self, field, options):
+ options['choices'] = map(
+ lambda x: (x.strip(), x.strip()),
+ field.choices.split(',')
+ )
+ return django.forms.ChoiceField(**options)
+
+ def create_radio_field(self, field, options):
+ options['choices'] = map(
+ lambda x: (x.strip(), x.strip()),
+ field.choices.split(',')
+ )
+ return django.forms.ChoiceField(widget=django.forms.RadioSelect, **options)
+
+ def create_checkboxes_field(self, field, options):
+ options['choices'] = [(x.strip(), x.strip()) for x in field.choices.split(',')]
+ options['initial'] = [x.strip() for x in field.default_value.split(',')]
+ return django.forms.MultipleChoiceField(
+ widget=django.forms.CheckboxSelectMultiple, **options
+ )
+
+ def create_checkbox_field(self, field, options):
+ return django.forms.BooleanField(**options)
+
+ def get_form_class(self):
+ return type('WagtailForm', (BaseForm,), self.formfields)
+
+
+class SelectDateForm(django.forms.Form):
+ date_from = django.forms.DateField(
+ required=False,
+ widget=django.forms.DateInput(attrs={'placeholder': 'Date from'})
+ )
+ date_to = django.forms.DateField(
+ required=False,
+ widget=django.forms.DateInput(attrs={'placeholder': 'Date to'})
+ )
diff --git a/wagtail/wagtailforms/migrations/0001_initial.py b/wagtail/wagtailforms/migrations/0001_initial.py
new file mode 100644
index 000000000..80cbdb2b6
--- /dev/null
+++ b/wagtail/wagtailforms/migrations/0001_initial.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+from wagtail.wagtailcore.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
+
+
+class Migration(SchemaMigration):
+
+ depends_on = (
+ ("wagtailcore", "0002_initial_data"),
+ )
+
+ def forwards(self, orm):
+ # Adding model 'FormSubmission'
+ db.create_table(u'wagtailforms_formsubmission', (
+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('form_data', self.gf('django.db.models.fields.TextField')()),
+ ('page', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['wagtailcore.Page'])),
+ ('submit_time', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+ ))
+ db.send_create_signal(u'wagtailforms', ['FormSubmission'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'FormSubmission'
+ db.delete_table(u'wagtailforms_formsubmission')
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'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'})
+ },
+ 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'},
+ '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'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ AUTH_USER_MODEL: {
+ 'Meta': {'object_name': AUTH_USER_MODEL_NAME},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ u'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'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'wagtailcore.page': {
+ 'Meta': {'object_name': 'Page'},
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}),
+ 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+ 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['%s']" % AUTH_USER_MODEL}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+ 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+ 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+ },
+ u'wagtailforms.formsubmission': {
+ 'Meta': {'object_name': 'FormSubmission'},
+ 'form_data': ('django.db.models.fields.TextField', [], {}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['wagtailcore.Page']"}),
+ 'submit_time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
+ }
+ }
+
+ complete_apps = ['wagtailforms']
\ No newline at end of file
diff --git a/wagtail/wagtailforms/migrations/__init__.py b/wagtail/wagtailforms/migrations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py
new file mode 100644
index 000000000..75f0eceee
--- /dev/null
+++ b/wagtail/wagtailforms/models.py
@@ -0,0 +1,200 @@
+from django.db import models
+from django.shortcuts import render
+from django.utils.translation import ugettext_lazy as _
+from django.utils.text import slugify
+
+from unidecode import unidecode
+import json
+import re
+
+from wagtail.wagtailcore.models import Page, Orderable, UserPagePermissionsProxy, get_page_types
+from wagtail.wagtailadmin.edit_handlers import FieldPanel
+from wagtail.wagtailadmin import tasks
+
+from .forms import FormBuilder
+
+
+FORM_FIELD_CHOICES = (
+ ('singleline', _('Single line text')),
+ ('multiline', _('Multi-line text')),
+ ('email', _('Email')),
+ ('number', _('Number')),
+ ('url', _('URL')),
+ ('checkbox', _('Checkbox')),
+ ('checkboxes', _('Checkboxes')),
+ ('dropdown', _('Drop down')),
+ ('radio', _('Radio buttons')),
+ ('date', _('Date')),
+ ('datetime', _('Date/time')),
+)
+
+
+HTML_EXTENSION_RE = re.compile(r"(.*)\.html")
+
+
+class FormSubmission(models.Model):
+ """Data for a Form submission."""
+
+ form_data = models.TextField()
+ page = models.ForeignKey(Page)
+
+ submit_time = models.DateTimeField(auto_now_add=True)
+
+ def get_data(self):
+ return json.loads(self.form_data)
+
+ def __unicode__(self):
+ return self.form_data
+
+
+class AbstractFormField(Orderable):
+ """Database Fields required for building a Django Form field."""
+
+ label = models.CharField(
+ max_length=255,
+ help_text=_('The label of the form field')
+ )
+ field_type = models.CharField(max_length=16, choices=FORM_FIELD_CHOICES)
+ required = models.BooleanField(default=True)
+ choices = models.CharField(
+ max_length=512,
+ blank=True,
+ help_text=_('Comma seperated list of choices. Only applicable in checkboxes, radio and dropdown.')
+ )
+ default_value = models.CharField(
+ max_length=255,
+ blank=True,
+ help_text=_('Default value. Comma seperated values supported for checkboxes.')
+ )
+ help_text = models.CharField(max_length=255, blank=True)
+
+ @property
+ def clean_name(self):
+ # unidecode will return an ascii string while slugify wants a
+ # unicode string on the other hand, slugify returns a safe-string
+ # which will be converted to a normal str
+ return str(slugify(unicode(unidecode(self.label))))
+
+ panels = [
+ FieldPanel('label'),
+ FieldPanel('help_text'),
+ FieldPanel('required'),
+ FieldPanel('field_type', classname="formbuilder-type"),
+ FieldPanel('choices', classname="formbuilder-choices"),
+ FieldPanel('default_value', classname="formbuilder-default"),
+ ]
+
+ class Meta:
+ abstract = True
+ ordering = ['sort_order']
+
+
+_FORM_CONTENT_TYPES = None
+
+def get_form_types():
+ global _FORM_CONTENT_TYPES
+ if _FORM_CONTENT_TYPES is None:
+ _FORM_CONTENT_TYPES = [
+ ct for ct in get_page_types()
+ if issubclass(ct.model_class(), AbstractForm)
+ ]
+ return _FORM_CONTENT_TYPES
+
+
+def get_forms_for_user(user):
+ """Return a queryset of form pages that this user is allowed to access the submissions for"""
+ editable_pages = UserPagePermissionsProxy(user).editable_pages()
+ return editable_pages.filter(content_type__in=get_form_types())
+
+
+class AbstractForm(Page):
+ """A Form Page. Pages implementing a form should inhert from it"""
+
+ form_builder = FormBuilder
+ is_abstract = True # Don't display me in "Add"
+
+ def __init__(self, *args, **kwargs):
+ super(AbstractForm, self).__init__(*args, **kwargs)
+ if not hasattr(self, 'landing_page_template'):
+ template_wo_ext = re.match(HTML_EXTENSION_RE, self.template).group(1)
+ self.landing_page_template = template_wo_ext + '_landing.html'
+
+ class Meta:
+ abstract = True
+
+ def get_form_parameters(self):
+ return {}
+
+ def process_form_submission(self, form):
+ # remove csrf_token from form.data
+ form_data = dict(
+ i for i in form.data.items()
+ if i[0] != 'csrfmiddlewaretoken'
+ )
+
+ FormSubmission.objects.create(
+ form_data=json.dumps(form_data),
+ page=self,
+ )
+
+ def serve(self, request):
+ fb = self.form_builder(self.form_fields.all())
+ form_class = fb.get_form_class()
+ form_params = self.get_form_parameters()
+
+ if request.method == 'POST':
+ form = form_class(request.POST, **form_params)
+
+ if form.is_valid():
+ self.process_form_submission(form)
+ # If we have a form_processing_backend call its process method
+ if hasattr(self, 'form_processing_backend'):
+ form_processor = self.form_processing_backend()
+ form_processor.process(self, form)
+
+ # render the landing_page
+ # TODO: It is much better to redirect to it
+ return render(request, self.landing_page_template, {
+ 'self': self,
+ })
+ else:
+ form = form_class(**form_params)
+
+ return render(request, self.template, {
+ 'self': self,
+ 'form': form,
+ })
+
+ def get_page_modes(self):
+ return [
+ ('form', 'Form'),
+ ('landing', 'Landing page'),
+ ]
+
+ def show_as_mode(self, mode):
+ if mode == 'landing':
+ return render(self.dummy_request(), self.landing_page_template, {
+ 'self': self,
+ })
+ else:
+ return super(AbstractForm, self).show_as_mode(mode)
+
+
+class AbstractEmailForm(AbstractForm):
+ """A Form Page that sends email. Pages implementing a form to be send to an email should inherit from it"""
+ is_abstract = True # Don't display me in "Add"
+
+ to_address = models.CharField(max_length=255, blank=True, help_text=_("Optional - form submissions will be emailed to this address"))
+ from_address = models.CharField(max_length=255, blank=True)
+ subject = models.CharField(max_length=255, blank=True)
+
+ def process_form_submission(self, form):
+ super(AbstractEmailForm, self).process_form_submission(form)
+
+ if self.to_address:
+ content = '\n'.join([x[1].label + ': ' + form.data.get(x[0]) for x in form.fields.items()])
+ tasks.send_email_task.delay(self.subject, content, [self.to_address], self.from_address,)
+
+
+ class Meta:
+ abstract = True
diff --git a/wagtail/wagtailforms/static/wagtailforms/js/page-editor.js b/wagtail/wagtailforms/static/wagtailforms/js/page-editor.js
new file mode 100644
index 000000000..8e7398133
--- /dev/null
+++ b/wagtail/wagtailforms/static/wagtailforms/js/page-editor.js
@@ -0,0 +1,3 @@
+$(function(){
+
+});
\ No newline at end of file
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index.html b/wagtail/wagtailforms/templates/wagtailforms/index.html
new file mode 100644
index 000000000..c5ccc1aa4
--- /dev/null
+++ b/wagtail/wagtailforms/templates/wagtailforms/index.html
@@ -0,0 +1,15 @@
+{% extends "wagtailadmin/base.html" %}
+{% load i18n %}
+{% block titletag %}{% trans "Forms" %}{% endblock %}
+{% block bodyclass %}menu-forms{% endblock %}
+{% block content %}
+ {% trans "Forms" as forms_str %}
+ {% trans "Pages" as select_form_str %}
+ {% include "wagtailadmin/shared/header.html" with title=forms_str subtitle=select_form_str icon="form" %}
+
+
+
+{% endblock %}
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
new file mode 100644
index 000000000..a1b45f6d0
--- /dev/null
+++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
@@ -0,0 +1,68 @@
+{% extends "wagtailadmin/base.html" %}
+{% load i18n %}
+{% load localize %}
+{% block titletag %}{% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %}
+{% block bodyclass %}menu-snippets{% endblock %}
+{% block extra_js %}
+ {% get_localized_datepicker_js %}
+ {% get_date_format_override as format_override %}
+
+
+{% endblock %}
+{% block content %}
+
+ {% include "wagtailforms/results_forms.html" %}
+
+
+ {% if submissions %}
+ {% include "wagtailforms/list_submissions.html" %}
+
+ {% include "wagtailadmin/shared/pagination_nav.html" with items=submissions is_searching=False linkurl='-' %}
+ {# Here we pass an invalid non-empty URL name as linkurl to generate pagination links with the URL path omitted #}
+ {% else %}
+
+ {% endif %}
+
+{% endblock %}
diff --git a/wagtail/wagtailforms/templates/wagtailforms/list_forms.html b/wagtail/wagtailforms/templates/wagtailforms/list_forms.html
new file mode 100644
index 000000000..b1958f5b2
--- /dev/null
+++ b/wagtail/wagtailforms/templates/wagtailforms/list_forms.html
@@ -0,0 +1,23 @@
+{% load i18n %}
+| {% trans "Title" %} | +{% trans "Origin" %} | +
|---|---|
+ {{ fp|capfirst }}+ |
+ + {{ fp.content_type.name |capfirst }} ({{ fp.content_type.app_label }}.{{ fp.content_type.model }}) + | +
+
+
+
diff --git a/wagtail/wagtailforms/templates/wagtailforms/results_forms.html b/wagtail/wagtailforms/templates/wagtailforms/results_forms.html
new file mode 100644
index 000000000..6cf198553
--- /dev/null
+++ b/wagtail/wagtailforms/templates/wagtailforms/results_forms.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+{% if form_pages %}
+ {% include "wagtailforms/list_forms.html" %}
+
+ {% include "wagtailadmin/shared/pagination_nav.html" with items=form_pages linkurl="wagtailforms_index" %}
+{% else %}
+ | {% trans "Submission Date" %} | + {% for heading in data_headings %} +{{ heading }} | + {% endfor %} +
|---|---|
| + {{ cell }} + | + {% endfor %} +
{% trans "No form pages have been created." %}
+{% endif %} diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py new file mode 100644 index 000000000..8ec2ee5c3 --- /dev/null +++ b/wagtail/wagtailforms/tests.py @@ -0,0 +1,63 @@ +from django.test import TestCase + +from wagtail.wagtailcore.models import Page +from wagtail.wagtailforms.models import FormSubmission + +class TestFormSubmission(TestCase): + fixtures = ['test.json'] + + def test_get_form(self): + response = self.client.get('/contact-us/') + self.assertContains(response, """""") + self.assertNotContains(response, "Thank you for your feedback") + + def test_post_invalid_form(self): + response = self.client.post('/contact-us/', { + 'your-email': 'bob', 'your-message': 'hello world' + }) + self.assertNotContains(response, "Thank you for your feedback") + self.assertContains(response, "Enter a valid email address.") + + def test_post_valid_form(self): + response = self.client.post('/contact-us/', { + 'your-email': 'bob@example.com', 'your-message': 'hello world' + }) + self.assertNotContains(response, "Your email") + self.assertContains(response, "Thank you for your feedback") + + form_page = Page.objects.get(url_path='/home/contact-us/') + + self.assertTrue(FormSubmission.objects.filter(page=form_page, form_data__contains='hello world').exists()) + + +class TestFormsBackend(TestCase): + fixtures = ['test.json'] + + def test_cannot_see_forms_without_permission(self): + form_page = Page.objects.get(url_path='/home/contact-us/') + + self.client.login(username='eventeditor', password='password') + response = self.client.get('/admin/forms/') + self.assertFalse(form_page in response.context['form_pages']) + + def test_can_see_forms_with_permission(self): + form_page = Page.objects.get(url_path='/home/contact-us/') + + self.client.login(username='siteeditor', password='password') + response = self.client.get('/admin/forms/') + self.assertTrue(form_page in response.context['form_pages']) + + def test_can_get_submissions(self): + form_page = Page.objects.get(url_path='/home/contact-us/') + + self.client.login(username='siteeditor', password='password') + + response = self.client.get('/admin/forms/submissions/%d/' % form_page.id) + self.assertEqual(len(response.context['data_rows']), 2) + + response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014' % form_page.id) + self.assertEqual(len(response.context['data_rows']), 1) + + response = self.client.get('/admin/forms/submissions/%d/?date_from=01%%2F01%%2F2014&action=CSV' % form_page.id) + data_line = response.content.split("\n")[1] + self.assertTrue('new@example.com' in data_line) diff --git a/wagtail/wagtailforms/urls.py b/wagtail/wagtailforms/urls.py new file mode 100644 index 000000000..e3f6bf6a8 --- /dev/null +++ b/wagtail/wagtailforms/urls.py @@ -0,0 +1,9 @@ +from django.conf.urls import patterns, url + + +urlpatterns = patterns( + 'wagtail.wagtailforms.views', + url(r'^$', 'index', name='wagtailforms_index'), + url(r'^submissions/(\d+)/$', 'list_submissions', name='wagtailforms_list_submissions'), + +) diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py new file mode 100644 index 000000000..2174642c6 --- /dev/null +++ b/wagtail/wagtailforms/views.py @@ -0,0 +1,104 @@ +import datetime +import unicodecsv + +from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.core.exceptions import PermissionDenied +from django.http import HttpResponse +from django.shortcuts import get_object_or_404, render +from django.contrib.auth.decorators import permission_required + +from wagtail.wagtailcore.models import Page +from wagtail.wagtailforms.models import FormSubmission, get_forms_for_user +from wagtail.wagtailforms.forms import SelectDateForm + + +@permission_required('wagtailadmin.access_admin') +def index(request): + p = request.GET.get("p", 1) + + form_pages = get_forms_for_user(request.user) + + paginator = Paginator(form_pages, 20) + + try: + form_pages = paginator.page(p) + except PageNotAnInteger: + form_pages = paginator.page(1) + except EmptyPage: + form_pages = paginator.page(paginator.num_pages) + + return render(request, 'wagtailforms/index.html', { + 'form_pages': form_pages, + }) + + +@permission_required('wagtailadmin.access_admin') +def list_submissions(request, page_id): + form_page = get_object_or_404(Page, id=page_id).specific + + if not get_forms_for_user(request.user).filter(id=page_id).exists(): + raise PermissionDenied + + data_fields = [ + (field.clean_name, field.label) + for field in form_page.form_fields.all() + ] + + submissions = FormSubmission.objects.filter(page=form_page) + + select_date_form = SelectDateForm(request.GET) + if select_date_form.is_valid(): + date_from = select_date_form.cleaned_data.get('date_from') + date_to = select_date_form.cleaned_data.get('date_to') + # careful: date_to should be increased by 1 day since the submit_time + # is a time so it will always be greater + if date_to: + date_to += datetime.timedelta(days=1) + if date_from and date_to: + submissions = submissions.filter(submit_time__range=[date_from, date_to]) + elif date_from and not date_to: + submissions = submissions.filter(submit_time__gte=date_from) + elif not date_from and date_to: + submissions = submissions.filter(submit_time__lte=date_to) + + if request.GET.get('action') == 'CSV': + # return a CSV instead + response = HttpResponse(content_type='text/csv; charset=utf-8') + response['Content-Disposition'] = 'attachment;filename=export.csv' + writer = unicodecsv.writer(response, encoding='utf-8') + + header_row = ['Submission date'] + [label for name, label in data_fields] + + writer.writerow(header_row) + for s in submissions: + data_row = [s.submit_time] + form_data = s.get_data() + for name, label in data_fields: + data_row.append(form_data.get(name)) + writer.writerow(data_row) + return response + + p = request.GET.get('p', 1) + paginator = Paginator(submissions, 20) + + try: + submissions = paginator.page(p) + except PageNotAnInteger: + submissions = paginator.page(1) + except EmptyPage: + submissions = paginator.page(paginator.num_pages) + + data_headings = [label for name, label in data_fields] + data_rows = [] + for s in submissions: + form_data = s.get_data() + data_row = [s.submit_time] + [form_data.get(name) for name, label in data_fields] + data_rows.append(data_row) + + return render(request, 'wagtailforms/index_submissions.html', { + 'form_page': form_page, + 'select_date_form': select_date_form, + 'submissions': submissions, + 'data_headings': data_headings, + 'data_rows': data_rows + }) diff --git a/wagtail/wagtailforms/wagtail_hooks.py b/wagtail/wagtailforms/wagtail_hooks.py new file mode 100644 index 000000000..277fc6e73 --- /dev/null +++ b/wagtail/wagtailforms/wagtail_hooks.py @@ -0,0 +1,28 @@ +from django.core import urlresolvers +from django.conf import settings +from django.conf.urls import include, url +from django.utils.translation import ugettext_lazy as _ + +from wagtail.wagtailadmin import hooks +from wagtail.wagtailadmin.menu import MenuItem + +from wagtail.wagtailforms import urls +from wagtail.wagtailforms.models import get_forms_for_user + +def register_admin_urls(): + return [ + url(r'^forms/', include(urls)), + ] +hooks.register('register_admin_urls', register_admin_urls) + +def construct_main_menu(request, menu_items): + # show this only if the user has permission to retrieve submissions for at least one form + if get_forms_for_user(request.user).exists(): + menu_items.append( + MenuItem(_('Forms'), urlresolvers.reverse('wagtailforms_index'), classnames='icon icon-form', order=700) + ) +hooks.register('construct_main_menu', construct_main_menu) + +def editor_js(): + return """""" % settings.STATIC_URL +hooks.register('insert_editor_js', editor_js) diff --git a/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.mo b/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.mo new file mode 100644 index 000000000..284cefcb2 Binary files /dev/null and b/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.mo differ diff --git a/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.po new file mode 100644 index 000000000..5db580a36 --- /dev/null +++ b/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.po @@ -0,0 +1,170 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Wagtail\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-14 23:02+0200\n" +"PO-Revision-Date: 2014-03-14 21:12+0000\n" +"Last-Translator: wdv4758h
-
+
{% if uploadform %}
-