Skip to content

Commit

Permalink
Sensor param removed from GoogleMaps js call. Fixes #3
Browse files Browse the repository at this point in the history
  • Loading branch information
jordij committed Feb 15, 2016
1 parent 3d5b79a commit 94f6b21
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 28 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setup(
name='wagtailgmaps',
version='0.2.3',
version='0.2.4',
packages=['wagtailgmaps'],
include_package_data=True,
license='BSD License',
Expand Down
13 changes: 8 additions & 5 deletions wagtailgmaps/templates/wagtailadmin/admin_base.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
{% extends "wagtailadmin/skeleton.html" %}
{% load compress static wagtailadmin_tags %}
{% load wagtailgmaps_tags %}

{% block css %}
{% compress css %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css' %}" />
<link rel="stylesheet" href="{% static 'wagtailadmin/css/core.css' %}" type="text/css" />
{% endcompress %}
<link rel="stylesheet" href="{% static 'wagtailgmaps/css/admin.css' %}" type="text/css" />
{% endcompress %}

{% block extra_css %}{% endblock %}
{% endblock %}

{% block branding_favicon %}
<link rel="shortcut icon" href="{% static 'wagtailadmin/images/favicon.ico' %}" />
{% endblock %}

{% block js %}
<script src="https://maps.google.com/maps/api/js?sensor=false"></script>
<script src="https://maps.google.com/maps/api/js"></script>
{% compress js %}
<script src="{% static 'wagtailadmin/js/vendor/jquery-1.10.3.js' %}"></script>
<script src="{% static 'wagtailadmin/js/vendor/jquery-ui-1.10.3.js' %}"></script>
Expand All @@ -26,6 +29,6 @@
<script src="{% static 'wagtailadmin/js/core.js' %}"></script>
{% main_nav_js %}
{% endcompress %}

{% block extra_js %}{% endblock %}
{% endblock %}
{% endblock %}
17 changes: 0 additions & 17 deletions wagtailgmaps/templatetags/wagtailgmaps_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand All @@ -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'
5 changes: 0 additions & 5 deletions wagtailgmaps/utils.py

This file was deleted.

0 comments on commit 94f6b21

Please sign in to comment.