Merge remote branch 'upstream/master' into dev/mount_storage

[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 b3f5f0f8dd4eebfe1920b81c8fd1f94675929089..63024b77e3cf8c71ac87d3ab2a0e65be1babb93b 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/profile.html
+++ b/mediagoblin/templates/mediagoblin/utils/profile.html
@@ -17,19 +17,14 @@
 #}
 
 {% block profile_content -%}
-  <div>
-    <ul>
-      {% if user.url %}
-          <li>
-            <a href="{{ user.url }}">homepage</a>
-          </li>
-      {%  endif %}
-      
-      {% if user.bio %}
-          <li>
-            {{ user.bio }}
-          </li>
-      {%  endif %}
-    </ul>
-  </div>
-{% endblock %}    
+  {% if user.bio %}
+    {% autoescape False %}
+      <p>{{ user.bio_html }}</p>
+    {% endautoescape %}
+  {% endif %}
+  {% if user.url %}
+    <p>
+      <a href="{{ user.url }}">{{ user.url }}</a>
+    </p>
+  {% endif %}
+{% endblock %}