From 88e2c2cae610d479e1b2f82a3d0f19c00e5fb97d Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 14 Mar 2012 17:25:42 +0100 Subject: [PATCH] some templates --- wolnelektury/templates/500.html | 78 +++++------------- wolnelektury/templates/503.html | 82 +++++-------------- .../templates/piston/authorize_token.html | 8 +- .../templates/registration/login.html | 19 ----- wolnelektury/templates/simple_base.html | 24 ------ .../socialaccount/login_cancelled.html | 17 ++++ 6 files changed, 61 insertions(+), 167 deletions(-) delete mode 100755 wolnelektury/templates/registration/login.html delete mode 100755 wolnelektury/templates/simple_base.html create mode 100644 wolnelektury/templates/socialaccount/login_cancelled.html diff --git a/wolnelektury/templates/500.html b/wolnelektury/templates/500.html index e0b2bbb27..d73fea3df 100644 --- a/wolnelektury/templates/500.html +++ b/wolnelektury/templates/500.html @@ -1,64 +1,24 @@ {% load i18n %} - - - -500 - {% trans "Server error" %} WolneLektury.pl - - - - - - - - - -

{% trans "Server error" %}

{% trans "

The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our blog.

Inform our administrators about the error.

" %} - - - + + + \ No newline at end of file diff --git a/wolnelektury/templates/503.html b/wolnelektury/templates/503.html index 3b9ebe1bf..971ac3043 100644 --- a/wolnelektury/templates/503.html +++ b/wolnelektury/templates/503.html @@ -1,66 +1,24 @@ {% load i18n %} - - - -503 - {% trans "Service unavailable" %} WolneLektury.pl - - - - - - - - - -

{% trans "Service unavailable" %}

+ + + + + Wolne Lektury :: 503 - {% trans "Service unavailable" %} + + +
+
+ +
+
+ +
+
+

{% trans "Service unavailable" %}

{% trans "The Wolnelektury.pl site is currently unavailable due to maintainance." %}

- - - - - \ No newline at end of file +
+
+ + diff --git a/wolnelektury/templates/piston/authorize_token.html b/wolnelektury/templates/piston/authorize_token.html index e2444de87..4e4520734 100755 --- a/wolnelektury/templates/piston/authorize_token.html +++ b/wolnelektury/templates/piston/authorize_token.html @@ -1,15 +1,17 @@ -{% extends "simple_base.html" %} +{% extends "base.html" %} {% load i18n %} -{% block "title" %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %} +{% block titleextra %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %} -{% block "body" %} +{% block body %}

{% trans "Authorize access to Wolne Lektury" %}

+

{% blocktrans %}Confirm to authorize access to Wolne Lektury as user {{ user}}.{% endblocktrans %}

{{ form.as_p }}
+
{% endblock %} diff --git a/wolnelektury/templates/registration/login.html b/wolnelektury/templates/registration/login.html deleted file mode 100755 index 5fbe3af42..000000000 --- a/wolnelektury/templates/registration/login.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "simple_base.html" %} -{% load i18n %} - -{% block "title" %}{% trans "Login to Wolne Lektury" %}{% endblock %} - -{% block "body" %} -

{% trans "Login to Wolne Lektury" %}

- -
- {% csrf_token %} - - {{ form.as_table }} - -
- -
-
- -{% endblock %} diff --git a/wolnelektury/templates/simple_base.html b/wolnelektury/templates/simple_base.html deleted file mode 100755 index 17814adc0..000000000 --- a/wolnelektury/templates/simple_base.html +++ /dev/null @@ -1,24 +0,0 @@ - -{% load compressed %} - - - {% block "title" %}{% endblock %} - - - - - {% compressed_css "simple" %} - - - - - - -
- -{% block "body" %}{% endblock %} - -
- - - diff --git a/wolnelektury/templates/socialaccount/login_cancelled.html b/wolnelektury/templates/socialaccount/login_cancelled.html new file mode 100644 index 000000000..ef5db102c --- /dev/null +++ b/wolnelektury/templates/socialaccount/login_cancelled.html @@ -0,0 +1,17 @@ +{% extends "base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Login Cancelled" %}{% endblock %} + +{% block body %} + +

{% trans "Login Cancelled" %}

+ +{% url socialaccount_login as login_url %} +{{ login_url }} + +

{% blocktrans %}You decided to cancel logging in to our site using one of your exisiting accounts. If this was a mistake, please proceed to sign in.{% endblocktrans %}

+ +{% endblock %} + -- 2.20.1