Fix a11y issues.

TNL-6440, TNL-6439

setup.py

@@ -29,7 +29,7 @@ package_data = dict(
 
 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."),

wiki/forms.py

@@ -362,5 +362,4 @@ class PermissionsForm(PluginSettingsFormMixin, forms.ModelForm):
 
 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'}))

wiki/templates/wiki/dir.html

@@ -22,14 +22,14 @@
       {% trans "Add article" %}
     </a>
   </div>
-  <div class="pull-right">
-    {{ filter_form.query }}
-  </div>
+  <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>
+        <a href="{{ self_url }}">{% trans "clear" %}</a>
       </div>
     {% endif %}
+  </div>
 
   <div class="clearfix"></div>
 </div>
@@ -37,17 +37,24 @@
 
 <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.
+    {% 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">
+{% if directory %}
+  <table class="table table-striped">
     <tr>
-    <th>{% trans "Title" %}</th>
-    <th>{% trans "Slug" %}</th>
-    <th>{% trans "Last modified" %}</th>
+      <th scope="col">{% trans "Title" %}</th>
+      <th scope="col">{% trans "Slug" %}</th>
+      <th scope="col">{% trans "Last modified" %}</th>
     </tr>
     {% for urlpath in directory %}
       <tr>
@@ -68,14 +75,9 @@
           {{ urlpath.article.current_revision.created|naturaltime }}
         </td>
       </tr>
-    {% empty%}
-    <tr>
-      <td colspan="100">
-        <em>{% trans "There are no articles in this level" %}</em>
-      </td>
-    </tr>
     {% endfor %}
-</table>
+  </table>
+{% endif %}
 
 {% include "wiki/includes/pagination.html" %}