diff --git a/.travis.yml b/.travis.yml
index 3e0a4bb98..8764f2859 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ services:
# Package installation
install:
- python setup.py install
- - pip install psycopg2 pyelasticsearch elasticutils==0.8.2 wand embedly
+ - pip install psycopg2 elasticsearch wand embedly
- pip install coveralls
# Pre-test configuration
before_script:
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 039935b43..ca58949b4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,15 +3,19 @@ Changelog
0.4 (xx.xx.20xx)
~~~~~~~~~~~~~~~~
+ * ElasticUtils/pyelasticsearch swapped for elasticsearch-py
* Added 'original' as a resizing rule supported by the 'image' tag
* Hallo.js updated to version 1.0.4
* Snippets are now ordered alphabetically
* Removed the "More" section from the admin menu
* Added pagination to page listings in admin
* Support for setting a subpage_types property on page models, to define which page types are allowed as subpages
- * Added a new datetime picker
- * Added styleguide
+ * Added a new datetime picker widget
+ * Added styleguide (mainly for wagtail developers)
* Aesthetic improvements to preview experience
+ * 'image' tag now accepts extra keyword arguments to be output as attributes on the img tag
+ * Added an 'attrs' property to image rendition objects to output src, width, height and alt attributes all in one go
+ * Added 'construct_whitelister_element_rules' hook for customising the HTML whitelist used when saving rich text fields
* Fix: Animated GIFs are now coalesced before resizing
* Fix: Wand backend clones images before modifying them
* Fix: Admin breadcrumb now positioned correctly on mobile
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index a3f9c7221..fcba8d2d7 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -1,8 +1,8 @@
Original Authors
================
-* Matthew Westcott matthew.westcott@torchbox.com
-* David Cranwell david.cranwell@torchbox.com
+* Matthew Westcott matthew.westcott@torchbox.com twitter: @gasmanic
+* David Cranwell david.cranwell@torchbox.com twitter: @davecranwell
* Karl Hobley karl.hobley@torchbox.com
* Helen Chapman helen.chapman@torchbox.com
diff --git a/README.rst b/README.rst
index 62b3c5cd5..0e68b8c6b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
.. image:: https://travis-ci.org/torchbox/wagtail.png?branch=master
:target: https://travis-ci.org/torchbox/wagtail
-.. image:: https://coveralls.io/repos/torchbox/wagtail/badge.png?branch=master&zxcv
+.. image:: https://coveralls.io/repos/torchbox/wagtail/badge.png?branch=master&zxcv1
:target: https://coveralls.io/r/torchbox/wagtail?branch=master
.. image:: https://pypip.in/v/wagtail/badge.png?zxcv
diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index 0ef918582..651b15818 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -189,17 +189,41 @@ The available resizing methods are:
More control over the ``img`` tag
---------------------------------
-In some cases greater control over the ``img`` tag is required, for example to add a custom ``class``. Rather than generating the ``img`` element for you, Wagtail can assign the relevant data to another object using Django's ``as`` syntax:
+Wagtail provides two shorcuts to give greater control over the ``img`` element:
+
+.. versionadded:: 0.4
+**Adding attributes to the {% image %} tag**
+
+Extra attributes can be specified with the syntax ``attribute="value"``:
.. code-block:: django
-
- {% load wagtailimages_tags %}
- ...
+
+ {% image self.photo width-400 class="foo" id="bar" %}
+
+No validation is performed on attributes add in this way by the developer. It's possible to add `src`, `width`, `height` and `alt` of your own that might conflict with those generated by the tag itself.
+
+
+**Generating the image "as"**
+
+Wagtail can assign the image data to another object using Django's ``as`` syntax:
+
+.. code-block:: django
+
{% image self.photo width-400 as tmp_photo %}
+.. versionadded:: 0.4
+The ``attrs`` shortcut
+-----------------------
+
+You can also use the ``attrs`` property as a shorthand to output the ``src``, ``width``, ``height`` and ``alt`` attributes in one go:
+
+.. code-block:: django
+
+
+
.. _rich-text-filter:
diff --git a/docs/editing_api.rst b/docs/editing_api.rst
index 88fc9458f..9f7602b11 100644
--- a/docs/editing_api.rst
+++ b/docs/editing_api.rst
@@ -546,6 +546,28 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func
+ 'demo/css/vendor/font-awesome/css/font-awesome.min.css">')
hooks.register('insert_editor_css', editor_css)
+.. _construct_whitelister_element_rules:
+
+``construct_whitelister_element_rules``
+ .. versionadded:: 0.4
+ Customise the rules that define which HTML elements are allowed in rich text areas. By default only a limited set of HTML elements and attributes are whitelisted - all others are stripped out. The callables passed into this hook must return a dict, which maps element names to handler functions that will perform some kind of manipulation of the element. These handler functions receive the element as a `BeautifulSoup `_ Tag object.
+
+ The ``wagtail.wagtailcore.whitelist`` module provides a few helper functions to assist in defining these handlers: ``allow_without_attributes``, a handler which preserves the element but strips out all of its attributes, and ``attribute_rule`` which accepts a dict specifying how to handle each attribute, and returns a handler function. This dict will map attribute names to either True (indicating that the attribute should be kept), False (indicating that it should be dropped), or a callable (which takes the initial attribute value and returns either a final value for the attribute, or None to drop the attribute).
+
+ For example, the following hook function will add the ``