From: Radek Czajka Date: Wed, 31 Aug 2011 09:48:20 +0000 (+0200) Subject: remove some experimental junk X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/3186105f81a48c2c63aad4697537aed31ac2fd5c?ds=inline remove some experimental junk --- diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index aedc4caa1..00a3a6b60 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -676,27 +676,6 @@ def delete_shelf(request, slug): # ================== # = Authentication = # ================== - -@cache.never_cache -def simple_login(request): - if request.method == "GET": - #next = request.REQUEST.get('next', '') - #if next == '': - form = AuthenticationForm(prefix='login') - return render_to_response('auth/login.html', locals(), - context_instance=RequestContext(request)) - #else: - # return HttpResponseRedirect("/"+next) - - elif request.method == "POST": - form = AuthenticationForm(data=request.POST, prefix='login') - if form.is_valid(): - auth.login(request, form.get_user()) - url = request.META['HTTP_REFERER'].split("next=")[1] - url = url.replace("%3F","?").replace("%3D","=") - return HttpResponseRedirect(url) - - @require_POST @cache.never_cache def login(request): diff --git a/apps/piston/templates/piston/authorize_token.html b/apps/piston/templates/piston/authorize_token.html index 3507e55f8..59c09e331 100644 --- a/apps/piston/templates/piston/authorize_token.html +++ b/apps/piston/templates/piston/authorize_token.html @@ -1,17 +1,15 @@ -{% load i18n %} - {% trans "Authorize Token" %} - - + Authorize Token -

WolneLektury.pl - {% trans "Authorize Token" %}

-
+

Authorize Token

+ + {{ form.as_table }} -
+ diff --git a/wolnelektury/static/css/mobile.css b/wolnelektury/static/css/mobile.css deleted file mode 100644 index 2f04e6596..000000000 --- a/wolnelektury/static/css/mobile.css +++ /dev/null @@ -1,7 +0,0 @@ -ul li { - list-style-type: none; -} - -h1 { - font-size: 1em; -} diff --git a/wolnelektury/templates/auth/login.html b/wolnelektury/templates/auth/login.html index 204cce641..a168ff7f8 100644 --- a/wolnelektury/templates/auth/login.html +++ b/wolnelektury/templates/auth/login.html @@ -1,28 +1,25 @@ +{% extends "base.html" %} {% load i18n %} - - - - {% trans "Authorize Token" %} - - - - -

WolneLektury.pl - {% trans "Sign in" %} / {% trans "Register"%}

-
-

{% trans "Sign in" %}

- -

-
-
-

{% trans "Register" %}

- -
- - +{% block title %}{% trans "Sign in" %} / {% trans "Register on"%} WolneLektury.pl{% endblock %} + +{% block body %} +

{% trans "Sign in" %} / {% trans "Register"%}

+
+

  • {{ search_form.q }}
    • {% trans "or" %} {% trans "return to main page" %}

    +
    +
    +

    {% trans "Sign in" %}

    +
      + {{ form.as_ul }} +
      2. +
    +

    +
    + +
    +

    {% trans "Register" %}

    + +

    +
    +{% endblock %} diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index 932c440f6..a99030f4d 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -37,7 +37,6 @@ urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), # Authentication - url(r'^users/simple_login/$', 'catalogue.views.simple_login', name='simple_login'), url(r'^uzytkownicy/zaloguj/$', 'catalogue.views.login', name='login'), url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'), url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),