GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[TWIG] Microformats added to timeline, note's view and media. Should be backwards compatiblr as well. 

Signed-off-by: Eliseu Amaro <mail@eliseuama.ro>
This commit is contained in:
Eliseu Amaro 2021-07-23 13:04:04 +01:00 committed by Hugo Sales
parent 03fb7b43e8
commit 22f394f28f
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/assets/css/right/right.css
View File

@ -29,4 +29,15 @@
width: 100%; width: 100%;
padding: var(--small-size); padding: var(--small-size);
}
input[type="file"] {
font-family: var(--display-font);
}
.custom-file-upload {
border: 1px solid #ccc;
display: inline-block;
padding: 6px 12px;
cursor: pointer;
} }

4
templates/network/public.html.twig
View File

@ -20,6 +20,7 @@
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<div class="content"> <div class="content">
<div class="navigation"> <div class="navigation">
@ -59,7 +60,8 @@
</nav> </nav>
</div> </div>
<div class="timeline"> {# Backwards compatibility with hAtom 0.1 #}
<div class="h-feed hfeed timeline">
<div class="notes"> <div class="notes">
{% if notes is defined and notes is not empty %} {% if notes is defined and notes is not empty %}
{% for conversation in notes %} {% for conversation in notes %}

13
templates/note/view.html.twig
View File

@ -1,10 +1,11 @@
<div class="note"> <div class="h-entry hentry note">
<div class="note-info"> <div class="note-info">
{% set nickname = note.getActorNickname() %} {% set nickname = note.getActorNickname() %}
<a href="{{ path('settings_avatar') }}"> <a class="u-url" href="{{ path('settings_avatar') }}">
<img class="avatar" src="{{ note.getAvatarUrl() }}" alt="{{ nickname }}'s avatar"> {# Microformat's h-card properties indicates a face icon is a "u-logo" #}
<b>{{ nickname }}</b> <img class="u-logo avatar" src="{{ note.getAvatarUrl() }}" alt="{{ nickname }}'s avatar">
<b class="p-nickname">{{ nickname }}</b>
</a> </a>
{% set reply_to = note.getReplyToNickname() %} {% set reply_to = note.getReplyToNickname() %}
@ -12,7 +13,7 @@
{% trans with {'%name%': reply_to} %} in reply to %name% {% endtrans %} {% trans with {'%name%': reply_to} %} in reply to %name% {% endtrans %}
{% endif %} {% endif %}
</div> </div>
<div class="note-content"> <div class="e-content entry-content note-content">
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
{{ note.getContent() }} {{ note.getContent() }}
@ -39,7 +40,7 @@
{# {% endif %} #} {# {% endif %} #}
</div> </div>
{% if replies is defined %} {% if replies is defined %}
<div class="replies"> <div class="u-in-reply-to replies">
{% for conversation in replies %} {% for conversation in replies %}
{% include '/note/view.html.twig' with {'note': conversation['note'], 'skip_reply_to': true, 'have_user': have_user, 'replies': conversation['replies']} only %} {% include '/note/view.html.twig' with {'note': conversation['note'], 'skip_reply_to': true, 'have_user': have_user, 'replies': conversation['replies']} only %}
{% endfor %} {% endfor %}

5
templates/sidepanel/right/right.html.twig
View File

@ -29,9 +29,8 @@
</div> </div>
<div class="notice-options"> <div class="notice-options">
<div class="attachments"> <div class="attachments">
{{ form_widget(post_form.attachments) }} <label for="{{ post_form.attachments.vars.id }}" class="custom-file-upload">
<label for="{{ post_form.attachments.vars.id }}"> {{ form_widget(post_form.attachments) }}
{{ icon('attach', 'icon icon-attach') | raw }}
</label> </label>
</div> </div>
<div class="post"> <div class="post">