Enhance user picture view

This commit is contained in:
Skia 2016-11-30 12:58:52 +01:00
parent 7453b857fb
commit 8771cc9b86
2 changed files with 22 additions and 14 deletions

View File

@ -85,7 +85,7 @@
<div class="tools"> <div class="tools">
{% for t in list_of_tabs %} {% for t in list_of_tabs %}
<a href="{{ t.url }}" <a href="{{ t.url }}"
{%- if current_tab == t.slug -%} {%- if current_tab == t.slug %}
class="selected_tab" class="selected_tab"
{%- endif -%} {%- endif -%}
>{{ t.name }}</a> >{{ t.name }}</a>

View File

@ -6,19 +6,27 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% for r in profile.pictures.exclude(picture=None).values('user__pictures__picture__parent').distinct() %} {% set album = None %}
<div style="padding: 10px"> {% set new_album = True %}
{% set album = profile.pictures.filter(picture__parent=r['user__pictures__picture__parent']).first().picture.parent %} {% for r in profile.pictures.exclude(picture=None).order_by('-picture__parent__id', 'id') -%}
<h4>{{ album.name }}</h4> {%- if album != r.picture.parent %}
<hr> {%- if album %}
{% for r in profile.pictures.exclude(picture=None).filter(picture__parent=album).order_by('id') %} </div>
<div class="picture"> {% endif -%}
<a href="{{ url("sas:picture", picture_id=r.picture.id) }}#pict"> {% set new_album = True %}
<img src="{{ r.picture.as_picture.get_download_thumb_url() }}" alt="{{ r.picture.get_display_name() }}" style="max-width: 100%"/> {% set album = r.picture.parent %}
</a> <div style="padding: 10px">
<h4>{{ album.name }}</h4>
<hr>
{% else %}
{% set new_album = False %}
{%- endif %}
<div class="picture">
<a href="{{ url("sas:picture", picture_id=r.picture.id) }}#pict">
<img src="{{ r.picture.as_picture.get_download_thumb_url() }}" alt="{{ r.picture.get_display_name() }}" style="max-width: 100%"/>
</a>
</div>
{%- endfor %}
</div> </div>
{% endfor %}
</div>
{% endfor %}
{% endblock %} {% endblock %}