askiiart/microblog.pub
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Simplify/tweak note display

Browse source
This commit is contained in:
Thomas Sileo 2019-10-02 22:34:38 +02:00
parent 91f879d213
commit ab2cf5f3c0
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
templates/utils.html
View file

@ -26,7 +26,7 @@
{% endif %} {% endif %}
{%- endmacro %} {%- endmacro %}
{% macro display_note(obj, perma=False, ui=False, likes=[], shares=[], meta={}, no_color=False) -%} {% macro display_note(obj, perma=False, likes=[], shares=[], meta={}, no_color=False) -%}
{% if meta.object_actor %} {% if meta.object_actor %}
{% set actor = meta.object_actor %} {% set actor = meta.object_actor %}
@ -259,7 +259,6 @@
{% if not perma and meta.count_like and obj.id | is_from_outbox %}<a class ="bar-item" href="{{ obj.url | get_url }}"><strong>{{ meta.count_like }}</strong> like{% if meta.count_like > 1 %}s{% endif %}</a>{% endif %} {% if not perma and meta.count_like and obj.id | is_from_outbox %}<a class ="bar-item" href="{{ obj.url | get_url }}"><strong>{{ meta.count_like }}</strong> like{% if meta.count_like > 1 %}s{% endif %}</a>{% endif %}
{% if session.logged_in %} {% if session.logged_in %}
{% if ui%}
<a class="bar-item" href="/admin/new?reply={{ aid }}">reply</a> <a class="bar-item" href="/admin/new?reply={{ aid }}">reply</a>
{% if meta | get_visibility | visibility_is_public %} {% if meta | get_visibility | visibility_is_public %}
@ -342,8 +341,6 @@
{% else %} {% else %}
{% endif %} {% endif %}
{% endif %}
{% if session.logged_in and obj.inReplyTo and not meta.count_reply and not perma %} {% if session.logged_in and obj.inReplyTo and not meta.count_reply and not perma %}
<a class="bar-item" href="/admin/thread?oid={{aid}}">thread</a> <a class="bar-item" href="/admin/thread?oid={{aid}}">thread</a>
{% endif %} {% endif %}
@ -394,9 +391,9 @@
{% macro display_thread(thread, likes=[], shares=[]) -%} {% macro display_thread(thread, likes=[], shares=[]) -%}
{% for reply in thread %} {% for reply in thread %}
{% if reply._requested %} {% if reply._requested %}
{{ display_note(reply.activity.object, perma=True, ui=False, likes=likes, shares=shares, meta=reply.meta) }} {{ display_note(reply.activity.object, perma=True, likes=likes, shares=shares, meta=reply.meta) }}
{% else %} {% else %}
{{ display_note(reply.activity.object, perma=False, ui=True, meta=reply.meta) }} {{ display_note(reply.activity.object, perma=False, meta=reply.meta) }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endmacro -%} {% endmacro -%}