forked from GNUsocial/gnu-social
		
	[UI][TWIG] Small UI cleanup and change twig 'active' function to check for starts with, rather than equals
This commit is contained in:
		@@ -49,9 +49,6 @@ class NetworkPublic extends Controller
 | 
				
			|||||||
            );
 | 
					            );
 | 
				
			||||||
            $attachments[] = $a;
 | 
					            $attachments[] = $a;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if ($notes === []) {
 | 
					 | 
				
			||||||
            $notes = null;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
        return [
 | 
					        return [
 | 
				
			||||||
            '_template'   => 'network/public.html.twig',
 | 
					            '_template'   => 'network/public.html.twig',
 | 
				
			||||||
            'notes'       => $notes,
 | 
					            'notes'       => $notes,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,6 +30,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
namespace App\Twig;
 | 
					namespace App\Twig;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					use App\Util\Formatting;
 | 
				
			||||||
use Functional as F;
 | 
					use Functional as F;
 | 
				
			||||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 | 
					use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 | 
				
			||||||
use Symfony\Component\HttpFoundation\Request;
 | 
					use Symfony\Component\HttpFoundation\Request;
 | 
				
			||||||
@@ -52,7 +53,7 @@ class Runtime implements RuntimeExtensionInterface, EventSubscriberInterface
 | 
				
			|||||||
    public function isCurrentRoute(string $class, string ...$routes): string
 | 
					    public function isCurrentRoute(string $class, string ...$routes): string
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $current_route = $this->request->attributes->get('_route');
 | 
					        $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 : '';
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // ----------------------------------------------------------
 | 
					    // ----------------------------------------------------------
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,7 +30,7 @@
 | 
				
			|||||||
                          <a href='#'><i> #{{ tag }} </i></a>
 | 
					                          <a href='#'><i> #{{ tag }} </i></a>
 | 
				
			||||||
                        {% endfor %}
 | 
					                        {% endfor %}
 | 
				
			||||||
                      {% else %}
 | 
					                      {% else %}
 | 
				
			||||||
                        <i> {{ '(None)' | trans }} </i>
 | 
					                        <i> {{ '(No tags)' | trans }} </i>
 | 
				
			||||||
                      {% endif %}
 | 
					                      {% endif %}
 | 
				
			||||||
                    </div>
 | 
					                    </div>
 | 
				
			||||||
                    <div class="stats">
 | 
					                    <div class="stats">
 | 
				
			||||||
@@ -46,7 +46,7 @@
 | 
				
			|||||||
              <a href='#'>Replies</a>
 | 
					              <a href='#'>Replies</a>
 | 
				
			||||||
              <a href='#'>Favourites</a>
 | 
					              <a href='#'>Favourites</a>
 | 
				
			||||||
              <a href='#'>Reverse Favs</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>
 | 
					              <a href='#'>Logout</a>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
          <div class="footer">
 | 
					          <div class="footer">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -59,7 +59,7 @@
 | 
				
			|||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
        <div class="timeline-nav">
 | 
					        <div class="timeline-nav">
 | 
				
			||||||
          <div class="notes">
 | 
					          <div class="notes">
 | 
				
			||||||
            {% if notes is defined %}
 | 
					            {% if notes is defined and notes is not empty %}
 | 
				
			||||||
              {% for note in notes %}
 | 
					              {% for note in notes %}
 | 
				
			||||||
                <div>
 | 
					                <div>
 | 
				
			||||||
                  <img src="{{ note.getAvatarUrl() }}" alt="{{ note.getActorNickname() }}'s avatar" width="64px">
 | 
					                  <img src="{{ note.getAvatarUrl() }}" alt="{{ note.getActorNickname() }}'s avatar" width="64px">
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user