First obvious accessibility fixes.

diff --git a/apps/catalogue/templates/catalogue/book_mini_box.html b/apps/catalogue/templates/catalogue/book_mini_box.html
index 731a8d3..9dd5cf0 100755 (executable)
--- a/apps/catalogue/templates/catalogue/book_mini_box.html
+++ b/apps/catalogue/templates/catalogue/book_mini_box.html
@@ -8,14 +8,10 @@
                 {% empty %}
                     {{ book.cover.url }}
                 {% endthumbnail %}
                 {% empty %}
                     {{ book.cover.url }}
                 {% endthumbnail %}

-            " alt="Cover" class="cover" />
+            " alt="{{ author_str }} – {{ book.title }}" class="cover" />

         {% endif %}
         <div class="desc">
         {% endif %}
         <div class="desc">

-            <span class="mono author">
-                {% for name, url in related.tags.author %}
-                    {{ name }}{% if not forloop.last %}, {% endif %}
-                {% endfor %}
-            </span>
+            <span class="mono author">{{ author_str }}</span>

             <span class="title">{{ book.title }}</span>
         </div>
     </a>
             <span class="title">{{ book.title }}</span>
         </div>
     </a>

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 8cf3acf..af9bfae 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -345,9 +345,11 @@ def book_short(context, book):
 
 @register.inclusion_tag('catalogue/book_mini_box.html')
 def book_mini(book):
 
 @register.inclusion_tag('catalogue/book_mini_box.html')
 def book_mini(book):

+    author_str = ", ".join(name
+        for name, url in book.related_info()['tags']['author'])

     return {
         'book': book,
     return {
         'book': book,

-        'related': book.related_info(),
+        'author_str': author_str,

     }
 
 
     }
 
 

diff --git a/apps/wolnelektury_core/templates/main_page.html b/apps/wolnelektury_core/templates/main_page.html
index 6b7c46a..57a442e 100755 (executable)
--- a/apps/wolnelektury_core/templates/main_page.html
+++ b/apps/wolnelektury_core/templates/main_page.html
@@ -60,8 +60,8 @@
             <li><a href="{% url publish_plan %}">{% trans "Publishing plan" %}</a></li>
             <li><a href="{% url api %}">API</a></li>
             <li><a href="{% url oaipmh %}">OAI-PMH</a></li>
             <li><a href="{% url publish_plan %}">{% trans "Publishing plan" %}</a></li>
             <li><a href="{% url api %}">API</a></li>
             <li><a href="{% url oaipmh %}">OAI-PMH</a></li>

-            <li><a href="{% url lesmianator %}">Leśmianator</a></li>
-            <li><a href="http://polski.wolnelektury.pl">Materiały do nauki j. polskiego</a></li>
+            <li><a href="{% url lesmianator %}" lang="pl">Leśmianator</a></li>
+            <li><a href="http://polski.wolnelektury.pl" lang="pl">Materiały do nauki j. polskiego</a></li>

             
         </ul>
     </div>
             
         </ul>
     </div>


@@ -76,11 +76,11 @@
         <div class="social-links">
             <a href="http://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268"
                 title='Wolne Lektury @ Facebook'>
         <div class="social-links">
             <a href="http://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268"
                 title='Wolne Lektury @ Facebook'>

-                <img src="{% static "img/social/f.png" %}" />
+                <img src="{% static "img/social/f.png" %}" alt="Wolne Lektury @ Facebook" />

             </a>
             <a href="http://nk.pl/profile/30441509"
                 title='Wolne Lektury @ NK'>
             </a>
             <a href="http://nk.pl/profile/30441509"
                 title='Wolne Lektury @ NK'>

-                <img src="{% static "img/social/nk.png" %}" />
+                <img src="{% static "img/social/nk.png" %}" alt="Wolne Lektury @ NK.pl" />

             </a>
         </div>
     </div>
             </a>
         </div>
     </div>

diff --git a/apps/wolnelektury_core/templates/superbase.html b/apps/wolnelektury_core/templates/superbase.html
index b0067ac..ac24de3 100644 (file)
--- a/apps/wolnelektury_core/templates/superbase.html
+++ b/apps/wolnelektury_core/templates/superbase.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <!DOCTYPE html>

-<html prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
+<html lang="{{ LANGUAGE_CODE }}" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">

        {% load cache compressed i18n %}
        {% load static from staticfiles %}
     {% load catalogue_tags reporting_stats sponsor_tags %}
        {% load cache compressed i18n %}
        {% load static from staticfiles %}
     {% load catalogue_tags reporting_stats sponsor_tags %}


@@ -42,7 +42,8 @@
         <div id="header-content">
             <div id="logo">
                 <a class="logo" href="/">
         <div id="header-content">
             <div id="logo">
                 <a class="logo" href="/">

-                <img id="logo-image" src="{% static "img/logo-neon.png" %}" /></a>
+                <img id="logo-image" src="{% static "img/logo-neon.png" %}"
+                    alt="Wolne Lektury" /></a>

             </div>
 
             <div id="tagline">
             </div>
 
             <div id="tagline">


@@ -135,6 +136,7 @@
                     {% csrf_token %}
                     <input type="hidden" name="language" value="{{ lang.0 }}" />
                     <button type="submit"
                     {% csrf_token %}
                     <input type="hidden" name="language" value="{{ lang.0 }}" />
                     <button type="submit"

+                        lang="{{ lang.0 }}"

                         class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} mono"
                         >{{ lang.1 }}</button>
                    </form>
                         class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} mono"
                         >{{ lang.1 }}</button>
                    </form>