Notes dictionary: language names.

[wolnelektury.git] / apps / dictionary / templates / dictionary / note_list.html

diff --git a/apps/dictionary/templates/dictionary/note_list.html b/apps/dictionary/templates/dictionary/note_list.html
index 5109454..9428655 100755 (executable)
--- a/apps/dictionary/templates/dictionary/note_list.html
+++ b/apps/dictionary/templates/dictionary/note_list.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n pagination_tags %}
 {% extends "base.html" %}
 {% load i18n pagination_tags %}

+{% load set_get from set_get %}

 
 
 {% block bodyid %}footnotes{% endblock %}
 
 
 {% block bodyid %}footnotes{% endblock %}


@@ -15,7 +16,7 @@
 <p>
 {% trans "By first letter" %}:
 {% if letter %}
 <p>
 {% trans "By first letter" %}:
 {% if letter %}

-    <a href='?'>{% trans "all" %}</a>
+    <a href='?{% set_get "page" "ltr" %}'>{% trans "all" %}</a>

 {% else %}
     <strong>{% trans "all" %}</strong>
 {% endif %}
 {% else %}
     <strong>{% trans "all" %}</strong>
 {% endif %}


@@ -25,7 +26,7 @@
     {% if let == letter %}
         <strong>{{ let|upper }}</strong>
     {% else %}
     {% if let == letter %}
         <strong>{{ let|upper }}</strong>
     {% else %}

-        <a href='?ltr={{ let }}'>{{ let|upper }}</a>
+        <a href='?{% set_get "page" ltr=let %}'>{{ let|upper }}</a>

     {% endif %}
 {% endfor %}
 </p>
     {% endif %}
 {% endfor %}
 </p>


@@ -33,17 +34,17 @@
 <p>
 {% trans "By type" %}:
 {% if fn_type %}
 <p>
 {% trans "By type" %}:
 {% if fn_type %}

-    <a href='?'>{% trans "all" %}</a>
+    <a href='?{% set_get "page" "type" %}'>{% trans "all" %}</a>

 {% else %}
     <strong>{% trans "all" %}</strong>
 {% endif %}
 
 {% else %}
     <strong>{% trans "all" %}</strong>
 {% endif %}
 

-{% for fnt in fn_types %}
+{% for fnt, fnt_name in fn_types %}

     |
     {% if fnt == fn_type %}
     |
     {% if fnt == fn_type %}

-        <strong>{{ fnt }}</strong>
+        <strong>{{ fnt_name }}</strong>

     {% else %}
     {% else %}

-        <a href='?type={{ fnt }}'>{{ fnt }}</a>
+        <a href='?{% set_get "page" type=fnt %}'>{{ fnt_name }}</a>

     {% endif %}
 {% endfor %}
 </p>
     {% endif %}
 {% endfor %}
 </p>


@@ -52,7 +53,7 @@
 <p>
 {% trans "By qualifier" %}:
 {% if qualifier %}
 <p>
 {% trans "By qualifier" %}:
 {% if qualifier %}

-    <a href='?'>{% trans "all" %}</a>
+    <a href='?{% set_get "page" "qual" %}'>{% trans "all" %}</a>

 {% else %}
     <strong>{% trans "all" %}</strong>
 {% endif %}
 {% else %}
     <strong>{% trans "all" %}</strong>
 {% endif %}


@@ -62,7 +63,7 @@
     {% if qual == qualifier %}
         <strong>{{ qual }}</strong>
     {% else %}
     {% if qual == qualifier %}
         <strong>{{ qual }}</strong>
     {% else %}

-        <a href='?qual={{ qual|urlencode }}'>{{ qual }}</a>
+        <a href='?{% set_get "page" qual=qual.qualifier %}'>{{ qual }}</a>

     {% endif %}
 {% endfor %}
 </p>
     {% endif %}
 {% endfor %}
 </p>


@@ -70,17 +71,17 @@
 <p>
 {% trans "By language" %}:
 {% if language %}
 <p>
 {% trans "By language" %}:
 {% if language %}

-    <a href='?'>{% trans "all" %}</a>
+    <a href='?{% set_get "page" "lang" %}'>{% trans "all" %}</a>

 {% else %}
     <strong>{% trans "all" %}</strong>
 {% endif %}
 
 {% else %}
     <strong>{% trans "all" %}</strong>
 {% endif %}
 

-{% for lang in languages %}
+{% for lang, lang_name in languages %}

     |
     {% if lang == language %}
     |
     {% if lang == language %}

-        <strong>{{ lang }}</strong>
+        <strong>{{ lang_name }}</strong>

     {% else %}
     {% else %}

-        <a href='?lang={{ lang }}'>{{ lang }}</a>
+        <a href='?{% set_get "page" lang=lang %}'>{{ lang_name }}</a>

     {% endif %}
 {% endfor %}
 </p>
     {% endif %}
 {% endfor %}
 </p>