Merge commit '476fbb59297e05fd21b0f8114eeabbcea8998604'

* commit '476fbb59297e05fd21b0f8114eeabbcea8998604':
  Changelog for jazzband#71 and jazzband#72
  SortedCheckboxSelectMultiple remove static
  Remove branch whitelisting for travis
  Try container based builds on travis
  Bump version to 1.1.1.dev1
  Prepare 1.1.1 release
  Add PyPI badge to README
  Fix collapsing filter bar for the new Django 1.9 admin.
  Bump version to 1.1.0.dev1
  Preparing 1.1.0 release
  Mention jazzband#68 in changelog

.travis.yml

@@ -1,4 +1,5 @@
 language: python
+sudo: false
 env:
   - TOX_ENV=py26-15
   - TOX_ENV=py26-16
@@ -29,17 +30,14 @@ env:
 before_install:
   - export PIP_USE_MIRRORS=true
   - export DJANGO_SETTINGS_MODULE=test_settings
-  - sudo pip install tox
   # Postgres setup.
-  - sudo apt-get install postgresql postgresql-client
   - # Password is 'sortedm2m'
-  - echo "CREATE ROLE sortedm2m PASSWORD 'md5ba287bde612ca41b14776ec8f8dfdaa9' SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN;" | sudo -u postgres psql
-  - echo "CREATE DATABASE sortedm2m OWNER sortedm2m;" | sudo -u postgres psql
+  - psql -c "CREATE ROLE sortedm2m PASSWORD 'md5ba287bde612ca41b14776ec8f8dfdaa9' SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN;" -U postgres
+  - psql -c "CREATE DATABASE sortedm2m OWNER sortedm2m;" -U postgres
   # MySQL setup.
   - echo "CREATE USER 'sortedm2m'@'localhost' IDENTIFIED BY 'sortedm2m';" | mysql -u root
   - echo "GRANT ALL PRIVILEGES ON *.* TO 'sortedm2m'@'localhost' WITH GRANT OPTION;" | mysql -u root
+install:
+  - pip install tox
 script:
   - tox -e $TOX_ENV -v
-branches:
-  only:
-    - master

CHANGES.rst

@@ -1,17 +1,37 @@
 Changelog
 =========
 
-1.1.0 (in development)
+1.2.0 (in development)
 ----------------------
 
-* `#59`_, `#65`_: Django 1.9 support. Thanks to Scott Kyle and Jasper Maes for
+* `#71`_: Don't break collectstatic for some cases. Therefore we removed the
+  STATIC_URL prefix from the form media definition in
+  ``SortedCheckboxSelectMultiple``. Thanks to Kirill Ermolov for the
+  patch.
+
+.. _#71: https://github.com/gregmuellegger/django-sortedm2m/issue/71
+
+1.1.1
+-----
+
+* `#70`_: CSS fix for Django 1.9 new admin design. Thanks to Maarten Draijer
+  for the patch.
+
+.. _#70: https://github.com/gregmuellegger/django-sortedm2m/pull/70
+
+1.1.0
+-----
+
+* `#59`_, `#65`_, `#68`_: Django 1.9 support. Thanks to Scott Kyle and Jasper Maes for
   patches.
 * `#67`_: Support for disabling migrations for some models, that can be
   decided by Django's DB router (with the ``allow_migrate_model`` method).
   Thanks to @hstanev for the patch.
 
 .. _#59: https://github.com/gregmuellegger/django-sortedm2m/pull/59
 .. _#65: https://github.com/gregmuellegger/django-sortedm2m/pull/65
+.. _#67: https://github.com/gregmuellegger/django-sortedm2m/pull/67
+.. _#68: https://github.com/gregmuellegger/django-sortedm2m/pull/68
 
 1.0.2
 -----

README.rst

@@ -2,9 +2,7 @@
 django-sortedm2m
 ================
 
-.. image:: https://travis-ci.org/gregmuellegger/django-sortedm2m.png
-   :alt: Build Status
-   :target: https://travis-ci.org/gregmuellegger/django-sortedm2m
+|pypi-badge| |build-status|
 
 ``sortedm2m`` is a drop-in replacement for django's own ``ManyToManyField``.
 The provided ``SortedManyToManyField`` behaves like the original one but
@@ -179,3 +177,11 @@ in touch with me by mail_ or twitter_.
 
 .. _mail: mailto:gregor@muellegger.de
 .. _twitter: http://twitter.com/gregmuellegger
+
+.. |pypi-badge| image:: https://img.shields.io/pypi/v/django-sortedm2m.svg
+   :alt: PyPI Release
+   :target: https://pypi.python.org/pypi/django-sortedm2m
+
+.. |build-status| image:: https://travis-ci.org/gregmuellegger/django-sortedm2m.png
+   :alt: Build Status
+   :target: https://travis-ci.org/gregmuellegger/django-sortedm2m

sortedm2m/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
 
-__version__ = '1.1.0.dev1'
+__version__ = '1.1.1.dev1'

sortedm2m/forms.py

@@ -4,7 +4,6 @@
 from itertools import chain
 from django import forms
 from django.conf import settings
-from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.db.models.query import QuerySet
 from django.template.loader import render_to_string
 from django.utils.encoding import force_text
@@ -25,11 +24,11 @@
 class SortedCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
     class Media:
         js = (
-            static('sortedm2m/widget.js'),
-            static('sortedm2m/jquery-ui.js'),
+            'sortedm2m/widget.js',
+            'sortedm2m/jquery-ui.js',
         )
         css = {'screen': (
-            static('sortedm2m/widget.css'),
+            'sortedm2m/widget.css',
         )}
 
     def build_attrs(self, attrs=None, **kwargs):

sortedm2m/static/sortedm2m/widget.css

@@ -11,7 +11,7 @@
 
 .sortedm2m-container p.selector-filter input {
     width: 532px;
-    margin: 5px 4px;
+    margin: 0 0 0 4px;
 }
 
 ul.sortedm2m {
@@ -46,7 +46,7 @@ body.change-form .sortedm2m-container {
 }
 .module ul.sortedm2m {
     margin: 0;
-    padding: 6px 8px;
+    padding: 10px 0;
 }
 
 .hide {