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

[COMPONENTS][Collection] Notes collection template now has a default title

Browse Source 
[CARDS][Note] Removed note actions from minimal note block
This commit is contained in:
Eliseu Amaro 2022-01-17 02:51:20 +00:00 committed by Hugo Sales
parent 077cbcf424
commit 7daa61500d
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
components/Collection/templates/collection/notes.html.twig
View File

@ -13,45 +13,47 @@
{{ block | raw }} {{ block | raw }}
{% endfor %} {% endfor %}
<header class="feed-header"> {% if notes is defined %}
{% if page_title is defined %} <section>
<h1 class="heading-no-margin">{{ page_title | trans }}</h1> <header class="feed-header">
{% endif %} {% if page_title is defined %}
<nav class="feed-actions"> <h1 class="heading-no-margin">{{ page_title | trans }}</h1>
<details class="feed-actions-details"> {% else %}
<summary> <h1 class="heading-no-margin">{{ 'Notes' | trans }}</h1>
{{ icon('filter', 'icon icon-feed-actions') | raw }} {# button-container #} {% endif %}
</summary> <nav class="feed-actions">
<div class="feed-actions-details-dropdown"> <details class="feed-actions-details">
<ul> <summary>
{% for block in handle_event('AddFeedActions', app.request, notes is defined and notes is not empty) %} {{ icon('filter', 'icon icon-feed-actions') | raw }} {# button-container #}
{{ block | raw }} </summary>
{% endfor %} <div class="feed-actions-details-dropdown">
</ul> <ul>
</div> {% for block in handle_event('AddFeedActions', app.request, notes is defined and notes is not empty) %}
</details> {{ block | raw }}
</nav> {% endfor %}
</header> </ul>
</div>
</details>
</nav>
</header>
{# Backwards compatibility with hAtom 0.1 #} {% if notes is not empty %}
<main class="feed" tabindex="0" role="feed"> {# Backwards compatibility with hAtom 0.1 #}
<div class="h-feed hfeed notes"> <main class="feed" tabindex="0" role="feed">
{% if notes is defined and notes is not empty %} <div class="h-feed hfeed notes">
{% for conversation in notes %} {% for conversation in notes %}
{% block current_note %} {% block current_note %}
{% if conversation is instanceof('array') %} {% if conversation is instanceof('array') %}
{{ noteView.macro_note(conversation['note'], conversation['replies']) }} {{ noteView.macro_note(conversation['note'], conversation['replies']) }}
{% else %} {% else %}
{{ noteView.macro_note(conversation) }} {{ noteView.macro_note(conversation) }}
{% endif %} {% endif %}
<hr tabindex="0" title="{{ 'End of note and replies.' | trans }}"> <hr tabindex="0" title="{{ 'End of note and replies.' | trans }}">
{% endblock current_note %} {% endblock current_note %}
{% endfor %} {% endfor %}
{% else %}
<div class="feed-empty">
{{ icon('logo', 'icon feed-background') | raw }}
</div> </div>
</main>
{% endif %} {% endif %}
</div> </section>
</main> {% endif %}
{% endblock body %} {% endblock body %}

29
templates/cards/note/view.html.twig
View File

@ -107,18 +107,14 @@
{% endblock note_sidebar %} {% endblock note_sidebar %}
{% block note_info %} {% block note_info %}
<div class="note-info"> <div class="note-info-start">
<div class="note-info-start"> {{ block('note_author') }}
{{ block('note_author') }} <small class="note-conversation-info">
<small class="note-conversation-info"> <a href="{{ note.getConversationUrl() }}"
<a href="{{ note.getConversationUrl() }}" class="note-conversation-url">{{ 'in conversation' | trans }}</a>
class="note-conversation-url">{{ 'in conversation' | trans }}</a> <a href="{{ note.getUrl() }}"
<a href="{{ note.getUrl() }}" class="note-url">{{ note.getModified() | ago }}</a>
class="note-url">{{ note.getModified() | ago }}</a> </small>
</small>
</div>
{{ block('note_actions') }}
</div> </div>
{% endblock note_info %} {% endblock note_info %}
@ -162,7 +158,10 @@
class="h-entry hentry note" lang={{ note.getLanguageLocale() }}> class="h-entry hentry note" lang={{ note.getLanguageLocale() }}>
{{ block('note_sidebar') }} {{ block('note_sidebar') }}
<div class="note-wrapper"> <div class="note-wrapper">
{{ block('note_info') }} <div class="note-info">
{{ block('note_info') }}
{{ block('note_actions') }}
</div>
<section role="dialog" class="e-content entry-content note-content"> <section role="dialog" class="e-content entry-content note-content">
{{ block('note_text') }} {{ block('note_text') }}
@ -188,7 +187,9 @@
<article class="h-entry hentry note" lang={{ note.getLanguageLocale() }}> <article class="h-entry hentry note" lang={{ note.getLanguageLocale() }}>
{{ block('note_sidebar') }} {{ block('note_sidebar') }}
<div class="note-wrapper"> <div class="note-wrapper">
{{ block('note_info') }} <div class="note-info">
{{ block('note_info') }}
</div>
<section role="dialog" class="e-content entry-content note-content"> <section role="dialog" class="e-content entry-content note-content">
{{ block('note_text') }} {{ block('note_text') }}