Add test for get_all_media()

[mediagoblin.git] / mediagoblin / templates / mediagoblin / utils / profile.html

diff --git a/mediagoblin/templates/mediagoblin/utils/profile.html b/mediagoblin/templates/mediagoblin/utils/profile.html
index cd60bbfc1d2746acf89065e870f0c629537b9472..5cc38487479a93983688233a0bd2d3e200c1edf5 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/profile.html
+++ b/mediagoblin/templates/mediagoblin/utils/profile.html
@@ -1,6 +1,6 @@
 {#
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16,20 +16,27 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
+{% block mediagoblin_head %}
+  {% template_hook("location_head") %}
+{% endblock mediagoblin_head %}
+
 {% block profile_content -%}
-  {% if user.url or user.bio %}
-    <div class="profile_content">
-      {% if user.url %}
-        <div class="profile_homepage">
-          <a href="{{ user.url }}">{{ user.url }}</a>
-        </div>
-      {% endif %}
-    
-      {% if user.bio %}
-        <div class="profile_bio">
-          {{ user.bio }}
-        </div>
+  {% if user.bio %}
+    {% autoescape False %}
+      {{ user.bio_html }}
+    {% endautoescape %}
+  {% endif %}
+  {% if user.url %}
+    <p>
+      <a href="{{ user.url }}">{{ user.url }}</a>
+    </p>
+  {% endif %}
+  {% if user.location %}
+      {%- set model = user %}
+      <h3>{% trans %}Location{% endtrans %}</h3>
+      {% if model.get_location.name %}
+        <p>{{ model.get_location.name }}</p>
       {% endif %}
-    </div>
+      {% template_hook("location_info") %}
   {% endif %}
-{% endblock %}    
+{% endblock %}