From 65d730393aab0dfc854a3255d9f14c6177cd964a Mon Sep 17 00:00:00 2001
From: fr33domlover <fr33domlover@riseup.net>
Date: Sat, 19 Oct 2019 11:21:29 +0000
Subject: [PATCH] UI: Display link bar in ticket page; move project page edit
 link to the bar

---
 templates/project/one.hamlet |  6 ++---
 templates/ticket/one.hamlet  | 47 +++++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/templates/project/one.hamlet b/templates/project/one.hamlet
index 69a27db..c2dbec6 100644
--- a/templates/project/one.hamlet
+++ b/templates/project/one.hamlet
@@ -50,12 +50,12 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
         [📖 Wiki]
     $nothing
       [No wiki]
+  <span>
+    <a href=@{ProjectEditR shar proj}>
+      [✏ Edit]
 
 ^{followButton}
 
-<div>
-  <a href=@{ProjectEditR shar proj}>Edit
-
 <h2>Repos
 
 $if null repos
diff --git a/templates/ticket/one.hamlet b/templates/ticket/one.hamlet
index a8d5290..83e1617 100644
--- a/templates/ticket/one.hamlet
+++ b/templates/ticket/one.hamlet
@@ -12,10 +12,30 @@ $# You should have received a copy of the CC0 Public Domain Dedication along
 $# with this software. If not, see
 $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-<p>
-  <a href=@{TicketEditR shar proj num}>Edit this ticket
-<p>
-  ^{buttonW DELETE "Delete this ticket" (TicketR shar proj num)}
+<h2>#{ticketTitle ticket}
+
+<div>
+  Created on #{showDate $ ticketCreated ticket} by
+  ^{sharerLinkFedW author}
+
+<div>
+  <span>
+    <a href=@{TicketParticipantsR shar proj num}>
+      [🐤 Followers]
+  <span>
+    <a href=@{TicketDepsR shar proj num}>
+      [⤴ Dependencies]
+  <span>
+    <a href=@{TicketReverseDepsR shar proj num}>
+      [⤷ Dependants]
+  <span>
+    <a href=@{ClaimRequestsTicketR shar proj num}>
+      [✋ Claim requests]
+  <span>
+    <a href=@{TicketEditR shar proj num}>
+      [✏ Edit]
+
+^{followButton}
 
 <p>
   Depended by:
@@ -39,9 +59,7 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
       <li>
         ^{ticketDepW shar proj t}
 
-<p>
-  Created on #{showDate $ ticketCreated ticket} by
-  ^{sharerLinkFedW author}
+<div>^{desc}
 
 $if ticketStatus ticket /= TSClosed
   <p>
@@ -68,15 +86,6 @@ $if ticketStatus ticket /= TSClosed
       <a href=@{TicketAssignR shar proj num}>Assign to someone else
       .
 
-<p>
-  <a href=@{ClaimRequestsTicketR shar proj num}>Claim requests
-
-<p>
-  <a href=@{TicketDepsR shar proj num}>Dependencies
-
-<p>
-  <a href=@{TicketReverseDepsR shar proj num}>Dependants
-
 <p>
   Status: #
   $case ticketStatus ticket
@@ -96,9 +105,6 @@ $if ticketStatus ticket /= TSClosed
 
       ^{buttonW POST "Reopen this ticket" (TicketOpenR shar proj num)}
 
-<h2>#{ticketTitle ticket}
-
-^{desc}
 
 <h3>Custom fields
 
@@ -129,6 +135,9 @@ $if ticketStatus ticket /= TSClosed
         $else
           (none)
 
+<p>
+  ^{buttonW DELETE "Delete this ticket" (TicketR shar proj num)}
+
 <h3>Discussion
 
 ^{discuss}