From: Kaltar5679 Date: Thu, 4 Jun 2015 10:18:40 +0000 (+0200) Subject: fix sorttable in desk list for playlist X-Git-Tag: 1.6a^2~15^2~39^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9939c07999aba927077454f9e2bcf51f1429f726;p=telemeta.git fix sorttable in desk list for playlist --- diff --git a/examples/sandbox/settings.py b/examples/sandbox/settings.py index 2a4b9621..57d2d5e7 100644 --- a/examples/sandbox/settings.py +++ b/examples/sandbox/settings.py @@ -296,4 +296,4 @@ HAYSTACK_CONNECTIONS = { HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' -HAYSTACK_SEARCH_RESULTS_PER_PAGE = 500 \ No newline at end of file +HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50 \ No newline at end of file diff --git a/src/django-haystack b/src/django-haystack index 3c88d41f..0576c809 160000 --- a/src/django-haystack +++ b/src/django-haystack @@ -1 +1 @@ -Subproject commit 3c88d41f9a02299d031eef8114dfd4fdc5ed358f +Subproject commit 0576c8093caf59bebedce75e0d711aacfd36f03f diff --git a/telemeta/static/telemeta/css/images/asc.gif b/telemeta/static/telemeta/css/images/asc.gif new file mode 100644 index 00000000..74157867 Binary files /dev/null and b/telemeta/static/telemeta/css/images/asc.gif differ diff --git a/telemeta/static/telemeta/css/images/bg.gif b/telemeta/static/telemeta/css/images/bg.gif new file mode 100644 index 00000000..fac668fc Binary files /dev/null and b/telemeta/static/telemeta/css/images/bg.gif differ diff --git a/telemeta/static/telemeta/css/images/desc.gif b/telemeta/static/telemeta/css/images/desc.gif new file mode 100644 index 00000000..3b30b3c5 Binary files /dev/null and b/telemeta/static/telemeta/css/images/desc.gif differ diff --git a/telemeta/static/telemeta/css/lists_sorttable.css b/telemeta/static/telemeta/css/lists_sorttable.css new file mode 100644 index 00000000..8582d434 --- /dev/null +++ b/telemeta/static/telemeta/css/lists_sorttable.css @@ -0,0 +1,19 @@ +/* tables */ +table.listing thead tr th, table.listing tfoot tr th { + padding-right: 15px; +} +table.listing thead tr .header { + background-image: url(images/bg.gif); + background-repeat: no-repeat; + background-position: right; + cursor: pointer; +} +table.listing thead tr .headerSortUp { + background-image: url(images/asc.gif); +} +table.listing thead tr .headerSortDown { + background-image: url(images/desc.gif); +} +table.listing thead tr .headerSortDown, table.listing thead tr .headerSortUp { + background-color: #8dbdd8; +} \ No newline at end of file diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html index aa5671cf..0a0fc359 100644 --- a/telemeta/templates/telemeta/lists.html +++ b/telemeta/templates/telemeta/lists.html @@ -5,6 +5,7 @@ {% comment "added by Killian Mary" %}{% endcomment %} {% block extra_stylesheets %} + {% endblock %} {% comment "added by Killian Mary end" %}{% endcomment %}