fix #377 -- make default themes more accessible

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jun 6, 2015 · c60d3ec · c60d3ec
1 parent 5177570
commit c60d3ec
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git 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
@@ -36,15 +36,15 @@
             <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 %}
             {% endfor %}
             </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
@@ -36,15 +36,15 @@
             <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
             %endfor
             </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
@@ -136,15 +136,15 @@ 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 %}
             {% endfor %}
             </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
@@ -136,15 +136,15 @@ 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
             %endfor
             </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
@@ -129,19 +129,19 @@ 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 %}
             {% endfor %}
             </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
@@ -133,15 +133,15 @@ 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
             %endfor
             </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
@@ -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)"