From 38cfec8593e372daafee9aec39338cdee41e1e11 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@fc.up.pt>
Date: Fri, 21 Aug 2020 15:32:14 +0000
Subject: [PATCH] [UI][TWIG] Small UI cleanup and change twig 'active' function
 to check for starts with, rather than equals

---
 src/Controller/NetworkPublic.php   | 3 ---
 src/Twig/Runtime.php               | 3 ++-
 templates/left/left.html.twig      | 4 ++--
 templates/network/public.html.twig | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Controller/NetworkPublic.php b/src/Controller/NetworkPublic.php
index 8d27b3e13c..88783eb8fa 100644
--- a/src/Controller/NetworkPublic.php
+++ b/src/Controller/NetworkPublic.php
@@ -49,9 +49,6 @@ class NetworkPublic extends Controller
             );
             $attachments[] = $a;
         }
-        if ($notes === []) {
-            $notes = null;
-        }
         return [
             '_template'   => 'network/public.html.twig',
             'notes'       => $notes,
diff --git a/src/Twig/Runtime.php b/src/Twig/Runtime.php
index 48b5c94d6e..6733170561 100644
--- a/src/Twig/Runtime.php
+++ b/src/Twig/Runtime.php
@@ -30,6 +30,7 @@
 
 namespace App\Twig;
 
+use App\Util\Formatting;
 use Functional as F;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -52,7 +53,7 @@ class Runtime implements RuntimeExtensionInterface, EventSubscriberInterface
     public function isCurrentRoute(string $class, string ...$routes): string
     {
         $current_route = $this->request->attributes->get('_route');
-        return F\some($routes, F\equal($current_route)) ? $class : '';
+        return F\some($routes, F\partial_left([Formatting::class, 'startsWith'], $current_route)) ? $class : '';
     }
 
     // ----------------------------------------------------------
diff --git a/templates/left/left.html.twig b/templates/left/left.html.twig
index c82be54b33..be8dc75cff 100644
--- a/templates/left/left.html.twig
+++ b/templates/left/left.html.twig
@@ -30,7 +30,7 @@
                           <a href='#'><i> #{{ tag }} </i></a>
                         {% endfor %}
                       {% else %}
-                        <i> {{ '(None)' | trans }} </i>
+                        <i> {{ '(No tags)' | trans }} </i>
                       {% endif %}
                     </div>
                     <div class="stats">
@@ -46,7 +46,7 @@
               <a href='#'>Replies</a>
               <a href='#'>Favourites</a>
               <a href='#'>Reverse Favs</a>
-              <a href="{{ path('settings_personal_info') }}" class='hover-effect {% if app.request.attributes.get('_route') starts with 'settings_' %}active{% endif %}'>Settings</a>
+              <a href="{{ path('settings_personal_info') }}" class='hover-effect {{ active('settings_') }}'>Settings</a>
               <a href='#'>Logout</a>
           </div>
           <div class="footer">
diff --git a/templates/network/public.html.twig b/templates/network/public.html.twig
index c59ad26c17..05f29a940e 100644
--- a/templates/network/public.html.twig
+++ b/templates/network/public.html.twig
@@ -59,7 +59,7 @@
         {% endif %}
         <div class="timeline-nav">
           <div class="notes">
-            {% if notes is defined %}
+            {% if notes is defined and notes is not empty %}
               {% for note in notes %}
                 <div>
                   <img src="{{ note.getAvatarUrl() }}" alt="{{ note.getActorNickname() }}'s avatar" width="64px">