From 906d704c871edcf1602c06a2ce6ec53df9d9121e Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Tue, 7 Feb 2017 11:24:19 -0500
Subject: [PATCH] Fix a11y issues.

TNL-6440, TNL-6439
---
 setup.py                     |  2 +-
 wiki/forms.py                |  3 +-
 wiki/templates/wiki/dir.html | 84 ++++++++++++++++++------------------
 3 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/setup.py b/setup.py
index 5e362a2fa..9c84b6c5b 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ def build_media_pattern(base_folder, file_extension):
 
 setup(
     name = "django-wiki",
-    version = "0.0.9",
+    version = "0.0.10",
     author = "Benjamin Bach",
     author_email = "benjamin@overtag.dk",
     description = ("A wiki system written for the Django framework."),
diff --git a/wiki/forms.py b/wiki/forms.py
index 6782e18fd..3f6b8c1c6 100644
--- a/wiki/forms.py
+++ b/wiki/forms.py
@@ -362,5 +362,4 @@ class Meta:
 
 class DirFilterForm(forms.Form):
     
-    query = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'Filter...'),
-                                                          'class': 'search-query'}))
+    query = forms.CharField(label=_(u'Filter'), widget=forms.TextInput(attrs={'class': 'search-query'}))
diff --git a/wiki/templates/wiki/dir.html b/wiki/templates/wiki/dir.html
index 3ef7aff8f..0d8b4ebed 100644
--- a/wiki/templates/wiki/dir.html
+++ b/wiki/templates/wiki/dir.html
@@ -22,14 +22,14 @@
       {% trans "Add article" %}
     </a>
   </div>
-  <div class="pull-right">
-    {{ filter_form.query }}
+  <div class="pull-right input-prepend">
+    {{ filter_form.query.label_tag }} {{ filter_form.query }}
+    {% if filter_query %}
+      <div class="pull-right filter-clear">
+        <a href="{{ self_url }}">{% trans "clear" %}</a>
+      </div>
+    {% endif %}
   </div>
-  {% if filter_query %}
-    <div class="pull-right filter-clear">
-      <a href="{{ self_url }}">({% trans "clear" %})</a>
-    </div>
-  {% endif %}
 
   <div class="clearfix"></div>
 </div>
@@ -37,45 +37,47 @@
 
 <p>
   {% with paginator.object_list.count as cnt %}
-    {% blocktrans with urlpath.path as path and cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb %}
-      Browsing <strong><a href="{{ self_url }}">/{{ path }}</a></strong>. There {{ articles_plur_verb }} <strong>{{ cnt }} {{ articles_plur }}</strong> in this level.
-    {% endblocktrans %}
+    {% if filter_query %}
+      {% blocktrans with cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("matches,match") as match_plur %}
+        {{ cnt }} {{ articles_plur }} in this level {{ match_plur }} your search.
+      {% endblocktrans %}
+    {% else %}
+      {% blocktrans with cnt|pluralize:_("article,articles") as articles_plur and cnt|pluralize:_("is,are") as articles_plur_verb %}
+        There {{ articles_plur_verb }} {{ cnt }} {{ articles_plur }} in this level.
+      {% endblocktrans %}
+    {% endif %}
   {% endwith %}
 </p>
 
-<table class="table table-striped">
-  <tr>
-    <th>{% trans "Title" %}</th>
-    <th>{% trans "Slug" %}</th>
-    <th>{% trans "Last modified" %}</th>
-  </tr>
-  {% for urlpath in directory %}
-    <tr>
-      <td>
-        <a href="{% url 'wiki:get' path=urlpath.path %}"> {{ urlpath.article.current_revision.title }} </a> 
-        <a href="{% url 'wiki:dir' path=urlpath.path %}" class="list-children"> › </a>
-        {% if urlpath.article.current_revision.deleted %}
-          <span class="icon-trash"></span>
-        {% endif %}
-        {% if urlpath.article.current_revision.locked %}
-          <span class="icon-lock"></span>
-        {% endif %}
-      </td>
-      <td>
-        {{ urlpath.slug }}
-      </td>
-      <td>
-        {{ urlpath.article.current_revision.created|naturaltime }}
-      </td>
-    </tr>
-    {% empty%}
+{% if directory %}
+  <table class="table table-striped">
     <tr>
-      <td colspan="100">
-        <em>{% trans "There are no articles in this level" %}</em>
-      </td>
+      <th scope="col">{% trans "Title" %}</th>
+      <th scope="col">{% trans "Slug" %}</th>
+      <th scope="col">{% trans "Last modified" %}</th>
     </tr>
-  {% endfor %}
-</table>
+    {% for urlpath in directory %}
+      <tr>
+        <td>
+          <a href="{% url 'wiki:get' path=urlpath.path %}"> {{ urlpath.article.current_revision.title }} </a>
+          <a href="{% url 'wiki:dir' path=urlpath.path %}" class="list-children"> › </a>
+          {% if urlpath.article.current_revision.deleted %}
+            <span class="icon-trash"></span>
+          {% endif %}
+          {% if urlpath.article.current_revision.locked %}
+            <span class="icon-lock"></span>
+          {% endif %}
+        </td>
+        <td>
+          {{ urlpath.slug }}
+        </td>
+        <td>
+          {{ urlpath.article.current_revision.created|naturaltime }}
+        </td>
+      </tr>
+    {% endfor %}
+  </table>
+{% endif %}
 
 {% include "wiki/includes/pagination.html" %}