eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests 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 untrusted user: 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

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

@ -13,9 +13,13 @@
{{ block | raw }} {{ block | raw }}
{% endfor %} {% endfor %}
{% if notes is defined %}
<section>
<header class="feed-header"> <header class="feed-header">
{% if page_title is defined %} {% if page_title is defined %}
<h1 class="heading-no-margin">{{ page_title | trans }}</h1> <h1 class="heading-no-margin">{{ page_title | trans }}</h1>
{% else %}
<h1 class="heading-no-margin">{{ 'Notes' | trans }}</h1>
{% endif %} {% endif %}
<nav class="feed-actions"> <nav class="feed-actions">
<details class="feed-actions-details"> <details class="feed-actions-details">
@ -33,10 +37,10 @@
</nav> </nav>
</header> </header>
{% if notes is not empty %}
{# Backwards compatibility with hAtom 0.1 #} {# Backwards compatibility with hAtom 0.1 #}
<main class="feed" tabindex="0" role="feed"> <main class="feed" tabindex="0" role="feed">
<div class="h-feed hfeed notes"> <div class="h-feed hfeed notes">
{% if notes is defined and notes is not empty %}
{% for conversation in notes %} {% for conversation in notes %}
{% block current_note %} {% block current_note %}
{% if conversation is instanceof('array') %} {% if conversation is instanceof('array') %}
@ -47,11 +51,9 @@
<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>
{% endif %}
</div> </div>
</main> </main>
{% endif %}
</section>
{% endif %}
{% endblock body %} {% endblock body %}

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

@ -107,7 +107,6 @@
{% 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">
@ -117,9 +116,6 @@
class="note-url">{{ note.getModified() | ago }}</a> class="note-url">{{ note.getModified() | ago }}</a>
</small> </small>
</div> </div>
{{ block('note_actions') }}
</div>
{% endblock note_info %} {% endblock note_info %}
{% block note_complementary_info %} {% block note_complementary_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">
<div class="note-info">
{{ block('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">
<div class="note-info">
{{ block('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') }}