Fix follower template

This commit is contained in:
Thomas Sileo 2018-07-03 08:25:40 +02:00
parent c6ae9793d5
commit 1ef476b9b9

View file

@ -1,5 +1,5 @@
{% macro display_actor_inline(follower, size=50) -%} {% macro display_actor_inline(follower, size=50) -%}
<a class="actor-box" href="{{follower.url}}" style="clear:both;"> <a class="actor-box" href="{{follower.get_url()}}" style="clear:both;">
<span style="float:left;padding-right:15px;"> <span style="float:left;padding-right:15px;">
{% if not follower.icon %} {% if not follower.icon %}
<img class="actor-icon" src="/static/nopic.png" style="width:{{ size }}px"> <img class="actor-icon" src="/static/nopic.png" style="width:{{ size }}px">
@ -8,7 +8,7 @@
</span> </span>
<div class="actor-inline"> <div class="actor-inline">
<div style="font-weight:bold">{{ follower.name or follower.preferredUsername }}</div> <div style="font-weight:bold">{{ follower.name or follower.preferredUsername }}</div>
<small>@{{ follower.preferredUsername }}@{{ follower.url | domain }}</small> <small>@{{ follower.preferredUsername }}@{{ follower.get_url() | domain }}</small>
</div> </div>
</a> </a>
{%- endmacro %} {%- endmacro %}
@ -20,14 +20,14 @@
<div class="note h-entry" id="activity-{{ obj.id | permalink_id }}"> <div class="note h-entry" id="activity-{{ obj.id | permalink_id }}">
<div class="h-card p-author"> <div class="h-card p-author">
<a class="u-url u-uid no-hover" href="{{ actor.url }}"><img class="u-photo" src="{% if not actor.icon %}/static/nopic.png{% else %}{{ actor.icon.url }}{% endif %}"> <a class="u-url u-uid no-hover" href="{{ actor.get_url() }}"><img class="u-photo" src="{% if not actor.icon %}/static/nopic.png{% else %}{{ actor.icon.url }}{% endif %}">
</a> </a>
<data class="p-name" value="{{ actor.name or actor.preferredUsername }}"></data> <data class="p-name" value="{{ actor.name or actor.preferredUsername }}"></data>
</div> </div>
<div class="note-wrapper"> <div class="note-wrapper">
<a href="{{ actor.url }}" style="margin:0;text-decoration:none;" class="no-hover"><strong>{{ actor.name or actor.preferredUsername }}</strong> <a href="{{ actor.get_url() }}" style="margin:0;text-decoration:none;" class="no-hover"><strong>{{ actor.name or actor.preferredUsername }}</strong>
<span class="l">@{% if not no_color and obj.id | is_from_outbox %}<span class="pcolor">{{ actor.preferredUsername }}</span>{% else %}{{ actor.preferredUsername }}{% endif %}@{% if not no_color and obj.id | is_from_outbox %}<span class="pcolor">{{ actor.url | domain }}</span>{% else %}{{ actor.url | domain }}{% endif %}</span></a> <span class="l">@{% if not no_color and obj.id | is_from_outbox %}<span class="pcolor">{{ actor.preferredUsername }}</span>{% else %}{{ actor.preferredUsername }}{% endif %}@{% if not no_color and obj.id | is_from_outbox %}<span class="pcolor">{{ actor.get_url() | domain }}</span>{% else %}{{ actor.get_url() | domain }}{% endif %}</span></a>
{% if not perma %} {% if not perma %}
<span style="float:right"> <span style="float:right">