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

Remove duplicated markup between list/grid photo cards.

Browse source
This commit is contained in:
voussoir 2018-12-27 15:30:30 -08:00
parent 669247415f
commit 6dcf47cab7
2 changed files with 35 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontends/etiquette_flask/static/css/photo_card.css
View file

@ -137,13 +137,13 @@
min-width: 100%; min-width: 100%;
width: 0; width: 0;
max-height: 30px;
background-color: inherit; background-color: inherit;
word-break: break-word; word-break: break-word;
} }
.photo_card_grid .photo_card_filename .photo_card_grid .photo_card_filename
{ {
align-self: start; align-self: start;
max-height: 30px;
font-size: 12.8px; font-size: 12.8px;
} }
.photo_card_list .photo_card_filename .photo_card_list .photo_card_filename

77
frontends/etiquette_flask/templates/photo_card.html
View file

@ -15,38 +15,7 @@
} }
%} %}
{% macro create_photo_card(photo, view="grid") %} {% macro create_photo_card(photo, view="grid") %}
{% set view = (view if view in ("list", "grid") else "grid") %}
{% if view == "list" %}
<div class="photo_card photo_card_list photo_card_unselected" data-id="{{photo.id}}">
<input type="checkbox" class="photo_card_selector_checkbox" onclick="photo_clipboard.on_photo_select(event)"/>
<span class="photo_card_filename"><a target="_blank" href="/photo/{{photo.id}}">{{photo.basename}}</a></span>
<a class="photo_card_metadata" target="_blank" href="{{photo|file_link}}">{{photo.bytestring}}</a>
</div>
{% else -%}
{% if photo.thumbnail %}
{% set thumbnail_src = "/thumbnail/" + photo.id + ".jpg" %}
{% else %}
{% set thumbnail_src =
thumbnails.get(photo.extension, "") or
thumbnails.get(photo.mimetype, "") or
thumbnails.get(photo.simple_mimetype, "") or
"other"
%}
{% set thumbnail_src = "/static/basic_thumbnails/" + thumbnail_src + ".png" %}
{% endif -%}
{% set tag_names_title = [] %}
{% for tag in photo.get_tags() %}
{% do tag_names_title.append(tag.name) %}
{% endfor -%}
{% set tag_names_title = ", ".join(tag_names_title) %}
{% if tag_names_title %}
{% set tag_names_inner = "T" %}
{% else %}
{% set tag_names_inner = "" %}
{% endif -%}
{% set metadata_inner = "" %} {% set metadata_inner = "" %}
{% if photo.width %} {% if photo.width %}
@ -56,23 +25,41 @@
{% set metadata_inner = "{m}{d}, ".format(m=metadata_inner, d=photo.duration_string) %} {% set metadata_inner = "{m}{d}, ".format(m=metadata_inner, d=photo.duration_string) %}
{% endif -%} {% endif -%}
<div class="photo_card photo_card_grid photo_card_unselected" data-id="{{photo.id}}"> <div class="photo_card photo_card_{{view}} photo_card_unselected" data-id="{{photo.id}}">
<a class="photo_card_thumbnail" target="_blank" href="/photo/{{photo.id}}"> <input type="checkbox" class="photo_card_selector_checkbox" onclick="photo_clipboard.on_photo_select(event)"/>
<img src="{{thumbnail_src}}"> <div class="photo_card_filename"><a target="_blank" href="/photo/{{photo.id}}">{{photo.basename}}</a></div>
</a>
<div class="photo_card_filename">
<a target="_blank" href="/photo/{{photo.id}}">{{photo.basename}}</a>
</div>
<span class="photo_card_tags" title="{{tag_names_title}}">{{tag_names_inner}}</span>
<span class="photo_card_metadata"> <span class="photo_card_metadata">
{{- metadata_inner|safe -}} {{- metadata_inner|safe -}}
<a target="_blank" href="{{photo|file_link}}">{{photo.bytestring}}</a> <a target="_blank" href="{{photo|file_link}}">{{photo.bytestring}}</a>
</span> </span>
<input type="checkbox" class="photo_card_selector_checkbox" onclick="photo_clipboard.on_photo_select(event)"/> {% if view == "grid" %}
{% if photo.thumbnail %}
{% set thumbnail_src = "/thumbnail/" + photo.id + ".jpg" %}
{% else %}
{% set thumbnail_src =
thumbnails.get(photo.extension, "") or
thumbnails.get(photo.mimetype, "") or
thumbnails.get(photo.simple_mimetype, "") or
"other"
%}
{% set thumbnail_src = "/static/basic_thumbnails/" + thumbnail_src + ".png" %}
{% endif -%}
{% set tag_names_title = [] %}
{% for tag in photo.get_tags() %}
{% do tag_names_title.append(tag.name) %}
{% endfor -%}
{% set tag_names_title = ", ".join(tag_names_title) %}
{% if tag_names_title %}
{% set tag_names_inner = "T" %}
{% else %}
{% set tag_names_inner = "" %}
{% endif -%}
<a class="photo_card_thumbnail" target="_blank" href="/photo/{{photo.id}}"><img src="{{thumbnail_src}}"></a>
<span class="photo_card_tags" title="{{tag_names_title}}">{{tag_names_inner}}</span>
{% endif %}
</div> </div>
{% endif %}
{% endmacro %} {% endmacro %}