From 177636a08a43ae4cd143372b1b989d7ecf381149 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Wed, 17 Aug 2022 04:36:38 +0000
Subject: [PATCH] Show time on end

FossilOrigin-Name: e046337361a5fdbbd1c822c965126d133e88266c6907699bca16fae7f885752b
---
 dist/treebird.css   |  5 ++-
 templates/status.tt | 82 ++++++++++++++++++++++++---------------------
 2 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/dist/treebird.css b/dist/treebird.css
index f54f6e5..7253f15 100644
--- a/dist/treebird.css
+++ b/dist/treebird.css
@@ -317,7 +317,6 @@ table.ui-table td
     font-size: 11px;
 }
 
-
 #navbar .search-menu-dropdown svg
 {
     stroke: #606060;
@@ -2266,6 +2265,10 @@ input[type=checkbox].hidden:not(:checked) + .list-edit-content
 }
 
 /* MENUS */
+
+/* Transition animations are possible with dropdown menus, e.g. fade, if you use 
+ * visibility: visible; instead of display:block; (and their counter values)
+ * but some things seemed buggy like the search dropdown, so try with care */
 .menu-container:hover .menu,
 .menu-container:hover + .menu
 {
diff --git a/templates/status.tt b/templates/status.tt
index 9b459f3..dae5da6 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -46,50 +46,56 @@
                         <a class="instance-info" href="$prefix/@[% status.account.acct %]">[% status.account.acct %]</a>
                     [% END %]
                     <span class="alignend">
-                        <div class="menu-container status-visibility">
-                            [% vis_to_icon(status.visibility) %]
-                            <div class="menu">
-                                [% IF notif %]
+                        [% UNLESS notif && compact && interacted_with %]
+                            
+                            <div class="menu-container status-visibility">
+                                [% vis_to_icon(status.visibility) %]
+                                <div class="menu">
+                                    [% IF notif %]
+                                        <ul>
+                                            <li>
+                                                <a href="$prefix/notification/[% notif.id %]/read" class="btn-menu">Mark as read</a>
+                                            </li>
+                                            <li>
+                                                <a href="$prefix/notification/[% notif.id %]/delete" class="btn-menu">Clear notification</a>
+                                            </li>
+                                        </ul>
+                                    [% END %]
                                     <ul>
                                         <li>
-                                            <a href="$prefix/notification/[% notif.id %]/read" class="btn-menu">Mark as read</a>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="mute">
+                                                <input type="submit" class="btn-menu" value="Mute">
+                                            </form>
                                         </li>
                                         <li>
-                                            <a href="$prefix/notification/[% notif.id %]/delete" class="btn-menu">Clear notification</a>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="bookmark">
+                                                <input type="submit" class="btn-menu" value="Bookmark">
+                                            </form>
+                                        </li>
+                                        [%# pin %]
+                                        <li>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="pin">
+                                                <input type="submit" class="btn-menu" value="Pin">
+                                            </form>
+                                        </li>
+                                        [%# Delete %]
+                                        <li>
+                                            <form action="$prefix/status/[% status.id %]/interact" method="post">
+                                                <input type="hidden" name="itype" value="delete">
+                                                <input type="submit" class="btn-menu" value="Delete status">
+                                            </form>
                                         </li>
-                                    </ul>
-                                [% END %]
-                                <ul>
-                                    <li>
-                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                            <input type="hidden" name="itype" value="mute">
-                                            <input type="submit" class="btn-menu" value="Mute">
-                                        </form>
-                                    </li>
-                                    <li>
-                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                            <input type="hidden" name="itype" value="bookmark">
-                                            <input type="submit" class="btn-menu" value="Bookmark">
-                                        </form>
-                                    </li>
-                                    [%# pin %]
-                                    <li>
-                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                            <input type="hidden" name="itype" value="pin">
-                                            <input type="submit" class="btn-menu" value="Pin">
-                                        </form>
-                                    </li>
-                                    [%# Delete %]
-                                    <li>
-                                        <form action="$prefix/status/[% status.id %]/interact" method="post">
-                                            <input type="hidden" name="itype" value="delete">
-                                            <input type="submit" class="btn-menu" value="Delete status">
-                                        </form>
-                                    </li>
 
-                                </ul>
+                                    </ul>
+                                </div>
                             </div>
-                        </div>
+                        [% ELSE %]
+                            <span class="time">[% rel_to_str(notif.created_at) %]</span>
+                        [% END %]
+                           
                         [% UNLESS compact %]
                             <label for="status-toggle-[% status.id %]-[% unique_toggle_id %]" class="status-view"></label>
                         [% END %]
@@ -97,7 +103,7 @@
                 </div>
                 <div class="status-data">
                     [%# Note: The id may actually (99.5% of the time) be the acct %]
-                    [% IF status.in_reply_to_id %]
+                    [% IF status.in_reply_to_id && !(compact && interacted_with) %]
                         <span class="in-reply-to">
                             <svg class="in-reply-to-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 9l6 6-6 6"/><path d="M4 4v7a4 4 0 0 0 4 4h11"/></svg> <a class="in-reply-to-id" href="$prefix/status/[% status.in_reply_to_id %]#[% status.in_reply_to_id %]"> [% UNLESS compact %]<span class="in-reply-to-text">In reply to</span>[% END %] <span class="acct">[% status.pleroma.in_reply_to_account_acct || status.in_reply_to_account_id %]</span></a>
                         </span>