diff --git a/setup.py b/setup.py index fd3cb37..a63554f 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='wagtailgmaps', - version='0.2.3', + version='0.2.4', packages=['wagtailgmaps'], include_package_data=True, license='BSD License', diff --git a/wagtailgmaps/templates/wagtailadmin/admin_base.html b/wagtailgmaps/templates/wagtailadmin/admin_base.html index e88c94b..1a7d629 100644 --- a/wagtailgmaps/templates/wagtailadmin/admin_base.html +++ b/wagtailgmaps/templates/wagtailadmin/admin_base.html @@ -1,19 +1,22 @@ {% extends "wagtailadmin/skeleton.html" %} {% load compress static wagtailadmin_tags %} -{% load wagtailgmaps_tags %} {% block css %} {% compress css %} - {% endcompress %} + {% endcompress %} {% block extra_css %}{% endblock %} {% endblock %} +{% block branding_favicon %} + +{% endblock %} + {% block js %} - + {% compress js %} @@ -26,6 +29,6 @@ {% main_nav_js %} {% endcompress %} - + {% block extra_js %}{% endblock %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/wagtailgmaps/templatetags/wagtailgmaps_tags.py b/wagtailgmaps/templatetags/wagtailgmaps_tags.py index d949ecc..4175252 100644 --- a/wagtailgmaps/templatetags/wagtailgmaps_tags.py +++ b/wagtailgmaps/templatetags/wagtailgmaps_tags.py @@ -3,10 +3,6 @@ from django import template from django.conf import settings -from distutils.version import StrictVersion - -from wagtailgmaps.utils import get_wagtail_version - register = template.Library() @@ -33,16 +29,3 @@ def map_editor(address, width, width_units, height, height_units, zoom): 'height': height, 'height_units': height_units, } - - -@register.simple_tag -def wagtail_version(): - """ - Return css folder used in the path of admin assets depending on the Wagtail version - """ - current_version = get_wagtail_version() - - if StrictVersion(current_version) >= StrictVersion('1.0b2'): - return 'css' - else: - return 'scss' diff --git a/wagtailgmaps/utils.py b/wagtailgmaps/utils.py deleted file mode 100644 index e9c1c02..0000000 --- a/wagtailgmaps/utils.py +++ /dev/null @@ -1,5 +0,0 @@ -import pkg_resources - - -def get_wagtail_version(): - return pkg_resources.get_distribution("wagtail").version