voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor html and style fixes.

Browse source 
Applied wrapping to the description <pre>s,
removed some css that referred to nonexistent things,
move some element tags inside the {%if%} that fills the contents.
This commit is contained in:
voussoir 2018-08-17 22:05:16 -07:00
parent f28e362c58
commit 8fdbd49f70
4 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frontends/etiquette_flask/static/css/common.css
View file

@ -23,6 +23,12 @@ body
background-color: var(--color_site_theme); background-color: var(--color_site_theme);
} }
pre
{
white-space: pre-line;
}
#header #header
{ {
display: grid; display: grid;

24
frontends/etiquette_flask/templates/album.html
View file

@ -26,10 +26,8 @@ p
/* overriding common.css here */ /* overriding common.css here */
display: block; display: block;
} }
#title_editor, #album_metadata
#description_editor
{ {
width: 100%;
max-width: 800px; max-width: 800px;
} }
#description_text #description_text
@ -38,10 +36,6 @@ p
padding: 8px; padding: 8px;
background-color: rgba(0, 0, 0, 0.1); background-color: rgba(0, 0, 0, 0.1);
} }
#description_editor textarea
{
width: 100%;
}
</style> </style>
</head> </head>
@ -49,6 +43,7 @@ p
<body> <body>
{{header.make_header(session=session)}} {{header.make_header(session=session)}}
<div id="content_body"> <div id="content_body">
<div id="album_metadata">
<h2> <h2>
<span <span
id="title_text" id="title_text"
@ -68,6 +63,7 @@ p
> >
{{-album.description-}} {{-album.description-}}
</pre> </pre>
</div>
<ul> <ul>
{% set viewparam = "?view=list" if view == "list" else "" %} {% set viewparam = "?view=list" if view == "list" else "" %}
@ -112,24 +108,24 @@ p
</ul> </ul>
{% endif %} {% endif %}
<p> {% set has_local_photos = photos|length > 0 %}
{% set has_local_photos = photos|length > 0 %} {% set has_child_photos = album.has_any_subalbum_photo() %}
{% set has_child_photos = album.has_any_subalbum_photo() %} {% if has_local_photos or has_child_photos %}
{% if has_local_photos or has_child_photos %} <p>
Download: Download:
{% if has_local_photos %} {% if has_local_photos %}
<a href="/album/{{album.id}}.zip?recursive=no"> <a href="/album/{{album.id}}.zip?recursive=no">
These files ({{album.sum_bytes(recurse=False)|bytestring }}) These files ({{album.sum_bytes(recurse=False)|bytestring }})
</a> </a>
{% if has_child_photos %}&mdash;{% endif %}
{% endif %} {% endif %}
{% if has_local_photos and has_child_photos %}&mdash;{% endif %}
{% if has_child_photos %} {% if has_child_photos %}
<a href="/album/{{album.id}}.zip?recursive=yes"> <a href="/album/{{album.id}}.zip?recursive=yes">
Include children ({{album.sum_bytes(recurse=True)|bytestring }}) Include children ({{album.sum_bytes(recurse=True)|bytestring }})
</a> </a>
{% endif %} {% endif %}
{% endif %} </p>
</p> {% endif %}
{{clipboard_tray.clipboard_tray()}} {{clipboard_tray.clipboard_tray()}}
</div> </div>
</body> </body>

25
frontends/etiquette_flask/templates/tags.html
View file

@ -33,6 +33,10 @@ body
word-break: break-word; word-break: break-word;
grid-area: left; grid-area: left;
} }
#tag_metadata
{
max-width: 800px;
}
#right #right
{ {
position: fixed; position: fixed;
@ -101,6 +105,7 @@ body
{{header.make_header(session=session)}} {{header.make_header(session=session)}}
<div id="left"> <div id="left">
{% if specific_tag %} {% if specific_tag %}
<div id="tag_metadata">
<h2> <h2>
<span <span
id="name_text" id="name_text"
@ -118,15 +123,19 @@ body
> >
{{-specific_tag.description-}} {{-specific_tag.description-}}
</pre> </pre>
</div>
<ul> {% set parents = specific_tag.get_parents() %}
{% for ancestor in specific_tag.get_parents() %} {% if parents %}
<li> <ul>
{{tag_object.tag_object(ancestor, innertext='(?)', link='info')}} {% for ancestor in specific_tag.get_parents() %}
{{tag_object.tag_object(ancestor, innertext=ancestor.name, link=none, with_alt_description=True)}} <li>
</li> {{tag_object.tag_object(ancestor, innertext='(?)', link='info')}}
{% endfor %} {{tag_object.tag_object(ancestor, innertext=ancestor.name, link=none, with_alt_description=True)}}
</ul> </li>
{% endfor %}
{% endif %}
</ul>
{% endif %} {% endif %}
<ul> <ul>
{% for (qualified_name, tag) in tags %} {% for (qualified_name, tag) in tags %}

4
frontends/etiquette_flask/templates/user.html
View file

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
{% import "header.html" as header %} {% import "header.html" as header %}
<title>User {{user.display_name}}</title> <title>{{user.display_name}}</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link rel="stylesheet" href="/static/css/common.css"> <link rel="stylesheet" href="/static/css/common.css">
@ -22,7 +22,7 @@
<div id="content_body"> <div id="content_body">
<h2>{{user.display_name}}</h2> <h2>{{user.display_name}}</h2>
<p>ID: {{user.id}}</p> <p>ID: {{user.id}}</p>
<p title="{{user.created|int|timestamp_to_8601}}">User since {{user.created|timestamp_to_naturaldate}}.</p> <p>User since <span title="{{user.created|int|timestamp_to_8601}}">{{user.created|timestamp_to_naturaldate}}.</span></p>
<p><a href="/search?author={{user.username}}">Photos by {{user.display_name}}</a></p> <p><a href="/search?author={{user.username}}">Photos by {{user.display_name}}</a></p>
</div> </div>
</body> </body>