diff --git a/frontends/etiquette_flask/static/css/common.css b/frontends/etiquette_flask/static/css/common.css index 6a4dd8a..1dda1e1 100644 --- a/frontends/etiquette_flask/static/css/common.css +++ b/frontends/etiquette_flask/static/css/common.css @@ -23,6 +23,12 @@ body background-color: var(--color_site_theme); } + +pre +{ + white-space: pre-line; +} + #header { display: grid; diff --git a/frontends/etiquette_flask/templates/album.html b/frontends/etiquette_flask/templates/album.html index 536658f..a301122 100644 --- a/frontends/etiquette_flask/templates/album.html +++ b/frontends/etiquette_flask/templates/album.html @@ -26,10 +26,8 @@ p /* overriding common.css here */ display: block; } -#title_editor, -#description_editor +#album_metadata { - width: 100%; max-width: 800px; } #description_text @@ -38,10 +36,6 @@ p padding: 8px; background-color: rgba(0, 0, 0, 0.1); } -#description_editor textarea -{ - width: 100%; -} @@ -49,6 +43,7 @@ p {{header.make_header(session=session)}}
+

{{-album.description-}} +

{% endif %} -

- {% set has_local_photos = photos|length > 0 %} - {% set has_child_photos = album.has_any_subalbum_photo() %} - {% if has_local_photos or has_child_photos %} + {% set has_local_photos = photos|length > 0 %} + {% set has_child_photos = album.has_any_subalbum_photo() %} + {% if has_local_photos or has_child_photos %} +

Download: {% if has_local_photos %} These files ({{album.sum_bytes(recurse=False)|bytestring }}) + {% if has_child_photos %}—{% endif %} {% endif %} - {% if has_local_photos and has_child_photos %}—{% endif %} {% if has_child_photos %} Include children ({{album.sum_bytes(recurse=True)|bytestring }}) {% endif %} - {% endif %} -

+

+ {% endif %} {{clipboard_tray.clipboard_tray()}}
diff --git a/frontends/etiquette_flask/templates/tags.html b/frontends/etiquette_flask/templates/tags.html index 352d854..7d7b8c4 100644 --- a/frontends/etiquette_flask/templates/tags.html +++ b/frontends/etiquette_flask/templates/tags.html @@ -33,6 +33,10 @@ body word-break: break-word; grid-area: left; } +#tag_metadata +{ + max-width: 800px; +} #right { position: fixed; @@ -101,6 +105,7 @@ body {{header.make_header(session=session)}}
{% if specific_tag %} +

{{-specific_tag.description-}} +

- + {% set parents = specific_tag.get_parents() %} + {% if parents %} + {% endif %}