Merge branch 'release/1.9'

* release/1.9:
  upates CHANGES/tox.ini
  bump version
  removes django 1.8 from tox
  Fix #14
  Fixed broken download url
  Switched broken pypip.in badges to shields.io
  updates Makefile

CHANGES

@@ -1,3 +1,9 @@
+Release 1.9
+-----------
+* Fixed the link css classes (issue #15)
+* Fixed broken download url (issue #12)
+* Fixed broken pypip.in badges (issue #11)
+
 Release 1.8
 -----------
 * standard "post action redirect" now preserve existing filters

Makefile

@@ -5,7 +5,7 @@ develop:
 
 clean:
 	# cleaning
-	@rm -fr dist '~build'
+	@rm -fr dist '~build' .pytest_cache .coverage src/admin_extra_urls.egg-info
 	@find . -name __pycache__ -o -name .eggs | xargs rm -rf
 	@find . -name "*.py?" -o -name ".DS_Store" -o -name "*.orig" -o -name "*.min.min.js" -o -name "*.min.min.css" -prune | xargs rm -rf
 

README.rst

@@ -110,7 +110,7 @@ Links
 +--------------------+---------------+---------------------------------------------+
 | Issue tracker:     |https://github.com/saxix/django-admin-extra-urls/issues?sort |
 +--------------------+---------------+---------------------------------------------+
-| Download:          |http://pypi.python.org/pypi/django-admin-extra-urls/         |
+| Download:          |http://pypi.python.org/pypi/admin-extra-urls/                |
 +--------------------+---------------+---------------------------------------------+
 
 
@@ -127,15 +127,15 @@ Links
                     :target: https://codecov.io/gh/saxix/django-admin-extra-urls
 
 
-.. |python| image:: https://pypip.in/py_versions/admin-extra-urls/badge.svg
+.. |python| image:: https://img.shields.io/pypi/pyversions/admin-extra-urls.svg
     :target: https://pypi.python.org/pypi/admin-extra-urls/
     :alt: Supported Python versions
 
-.. |pypi| image:: https://pypip.in/version/admin-extra-urls/badge.svg?text=version
+.. |pypi| image:: https://img.shields.io/pypi/v/admin-extra-urls.svg?label=version
     :target: https://pypi.python.org/pypi/admin-extra-urls/
     :alt: Latest Version
 
-.. |license| image:: https://pypip.in/license/admin-extra-urls/badge.svg
+.. |license| image:: https://img.shields.io/pypi/l/admin-extra-urls.svg
     :target: https://pypi.python.org/pypi/admin-extra-urls/
     :alt: License
 

src/admin_extra_urls/__init__.py

@@ -1,3 +1,3 @@
 NAME = "admin-extra-urls"
-VERSION = __version__ = "1.8.0"
+VERSION = __version__ = "1.9.0"
 __author__ = 'sax'

src/admin_extra_urls/site.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+
+
+class AdminSiteMixin(object):
+    pass

src/admin_extra_urls/templates/admin_extra_urls/change_form.html

@@ -1,13 +1,7 @@
 {% extends "admin/change_form.html" %}
 {% load i18n admin_static admin_list admin_urls %}
 
-{% block object-tools %}
-
-    <ul class="object-tools">
-        {% block object-tools-items %}
-            {{ block.super }}
-            {% include "admin_extra_urls/includes/change_form_buttons.html" %}
-        {% endblock %}
-    </ul>
-
+{% block object-tools-items %}
+    {{ block.super }}
+    {% include "admin_extra_urls/includes/change_form_buttons.html" %}
 {% endblock %}

src/admin_extra_urls/templates/admin_extra_urls/change_list.html

@@ -1,19 +1,7 @@
 {% extends "admin/change_list.html" %}
 {% load extra_urls i18n admin_static admin_list admin_urls %}
 
-{% block object-tools %}
-
-    <div class="object-tools">
-        {% block object-tools-items %}
-            {% if has_add_permission %}
-               <li> <a href="{% url cl.opts|admin_urlname:'add' %}{% if is_popup %}?_popup=1{% endif %}"
-                   class="btn btn-success">
-                    <i class="icon-plus-sign icon-white"></i>&nbsp;
-                    {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}
-                </a></li>
-            {% endif %}
-            {% include "admin_extra_urls/includes/change_list_buttons.html" %}
-        {% endblock %}
-    </div>
-
+{% block object-tools-items %}
+    {{ block.super }}
+    {% include "admin_extra_urls/includes/change_list_buttons.html" %}
 {% endblock %}

tox.ini

@@ -30,14 +30,13 @@ markers =
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH PYTHONDONTWRITEBYTECODE DISPLAY
 setenv =
     PYTHONDONTWRITEBYTECODE=true
-
+;extras=test
 deps=
     -rsrc/requirements/testing.pip
-    d18: django>=1.8,<1.9
     d19: django>=1.9,<1.10
     d110: django>=1.10,<1.11
     d111: django>=1.11,<1.12
-    d20: django>=2.0dev,<2.1
+    d20: django>=2.0,<2.1
 
     dev: git+git://github.com/django/django.git#egg=django