Display album description

master
voussoir 2016-12-14 13:26:42 -08:00
parent 1ecd1f979e
commit 1e7aff5cfd
3 changed files with 17 additions and 12 deletions

View File

@ -8,6 +8,10 @@
<link rel="stylesheet" href="/static/common.css"> <link rel="stylesheet" href="/static/common.css">
<style> <style>
p
{
word-break: break-word;
}
#content_body #content_body
{ {
/* overriding common.css here */ /* overriding common.css here */
@ -21,6 +25,7 @@
{{header.make_header()}} {{header.make_header()}}
<div id="content_body"> <div id="content_body">
<h2>{{album["title"]}}</h2> <h2>{{album["title"]}}</h2>
<p>{{album["description"]}}</p>
{% set parent=album["parent"] %} {% set parent=album["parent"] %}
{% if parent %} {% if parent %}
<h3>Parent: <a href="/album/{{parent["id"]}}">{{parent.title}}</a></h3> <h3>Parent: <a href="/album/{{parent["id"]}}">{{parent.title}}</a></h3>

View File

@ -24,7 +24,7 @@
{% else %} {% else %}
{% set title=album["id"] %} {% set title=album["id"] %}
{% endif %} {% endif %}
<a href="/album/{{album["id"]}}">{{title}}</a> <div><a href="/album/{{album["id"]}}">{{album["id"] + " " + album["title"]}}</a></div>
{% endfor %} {% endfor %}
</div> </div>
</body> </body>

View File

@ -24,16 +24,16 @@
<div class="photo_card_grid_thumb"> <div class="photo_card_grid_thumb">
<a target="_blank" href="/photo/{{photo["id"]}}"> <a target="_blank" href="/photo/{{photo["id"]}}">
<img height="150" <img height="150"
{% if photo["has_thumbnail"] %} {% if photo["has_thumbnail"] %}
src="/thumbnail/{{photo["id"]}}.jpg" src="/thumbnail/{{photo["id"]}}.jpg"
{% else %} {% else %}
{% set choice = {% set choice =
thumbnails.get(photo["extension"], thumbnails.get(photo["extension"],
thumbnails.get(photo["mimetype"], thumbnails.get(photo["mimetype"],
'other')) 'other'))
%} %}
src="/static/basic_thumbnails/{{choice}}.png" src="/static/basic_thumbnails/{{choice}}.png"
{% endif %} {% endif %}
</a> </a>
</div> </div>
<div class="photo_card_grid_info"> <div class="photo_card_grid_info">
@ -59,4 +59,4 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}