Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed typo in new.html

Fixed google maps plugin loading wrong javascript files
  • Loading branch information...
commit 888a46aee3049beea5a191438c1797e28a8be91f 1 parent 4ac3e42
@ojii ojii authored
View
8 cms/plugins/googlemap/cms_plugins.py
@@ -3,7 +3,6 @@
from cms.plugin_base import CMSPluginBase
from django.utils.translation import ugettext_lazy as _
from cms.plugins.googlemap.models import GoogleMap
-from cms.plugins.googlemap.settings import GOOGLE_MAPS_API_KEY
from django.forms.widgets import Media
class GoogleMapPlugin(CMSPluginBase):
@@ -19,11 +18,6 @@ def render(self, context, instance, placeholder):
return context
def get_plugin_media(self, request, context, plugin):
- if 'GOOGLE_MAPS_API_KEY' in context:
- key = context['GOOGLE_MAPS_API_KEY']
- else:
- key = GOOGLE_MAPS_API_KEY
- lang = getattr(request, 'LANGUAGE_CODE', settings.LANGUAGE_CODE[0:2])
- return Media(js = ('http://maps.google.com/maps?file=api&v=2&key=%s&hl=%s' % (key, lang),))
+ return Media(js = ('http://maps.google.com/maps/api/js?sensor=true',))
plugin_pool.register_plugin(GoogleMapPlugin)
View
2  cms/templates/cms/new.html
@@ -46,7 +46,7 @@
<p><img src="{{ CMS_MEDIA_URL }}images/pony.jpg" alt="" />&nbsp;</p>
</div>
<div class="box-right">
- <h1>Welcome django CMS!<br />Here is what to do next:</h1>
+ <h1>Welcome to the django CMS!<br />Here is what to do next:</h1>
<p>&nbsp;</p>
<h2>Log into the <a href="/admin/">admin</a> interface and start <a href="/admin/cms/page/add/">adding</a> some pages!</h2>
<p class="info">Make sure you publish them.</p>
Please sign in to comment.
Something went wrong with that request. Please try again.