aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/plugins/geolocation/__init__.py2
-rw-r--r--mediagoblin/templates/mediagoblin/base.html4
-rw-r--r--mediagoblin/templates/mediagoblin/media_displays/image.html2
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html2
4 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/plugins/geolocation/__init__.py b/mediagoblin/plugins/geolocation/__init__.py
index c55e1e6a..5d14590e 100644
--- a/mediagoblin/plugins/geolocation/__init__.py
+++ b/mediagoblin/plugins/geolocation/__init__.py
@@ -27,7 +27,7 @@ def setup_plugin():
pluginapi.register_template_hooks(
{"image_sideinfo": "mediagoblin/plugins/geolocation/map.html",
- "image_extrahead": "mediagoblin/plugins/geolocation/map_js_head.html"})
+ "image_head": "mediagoblin/plugins/geolocation/map_js_head.html"})
hooks = {
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 36bb4c62..25e71396 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -37,13 +37,13 @@
<![endif]-->
{# For clarification, the difference between the extra_head.html template
- # and the extra_head template hook is that the former should be used by
+ # and the head template hook is that the former should be used by
# themes and the latter should be used by plugins.
# The reason is that only one thing can override extra_head.html...
# but multiple plugins can hook into the template hook.
#}
{% include "mediagoblin/extra_head.html" %}
- {% template_hook("extra_head") %}
+ {% template_hook("head") %}
{% block mediagoblin_head %}
{% endblock mediagoblin_head %}
diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html
index bc03c456..158dd67f 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/image.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/image.html
@@ -20,7 +20,7 @@
{% block mediagoblin_head %}
{{ super() }}
- {% template_hook("image_extrahead") %}
+ {% template_hook("image_head") %}
{% endblock mediagoblin_head %}
{% block mediagoblin_sidebar %}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 535ee448..876ce850 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -30,7 +30,7 @@
<script type="text/javascript"
src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script>
- {% template_hook("media_extrahead") %}
+ {% template_hook("media_head") %}
{% endblock mediagoblin_head %}
{% block mediagoblin_content %}