Clean up ~user nav/subnav

gratipay · Aug 22, 2015 · c81a15d · c81a15d
1 parent 846d85e
commit c81a15d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/templates/base.html b/templates/base.html
@@ -42,7 +42,10 @@ <h1><a href="/"><img src="{{ website.asset('gratipay.svg') }}"
             {% else %}
             <ul class="nav you-are">
                 <li>
-                    <a href="/"{% if request.path.raw == '/' or request.path.raw.split('/')[1] == user.participant.username  %} class="selected"{% endif %}>
+                    {% set parts = request.path.raw.split('/') %}
+                    {% set on_profile = parts[1] == '~' %}
+                    {% set on_own_profile = on_profile and parts[2] == user.participant.username %}
+                    <a href="/~{{user.participant.username}}/"{% if on_own_profile %} class="selected"{% endif %}>
                         {{ user.participant.username }}
                         <div class="quick-stats">
                             <span class="my-total-giving">{{ format_currency(user.participant.get_giving_for_profile()[1], "USD") }}</span>/{{ _("wk") }}

diff --git a/templates/profile-subnav.html b/templates/profile-subnav.html
@@ -1,15 +1,13 @@
 {% set current_page = '/' if request.path.raw == '/' else '/~' + request.path.raw[3:] %}
 {% set show_members = participant.show_as_team(user) %}
-{% set show_dashboard = (user.participant == participant) %}
 {% set show_receiving = (user.participant == participant or not participant.anonymous_receiving) %}
 {% set show_profile = show_members or show_receiving %}
 {% set u = participant.username %}
-{% set pages = [ ('/',                  _('Dashboard'), True,           False)
-               , ('/~'+u+'/',           _('Profile'),   True,           show_profile)
-               , ('/~'+u+'/giving/', _('Giving'), True,   False)
-               , ('/~'+u+'/history/',   _('History'),   True,           False)
-               , ('/~'+u+'/settings/',  _('Settings'),  True,           False)
-               , ('/~'+u+'/events/',    _('Events'),    False,          False)
+{% set pages = [ ('/~'+u+'/',           _('Profile'),   True,   show_profile)
+               , ('/~'+u+'/giving/',    _('Giving'),    True,   False)
+               , ('/~'+u+'/history/',   _('History'),   True,   False)
+               , ('/~'+u+'/settings/',  _('Settings'),  True,   False)
+               , ('/~'+u+'/events/',    _('Events'),    False,  False)
                 ] %}
 {% set pages = filter_profile_subnav(user, participant, pages) %}
 {% if pages %}