From 16faf95f77bf43f8055c15865d6c53d00740d521 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 11 Oct 2011 13:27:11 +0200 Subject: [PATCH] nicer oauth forms --- wolnelektury/settings.py | 6 +- wolnelektury/static/css/simple.css | 73 +++++++++++++++++++ .../templates/piston/authorize_token.html | 22 +++--- .../templates/registration/login.html | 22 +++++- wolnelektury/templates/simple_base.html | 24 ++++++ 5 files changed, 131 insertions(+), 16 deletions(-) create mode 100755 wolnelektury/static/css/simple.css create mode 100755 wolnelektury/templates/simple_base.html diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index 5cb556bb4..fb78ce433 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -162,7 +162,11 @@ COMPRESS_CSS = { 'book': { 'source_filenames': ('css/master.book.css',), 'output_filename': 'css/book.min?.css', - } + }, + 'simple': { + 'source_filenames': ('css/simple.css',), + 'output_filename': 'css/simple.min?.css', + }, } COMPRESS_JS = { diff --git a/wolnelektury/static/css/simple.css b/wolnelektury/static/css/simple.css new file mode 100755 index 000000000..6b8a54cc9 --- /dev/null +++ b/wolnelektury/static/css/simple.css @@ -0,0 +1,73 @@ +html { + margin: 0; +} + +body { + margin: 0; + padding: 1em; + color: #2F4110; + background: #FFF url(/static/img/bg.png) repeat-x; + font-size: .75em; + font-family: Verdana,Arial,Helvetica,sans-serif; +} + + + +#body { + margin-top: 2em; +/* + max-width: 900px; + margin:auto; +*/ + margin-left: 400px; +} + +#logo { + float: left; + margin-left: 100px; + margin-top: 4em; +} + +h1 { + font: bold 2.2em Arial,sans-serif; + padding-top: .7em; + margin-bottom: .2em; +} + + +h2 { + font-size: 1.1em; + margin:0; +} + +a { + color: #295158; + text-decoration: none; +} + + +.plain li { + list-style: none; +} + +li { + margin: 1em; +} + +.clr { + clear: both; +} + + +.more { + text-align: right; +} + +table { + margin-top: 1em; +} + +th { + font-weight: normal; + text-align: left; +} diff --git a/wolnelektury/templates/piston/authorize_token.html b/wolnelektury/templates/piston/authorize_token.html index ba28adc4a..e2444de87 100755 --- a/wolnelektury/templates/piston/authorize_token.html +++ b/wolnelektury/templates/piston/authorize_token.html @@ -1,15 +1,15 @@ - - - - Authorize Token - - -

Authorize Token

+{% extends "simple_base.html" %} +{% load i18n %} + +{% block "title" %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %} + +{% block "body" %} +

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

+ +

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

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

{% trans "Login to Wolne Lektury" %}

+ + {% csrf_token %} - {{ form }} - -
+ + {{ form.as_table }} + +
+ +
+ + +{% endblock %} diff --git a/wolnelektury/templates/simple_base.html b/wolnelektury/templates/simple_base.html new file mode 100755 index 000000000..17814adc0 --- /dev/null +++ b/wolnelektury/templates/simple_base.html @@ -0,0 +1,24 @@ + +{% load compressed %} + + + {% block "title" %}{% endblock %} + + + + + {% compressed_css "simple" %} + + + + + + +
+ +{% block "body" %}{% endblock %} + +
+ + + -- 2.20.1