From 6a2e055dfd749322f40bde7e65c369d53337d8c8 Mon Sep 17 00:00:00 2001 From: Noah Petherbridge Date: Fri, 15 May 2015 00:18:50 +0000 Subject: [PATCH] Fix photo markup and add copyable links for blogs --- rophako/modules/photo/templates/photos/album.html | 2 +- rophako/modules/photo/templates/photos/view.html | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/rophako/modules/photo/templates/photos/album.html b/rophako/modules/photo/templates/photos/album.html index d06e429..0fadae4 100644 --- a/rophako/modules/photo/templates/photos/album.html +++ b/rophako/modules/photo/templates/photos/album.html @@ -4,7 +4,7 @@

Album: {{ album }}

-{% if markdown %} +{% if album_info["description"] %}
{{ markdown|safe }}

{% endif %} diff --git a/rophako/modules/photo/templates/photos/view.html b/rophako/modules/photo/templates/photos/view.html index 105c376..bcdbe14 100644 --- a/rophako/modules/photo/templates/photos/view.html +++ b/rophako/modules/photo/templates/photos/view.html @@ -28,12 +28,18 @@

-{% if photo["markdown"] %} +{% if photo["description"] %}

{{ photo["markdown"]|safe }}
{% endif %} Uploaded by {{ author["name"] }} on {{ photo["pretty_time"] }}. +{% if session["login"] %} +

Embed this image in a blog post:
+ (Markdown)
+ '> (HTML) +{% endif %} + {{ nav_links() }} {% if session["login"] %} @@ -54,4 +60,4 @@ subject="Photo Comment", ) | safe }} -{% endblock %} \ No newline at end of file +{% endblock %}