From c60d3ec9e61647b1dcee4e258557d1dae0d07ef1 Mon Sep 17 00:00:00 2001
From: Chris Warrick <kwpolska@gmail.com>
Date: Sat, 6 Jun 2015 14:07:55 +0200
Subject: [PATCH] fix #377 -- make default themes more accessible

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
---
 CHANGES.txt                                                 | 1 +
 nikola/data/themes/base-jinja/templates/base_header.tmpl    | 4 ++--
 nikola/data/themes/base/templates/base_header.tmpl          | 4 ++--
 .../data/themes/bootstrap-jinja/templates/base_helper.tmpl  | 4 ++--
 nikola/data/themes/bootstrap/templates/base_helper.tmpl     | 4 ++--
 .../data/themes/bootstrap3-jinja/templates/base_helper.tmpl | 6 +++---
 nikola/data/themes/bootstrap3/templates/base_helper.tmpl    | 4 ++--
 translations/nikola.messages/en.po                          | 4 ++++
 8 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 38c54abd09..47305fd48b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ New in master
 Features
 --------
 
+* Make default themes more accessible (Issue #377)
 * Add ipython support to the default themes (Issue #1782)
 * Automatically mark ipynb posts/pages as requiring mathjax (Issue #1782)
 * New --get-path option for ``nikola install_theme`` (Issue #1762)
diff --git a/nikola/data/themes/base-jinja/templates/base_header.tmpl b/nikola/data/themes/base-jinja/templates/base_header.tmpl
index a8ed7b3921..5abe2df3c6 100644
--- a/nikola/data/themes/base-jinja/templates/base_header.tmpl
+++ b/nikola/data/themes/base-jinja/templates/base_header.tmpl
@@ -36,7 +36,7 @@
             <ul>
             {% for suburl, text in url %}
                 {% if rel_link(permalink, suburl) == "#" %}
-                    <li class="active"><a href="{{ permalink }}">{{ text }}</a></li>
+                    <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", langname) }}</span></a></li>
                 {% else %}
                     <li><a href="{{ suburl }}">{{ text }}</a></li>
                 {% endif %}
@@ -44,7 +44,7 @@
             </ul>
         {% else %}
             {% if rel_link(permalink, url) == "#" %}
-                <li class="active"><a href="{{ permalink }}">{{ text }}</a></li>
+                <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", langname) }}</span></a></li>
             {% else %}
                 <li><a href="{{ url }}">{{ text }}</a></li>
             {% endif %}
diff --git a/nikola/data/themes/base/templates/base_header.tmpl b/nikola/data/themes/base/templates/base_header.tmpl
index e44d598a3c..8b175929d8 100644
--- a/nikola/data/themes/base/templates/base_header.tmpl
+++ b/nikola/data/themes/base/templates/base_header.tmpl
@@ -36,7 +36,7 @@
             <ul>
             %for suburl, text in url:
                 % if rel_link(permalink, suburl) == "#":
-                    <li class="active"><a href="${permalink}">${text}</a></li>
+                    <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", langname)}</span></a></li>
                 %else:
                     <li><a href="${suburl}">${text}</a></li>
                 %endif
@@ -44,7 +44,7 @@
             </ul>
         % else:
             % if rel_link(permalink, url) == "#":
-                <li class="active"><a href="${permalink}">${text}</a></li>
+                <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", langname)}</span></a></li>
             %else:
                 <li><a href="${url}">${text}</a></li>
             %endif
diff --git a/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl
index f6be7da861..672a49eb08 100644
--- a/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl
@@ -136,7 +136,7 @@ lang="{{ lang }}">
             <ul class="dropdown-menu">
             {% for suburl, text in url %}
                 {% if rel_link(permalink, suburl) == "#" %}
-                    <li class="active"><a href="{{ permalink }}">{{ text }}</a>
+                    <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", langname) }}</span></a>
                 {% else %}
                     <li><a href="{{ suburl }}">{{ text }}</a>
                 {% endif %}
@@ -144,7 +144,7 @@ lang="{{ lang }}">
             </ul>
         {% else %}
             {% if rel_link(permalink, url) == "#" %}
-                <li class="active"><a href="{{ permalink }}">{{ text }}</a>
+                <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", langname) }}</span></a>
             {% else %}
                 <li><a href="{{ url }}">{{ text }}</a>
             {% endif %}
diff --git a/nikola/data/themes/bootstrap/templates/base_helper.tmpl b/nikola/data/themes/bootstrap/templates/base_helper.tmpl
index d9036df2b9..35f4b50729 100644
--- a/nikola/data/themes/bootstrap/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap/templates/base_helper.tmpl
@@ -136,7 +136,7 @@ lang="${lang}">
             <ul class="dropdown-menu">
             %for suburl, text in url:
                 % if rel_link(permalink, suburl) == "#":
-                    <li class="active"><a href="${permalink}">${text}</a>
+                    <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", langname)}</span></a>
                 %else:
                     <li><a href="${suburl}">${text}</a>
                 %endif
@@ -144,7 +144,7 @@ lang="${lang}">
             </ul>
         % else:
             % if rel_link(permalink, url) == "#":
-                <li class="active"><a href="${permalink}">${text}</a>
+                <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", langname)}</span></a>
             %else:
                 <li><a href="${url}">${text}</a>
             %endif
diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
index 2812e1d064..9919feecd1 100644
--- a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
@@ -129,11 +129,11 @@ lang="{{ lang }}">
 {% macro html_navigation_links() %}
     {% for url, text in navigation_links[lang] %}
         {% if isinstance(url, tuple) %}
-            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ text }}<b class="caret"></b></a>
+            <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ text }} <b class="caret"></b></a>
             <ul class="dropdown-menu">
             {% for suburl, text in url %}
                 {% if rel_link(permalink, suburl) == "#" %}
