From 5b94973079729e5baefd6ce32c16f0f5e9589f54 Mon Sep 17 00:00:00 2001
From: Eliseu Amaro <mail@eliseuama.ro>
Date: Tue, 15 Feb 2022 12:36:45 +0000
Subject: [PATCH] [COMPONENTS][Posting] Form is no longer added to RightPanel
 if not on a feed|conversation|groups route

---
 components/Group/templates/group/view.html.twig |  6 +-----
 components/Posting/Posting.php                  |  8 ++++----
 .../templates/right_panel/view.html.twig        |  2 +-
 public/assets/default_theme/pages/feeds.css     | 17 +++++++++++++++++
 templates/cards/macros/note.html.twig           | 11 +++++------
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/components/Group/templates/group/view.html.twig b/components/Group/templates/group/view.html.twig
index 47a551d480..7bd30b2db8 100644
--- a/components/Group/templates/group/view.html.twig
+++ b/components/Group/templates/group/view.html.twig
@@ -19,11 +19,7 @@
         {% if notes is defined %}
             <article>
                 <header class="feed-header">
-                    {% if page_title is defined %}
-                        <h1 class="heading-no-margin">{{ page_title | trans }}</h1>
-                    {% else %}
-                        <h1 class="heading-no-margin">{{ 'Notes' | trans }}</h1>
-                    {% endif %}
+                    <h1 class="section-title">{{ 'Notes' | trans }}</h1>
                     <nav class="feed-actions">
                         <details class="feed-actions-details">
                             <summary>
diff --git a/components/Posting/Posting.php b/components/Posting/Posting.php
index 6b2a8a0243..3a76381e4f 100644
--- a/components/Posting/Posting.php
+++ b/components/Posting/Posting.php
@@ -73,7 +73,7 @@ class Posting extends Component
      */
     public function onAddMainRightPanelBlock(Request $request, array &$res): bool
     {
-        if (\is_null($user = Common::user())) {
+        if (\is_null($user = Common::user()) || preg_match('(feed|conversation|group)', $request->get('_route')) === 0) {
             return Event::next;
         }
 
@@ -100,9 +100,9 @@ class Posting extends Component
         $form_params = [];
         if (!empty($in_targets)) { // @phpstan-ignore-line
             // Add "none" option to the first of choices
-            $in_targets    = array_merge([_m('Public') => 'public'], $in_targets);
+            $in_targets = array_merge([_m('Public') => 'public'], $in_targets);
             // Make the context actor the first In target option
-            if (!is_null($context_actor)) {
+            if (!\is_null($context_actor)) {
                 foreach ($in_targets as $it_nick => $it_id) {
                     if ($it_id === $context_actor->getId()) {
                         unset($in_targets[$it_nick]);
@@ -119,7 +119,7 @@ class Posting extends Component
             _m('Local')     => VisibilityScope::LOCAL->value,
             _m('Addressee') => VisibilityScope::ADDRESSEE->value,
         ];
-        if (!is_null($context_actor) && $context_actor->isGroup()) {
+        if (!\is_null($context_actor) && $context_actor->isGroup()) {
             if ($actor->canModerate($context_actor)) {
                 if ($context_actor->getRoles() & ActorLocalRoles::PRIVATE_GROUP) {
                     $visibility_options = array_merge([_m('Group') => VisibilityScope::GROUP->value], $visibility_options);
diff --git a/components/RightPanel/templates/right_panel/view.html.twig b/components/RightPanel/templates/right_panel/view.html.twig
index e125fb72cd..791f60ccef 100644
--- a/components/RightPanel/templates/right_panel/view.html.twig
+++ b/components/RightPanel/templates/right_panel/view.html.twig
@@ -53,7 +53,7 @@
             </summary>
 
             {% for block in extra %}
-                <section class="frame-section-padding">
+                <section class="posting-extra frame-section-padding">
                     {{ block | raw }}
                 </section>
             {% endfor %}
diff --git a/public/assets/default_theme/pages/feeds.css b/public/assets/default_theme/pages/feeds.css
index 13ab5ef637..430ce37bbc 100644
--- a/public/assets/default_theme/pages/feeds.css
+++ b/public/assets/default_theme/pages/feeds.css
@@ -406,6 +406,23 @@ embed header {
     flex: 1;
 }
 
+.posting-extra .h-entry {
+    padding-left: var(--s);
+    padding-right: var(--s);
+}
+
+.posting-extra .note-sidebar {
+    all: unset;
+}
+
+.posting-extra .note-sidebar .avatar {
+    all: unset;
+    max-width: 1em;
+    max-height: 1em;
+    min-width: 1em;
+    margin-right: 4px;
+}
+
 @media only screen and (max-width: 1280px) {
     .note-sidebar {
         max-width: min-content !important;
diff --git a/templates/cards/macros/note.html.twig b/templates/cards/macros/note.html.twig
index 3f5d1a0004..6e3f9d83bf 100644
--- a/templates/cards/macros/note.html.twig
+++ b/templates/cards/macros/note.html.twig
@@ -52,17 +52,16 @@
     <article
             tabindex="0"
             title="{{'A note by actor' | trans}} {{ nickname }}"
+            id="{{ 'note-compact-anchor-' ~ note.getId() }}"
             class="h-entry hentry note"
-            lang={{ note.getLanguageLocale() }}>
-        {{ block('note_sidebar', 'cards/blocks/note.html.twig') }}
+            lang="{{ note.getLanguageLocale() }}">
         <div class="note-wrapper">
             <header class="note-info">
-                <div class="note-info-start">
-                    {{ block('note_author', 'cards/blocks/note.html.twig') }}
-                </div>
+                {{ block('note_sidebar', 'cards/blocks/note.html.twig') }}
+                {{ block('note_author', 'cards/blocks/note.html.twig') }}
             </header>
 
-            <section role="dialog" class="e-content entry-content note-content">
+            <section class="e-content entry-content note-content" title="{{ 'Note\'s main content' | trans }}">
                 <small class="note-conversation-info">
                     <a href="{{ note.getConversationUrl() }}"
                        class="note-conversation-url">{{ 'in conversation' | trans }}</a>