Merge remote-tracking branch 'joar/exif-rebase'

diff --combined mediagoblin/templates/mediagoblin/user_pages/media.html
index 9df3dfbc4ce591b46c57e01730a7c24e1c709482,2229bbb2cc3d753fb80cf85916417193796112b7..dec443cd6b388e03ff22cb168ebf12bc0a99ca15
--- 1/mediagoblin/templates/mediagoblin/user_pages/media.html
--- 2/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@@ -23,8 -23,20 +23,20 @@@
  {% block title %}{{ media.title }} — {{ super() }}{% endblock %}
  
  {% block mediagoblin_head %}
+ <!--[if lte IE 8]><link rel="stylesheet"
+     href="{{ request.staticdirect('/extlib/leaflet/leaflet.ie.css') }}" /><![endif]-->
    <script type="text/javascript"
            src="{{ request.staticdirect('/js/comment_show.js') }}"></script>
+ 
+   {% if app_config['geolocation_map_visible'] %}
+     <link rel="stylesheet"
+         href="{{ request.staticdirect('/extlib/leaflet/leaflet.css') }}" />
+ 
+     <script type="text/javascript"
+             src="{{ request.staticdirect('/extlib/leaflet/leaflet.js') }}"></script>
+     <script type="text/javascript"
+             src="{{ request.staticdirect('/js/geolocation-map.js') }}"></script>
+   {% endif %}
  {% endblock mediagoblin_head %}
  
  {% block mediagoblin_content %}
@@@ -127,7 -139,7 +139,7 @@@
              <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
                     comment = comment._id,
                     user = media.get_uploader.username,
 -                   media = media.slug) }}#comment">
 +                   media = media.slug_or_id) }}#comment">
                {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
              </a>
            </div>
@@@ -172,5 -184,9 +184,9 @@@
      {% endif %}
  
      {% include "mediagoblin/utils/license.html" %}
+ 
+     {% include "mediagoblin/utils/geolocation_map.html" %}
+ 
+     {% include "mediagoblin/utils/exif.html" %}
    </div>
  {% endblock %}