# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1310466991 -7200
# Node ID ecacd68cf8596d826ec65307ff29520000a4c435
# Parent  d89c497d29df49d2e222ffb17f602f722534156b
add sort direction, corrections

diff -r d89c497d29df -r ecacd68cf859 web/hdabo/templates/partial/all_tags_table.html
--- a/web/hdabo/templates/partial/all_tags_table.html	Tue Jul 12 11:59:27 2011 +0200
+++ b/web/hdabo/templates/partial/all_tags_table.html	Tue Jul 12 12:36:31 2011 +0200
@@ -8,7 +8,7 @@
 	        {% else %}
 	            <a href="{% url hdabo.views.all_tags num_page='1', nb_by_page=nb_by_page, sort='+lab' %}">label</a>
 	        {% endif %}
-        {% else %}label{% endif %}&nbsp;<a href="{% url hdabo.views.all_tags  num_page='1', nb_by_page=nb_by_page, sort=reverse_sort %}"><img src="{{STATIC_URL}}hdabo/img/sort-{% if sort|first == '+' %}asc{% else %}desc{% endif %}.png"/></a>
+        {% else %}label &nbsp;{% if searched and searched != "" %}<a href="{% url hdabo.views.all_tags  num_page='1', nb_by_page=nb_by_page, sort=reverse_sort, searched=searched %}">{% else %}<a href="{% url hdabo.views.all_tags  num_page='1', nb_by_page=nb_by_page, sort=reverse_sort %}">{% endif %}<img src="{{STATIC_URL}}hdabo/img/sort-{% if sort|first == '+' %}asc{% else %}desc{% endif %}.png"/></a>{% endif %}
         </th>
         <th>original_label</th>
         <th class="text_centered">Lien W</th>
@@ -24,7 +24,7 @@
 	        {% else %}
 	            <a href="{% url hdabo.views.all_tags num_page='1', nb_by_page=nb_by_page, sort='+pop' %}">Popularité</a>
 	        {% endif %}
-        {% else %}Popularité{% endif %}&nbsp;<a href="{% url hdabo.views.all_tags  num_page='1', nb_by_page=nb_by_page, sort=reverse_sort %}"><img src="{{STATIC_URL}}hdabo/img/sort-{% if sort|first == '+' %}asc{% else %}desc{% endif %}.png"/></a>
+        {% else %}Popularité &nbsp;{% if searched and searched != "" %}<a href="{% url hdabo.views.all_tags  num_page='1', nb_by_page=nb_by_page, sort=reverse_sort, searched=searched %}">{% else %}<a href="{% url hdabo.views.all_tags  num_page='1', nb_by_page=nb_by_page, sort=reverse_sort %}">{% endif %}<img src="{{STATIC_URL}}hdabo/img/sort-{% if sort|first == '+' %}asc{% else %}desc{% endif %}.png"/></a>{% endif %}
         </th></tr>
     {% for tag in tags %}
     <tr class="imageline {% cycle 'hdabooddline' 'hdaboevenline' %}">
diff -r d89c497d29df -r ecacd68cf859 web/hdabo/urls.py
--- a/web/hdabo/urls.py	Tue Jul 12 11:59:27 2011 +0200
+++ b/web/hdabo/urls.py	Tue Jul 12 12:36:31 2011 +0200
@@ -33,11 +33,11 @@
     url(r'^resetwpinfo$', 'hdabo.views.reset_wikipedia_info'),
     url(r'^addtag$', 'hdabo.views.add_tag'),
     url(r'^removewplink$', 'hdabo.views.remove_wp_link'),
-    url(r'^alltags$', 'hdabo.views.all_tags'),
-    url(r'^alltags/(?P<num_page>[\w-]+)$', 'hdabo.views.all_tags'),
-    url(r'^alltags/(?P<num_page>[\w-]+)/(?P<nb_by_page>[\w-]+)/$', 'hdabo.views.all_tags'),
-    url(r'^alltags/(?P<num_page>[\w-]+)/(?P<nb_by_page>[\w-]+)/(?P<sort>[+-][\w]+)/$', 'hdabo.views.all_tags'),
-    url(r'^alltags/(?P<num_page>[\w-]+)/(?P<nb_by_page>[\w-]+)/(?P<sort>[+-][\w]+)/(?P<searched>.+)/$', 'hdabo.views.all_tags'),
+    url(r'^alltags/?$', 'hdabo.views.all_tags'),
+    url(r'^alltags/(?P<num_page>[\w-]+)/?$', 'hdabo.views.all_tags'),
+    url(r'^alltags/(?P<num_page>[\w-]+)/(?P<nb_by_page>[\w-]+)/?$', 'hdabo.views.all_tags'),
+    url(r'^alltags/(?P<num_page>[\w-]+)/(?P<nb_by_page>[\w-]+)/(?P<sort>[+-][\w]+)/?$', 'hdabo.views.all_tags'),
+    url(r'^alltags/(?P<num_page>[\w-]+)/(?P<nb_by_page>[\w-]+)/(?P<sort>[+-][\w]+)/(?P<searched>.*)/?$', 'hdabo.views.all_tags'),
     url(r'^validatedatasheet$', 'hdabo.views.validate_datasheet'),
     url(r'^validatedatasheet/(?P<ds_id>[\w-]+)$', 'hdabo.views.validate_datasheet'),
     url(r'^validatedatasheet/(?P<ds_id>[\w-]+)/(?P<valid>[\w-]+)/$', 'hdabo.views.validate_datasheet'),
diff -r d89c497d29df -r ecacd68cf859 web/hdabo/views.py
--- a/web/hdabo/views.py	Tue Jul 12 11:59:27 2011 +0200
+++ b/web/hdabo/views.py	Tue Jul 12 12:36:31 2011 +0200
@@ -293,7 +293,7 @@
         "+lab" : alltags.order_by('normalized_label', 'label'),
         "-lab" : alltags.order_by('-normalized_label', '-label'),
         "+pop" : alltags.order_by('-popularity', '-num_ds', 'normalized_label', 'label'),
-        "-pop" : alltags.order_by('+popularity', '+num_ds', '-normalized_label', '-label'),
+        "-pop" : alltags.order_by('popularity', 'num_ds', '-normalized_label', '-label'),
     }.get(sort, alltags.order_by('-popularity', '-num_ds', 'normalized_label', 'label'))