Changed the order of categories in tag lists.

diff --git a/wolnelektury/templates/catalogue/main_page.html b/wolnelektury/templates/catalogue/main_page.html
index 6b3ae8a..f7cc4b0 100644 (file)
--- a/wolnelektury/templates/catalogue/main_page.html
+++ b/wolnelektury/templates/catalogue/main_page.html
@@ -43,25 +43,22 @@
                     <h2>Autorzy</h2>
                     {% folded_tag_list categories.author %}
                 {% endif %}
                     <h2>Autorzy</h2>
                     {% folded_tag_list categories.author %}
                 {% endif %}

-            
-                {% if categories.epoch %}
-                    <h2>Epoki</h2>
-                    {% folded_tag_list categories.epoch %}
-                {% endif %}
-            

                 {% if categories.kind %}
                     <h2>Rodzaje</h2>
                     {% folded_tag_list categories.kind %}
                 {% endif %}
                 {% if categories.kind %}
                     <h2>Rodzaje</h2>
                     {% folded_tag_list categories.kind %}
                 {% endif %}

-            

                 {% if categories.genre %}
                     <h2>Gatunki literackie</h2>
                     {% folded_tag_list categories.genre %}
                 {% endif %}
                 {% if categories.genre %}
                     <h2>Gatunki literackie</h2>
                     {% folded_tag_list categories.genre %}
                 {% endif %}

+                {% if categories.epoch %}
+                    <h2>Epoki</h2>
+                    {% folded_tag_list categories.epoch %}
+                {% endif %}

             </div>
             <div id="themes-list">
                 {% if fragment_tags %}
             </div>
             <div id="themes-list">
                 {% if fragment_tags %}

-                    <h2>Motywy</h2>
+                    <h2>Motywy i tematy</h2>

                     {% folded_tag_list fragment_tags %}
                 {% endif %}
             </div>
                     {% folded_tag_list fragment_tags %}
                 {% endif %}
             </div>

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index 2bf636e..12db8ed 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -78,10 +78,6 @@
                 <h2>Autorzy</h2>
                 {% tag_list categories.author tags %}
             {% endif %}
                 <h2>Autorzy</h2>
                 {% tag_list categories.author tags %}
             {% endif %}

-            {% if categories.epoch %}
-                <h2>Epoki</h2>
-                {% tag_list categories.epoch tags %}
-            {% endif %}

             {% if categories.kind %}
                 <h2>Rodzaje</h2>
                 {% tag_list categories.kind tags %}
             {% if categories.kind %}
                 <h2>Rodzaje</h2>
                 {% tag_list categories.kind tags %}


@@ -89,7 +85,11 @@
             {% if categories.genre %}
                 <h2>Gatunki literackie</h2>
                 {% tag_list categories.genre tags %}
             {% if categories.genre %}
                 <h2>Gatunki literackie</h2>
                 {% tag_list categories.genre tags %}

-            {% endif %}            
+            {% endif %}
+            {% if categories.epoch %}
+                <h2>Epoki</h2>
+                {% tag_list categories.epoch tags %}
+            {% endif %}        

         </div>
         <div id="themes-list">
             {% if categories.theme %}
         </div>
         <div id="themes-list">
             {% if categories.theme %}