diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-02-27 23:44:18 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-02-28 00:09:29 +0100 |
| commit | 6150ebc0362118789c8f3d7b57d93f68dc1cd62d (patch) | |
| tree | e2d868d869a8254b96e6ecec95e142cd655ab97c /hyperkitty | |
| parent | 07c1a4a2b4211c1975f9d641401636a8cbc35f9c (diff) | |
| download | hyperkitty-6150ebc0362118789c8f3d7b57d93f68dc1cd62d.tar.gz hyperkitty-6150ebc0362118789c8f3d7b57d93f68dc1cd62d.tar.xz hyperkitty-6150ebc0362118789c8f3d7b57d93f68dc1cd62d.zip | |
More Django 1.5 compatibility fixes
Diffstat (limited to 'hyperkitty')
| -rw-r--r-- | hyperkitty/middleware.py | 4 | ||||
| -rw-r--r-- | hyperkitty/templates/paginator.html | 20 |
2 files changed, 18 insertions, 6 deletions
diff --git a/hyperkitty/middleware.py b/hyperkitty/middleware.py index 25aab6e..5f43c40 100644 --- a/hyperkitty/middleware.py +++ b/hyperkitty/middleware.py @@ -35,7 +35,7 @@ class PaginationMiddleware(object): # http://stackoverflow.com/questions/2799450/django-https-for-just-login-page from django.conf import settings -from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect, get_host +from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect SSL = 'SSL' @@ -63,7 +63,7 @@ class SSLRedirect(object): def _redirect(self, request, secure): protocol = secure and "https" or "http" - newurl = "%s://%s%s" % (protocol, get_host(request), request.get_full_path()) + newurl = "%s://%s%s" % (protocol, request.get_host(), request.get_full_path()) if settings.DEBUG and request.method == 'POST': raise RuntimeError, \ """Django can't perform a SSL redirect while maintaining POST data. diff --git a/hyperkitty/templates/paginator.html b/hyperkitty/templates/paginator.html index 1b3ad90..a7559ec 100644 --- a/hyperkitty/templates/paginator.html +++ b/hyperkitty/templates/paginator.html @@ -1,11 +1,23 @@ {% load i18n %} <ul class="pager"> - <li{% if not pager.has_previous %} class="disabled"{% endif %}> - <a href="?page={{ pager.previous_page_number }}">← Newer</a> + {% if pager.has_previous %} + <li> + <a href="?page={{ pager.previous_page_number }}"> + {% else %} + <li class="disabled"> + <a href="#"> + {% endif %} + ← Newer</a> </li> - <li{% if not pager.has_next %} class="disabled"{% endif %}> - <a href="?page={{ pager.next_page_number }}">Older →</a> + {% if pager.has_next %} + <li> + <a href="?page={{ pager.next_page_number }}"> + {% else %} + <li class="disabled"> + <a href="#"> + {% endif %} + Older →</a> </li> </ul> |