-                    <li class="active"><a href="{{ permalink }}">{{ text }}</a>
+                    <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", langname) }}</span></a>
                 {% else %}
                     <li><a href="{{ suburl }}">{{ text }}</a>
                 {% endif %}
@@ -141,7 +141,7 @@ lang="{{ lang }}">
             </ul>
         {% else %}
             {% if rel_link(permalink, url) == "#" %}
-                <li class="active"><a href="{{ permalink }}">{{ text }}</a>
+                <li class="active"><a href="{{ permalink }}">{{ text }} <span class="sr-only">{{ messages("(active)", langname) }}</span></a>
             {% else %}
                 <li><a href="{{ url }}">{{ text }}</a>
             {% endif %}
diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
index 3ded8ad8e8..ed0fadff92 100644
--- a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -133,7 +133,7 @@ lang="${lang}">
             <ul class="dropdown-menu">
             %for suburl, text in url:
                 % if rel_link(permalink, suburl) == "#":
-                    <li class="active"><a href="${permalink}">${text}<span class="sr-only"> (active)</span></a>
+                    <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", langname)}</span></a>
                 %else:
                     <li><a href="${suburl}">${text}</a>
                 %endif
@@ -141,7 +141,7 @@ lang="${lang}">
             </ul>
         % else:
             % if rel_link(permalink, url) == "#":
-                <li class="active"><a href="${permalink}">${text}<span class="sr-only"> (active)</span></a>
+                <li class="active"><a href="${permalink}">${text} <span class="sr-only">${messages("(active)", langname)}</span></a>
             %else:
                 <li><a href="${url}">${text}</a>
             %endif
diff --git a/translations/nikola.messages/en.po b/translations/nikola.messages/en.po
index 1d164ae682..056bda643b 100644
--- a/translations/nikola.messages/en.po
+++ b/translations/nikola.messages/en.po
@@ -118,3 +118,7 @@ msgstr "Skip to main content"
 
 msgid "Subcategories:"
 msgstr "Subcategories:"
+
+#. Used for active navigation links, for screen readers only
+msgid "(active)"
+msgstr "(active)"