Clean up titles on profile subpages

gratipay · Nov 17, 2014 · f767617 · f767617
1 parent 1323b1a
commit f767617
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 22 deletions.
diff --git a/scss/responsiveness.scss b/scss/responsiveness.scss
@@ -141,14 +141,6 @@
         font-size: 14px;
     }
 
-    #hero {
-        font-size: 15px;
-        h1 {
-            font-size: 36px;
-            padding: 36px 0 18px;
-        }
-    }
-
     .homepage {
         span { white-space: normal; }
         display: block;

diff --git a/templates/base.html b/templates/base.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
     {% block head_early %}{% endblock %}
-    <title>{% if title %}{{ title|e }} - {% endif %}Gratipay</title>
+    <title>{% if title %}{% if subhead %}{{ subhead|e }} - {% endif %}{{ title|e }} - {% endif %}Gratipay</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="{{ website.asset('gratipay.css') }}" type="text/css">
     <link rel="apple-touch-icon-precomposed" href="{{ website.asset('touch/icon-60x60.png') }}">

diff --git a/www/%username/account/close.spt b/www/%username/account/close.spt
@@ -1,8 +1,8 @@
 from gratipay.utils import get_participant
 [---]
 participant = get_participant(request, restrict=True)
-hero = "Close Account"
 title = participant.username      # used in the title tag
+subhead = _("Close Account")
 username = participant.username   # used in footer shared with on/$platform/
                                   # pages
 

diff --git a/www/%username/account/index.html.spt b/www/%username/account/index.html.spt
@@ -5,8 +5,8 @@ from cgi import escape
 [-----------------------------------------------------------------------------]
 
 participant = get_participant(request, restrict=True)
-hero = _("Account")
-title = participant.username      # used in the title tag
+title = participant.username
+subhead = _("Account")
 username = participant.username   # used in footer shared with on/$platform/
                                   # pages
 locked = False

diff --git a/www/%username/events/index.html.spt b/www/%username/events/index.html.spt
@@ -5,8 +5,8 @@ db = website.db
 [-----------------------------------------------------------------------------]
 
 participant = get_participant(request, restrict=True)
-hero = "Events"
-title = "%s - %s" % (participant.username, hero)
+title = participant.username
+subhead = "Events"
 locked = False
 
 SQL = """

diff --git a/www/%username/giving/index.html.spt b/www/%username/giving/index.html.spt
@@ -5,8 +5,8 @@ from gratipay.utils import get_participant
 participant = get_participant(request, restrict=True)
 tips, total, unclaimed_tips, unclaimed_total = \
                                            participant.get_giving_for_profile()
-hero = _("Giving")
-title = "%s - %s" % (participant.username, hero)
+title = participant.username
+subhead = "Giving"
 locked = False
 cancelled_tips = [x for x in tips if x.amount == 0][:10]
 ncancelled_tips = len(cancelled_tips)

diff --git a/www/%username/history/index.html.spt b/www/%username/history/index.html.spt
@@ -5,8 +5,8 @@ from gratipay.utils.history import iter_payday_events
 
 participant = get_participant(request, restrict=True)
 events = iter_payday_events(website.db, participant)
-hero = _("History")
-title = "%s - %s" % (participant.username, hero)
+title = participant.username
+subhead = _("History")
 locked = False
 subpath = 'history/' if user.ADMIN else ''
 admin_override = user.ADMIN and (participant != user.participant or 'override' in qs)

diff --git a/www/%username/index.html.spt b/www/%username/index.html.spt
@@ -16,7 +16,6 @@ def _clip(text, n):
 participant = get_participant(request, restrict=False)
 locked = False
 tip_or_pledge = "tip"
-hero = _("Profile")
 title = participant.username      # used in the title tag
 username = participant.username   # used in footer shared with on/$platform/
                                   # pages

diff --git a/www/%username/members/index.html.spt b/www/%username/members/index.html.spt
@@ -9,8 +9,8 @@ if not team.show_as_team(user):
   request.redirect('../')
 locked = False
 tip_or_pledge = "tip"
-hero = _("Team Members")
 title = team.username     # used in the title tag
+subhead = _("Team Members")
 username = team.username  # used in footer shared with on/%platform/ pages
 
 [-----------------------------------------------------------------------------]

diff --git a/www/%username/widgets/index.html.spt b/www/%username/widgets/index.html.spt
@@ -3,8 +3,8 @@ from gratipay.utils import get_participant
 [-----------------------------------------------------------------------------]
 
 participant = get_participant(request, restrict=True)
-hero = _("Widgets")
-title = "%s - %s" % (participant.username, hero)
+title = participant.username
+subhead = _("Widgets")
 locked = False
 
 [-----------------------------------------------------------------------------]