From 1d329b7268eac3ea080a563f6405e24b548e3c7d Mon Sep 17 00:00:00 2001 From: tirilane Date: Sun, 6 Mar 2011 12:26:35 +0000 Subject: [PATCH] =?UTF-8?q?#12=20p=C3=A5begynt.=20Har=20n=C3=A5=20bl=C3=A5?= =?UTF-8?q?tt=20utseende=20p=C3=A5=20ting.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python/web/media/styles/scaffold.css | 67 +++++++++++++++++++++++++-- python/web/settings.py | 2 +- python/web/templates/base/main.html | 7 ++- python/web/templates/book/view.html | 9 ++-- python/web/templates/person/view.html | 4 +- 5 files changed, 75 insertions(+), 14 deletions(-) diff --git a/python/web/media/styles/scaffold.css b/python/web/media/styles/scaffold.css index 093c209..3d8ff9f 100644 --- a/python/web/media/styles/scaffold.css +++ b/python/web/media/styles/scaffold.css @@ -1,4 +1,8 @@ -body { background-color: #fff; color: #333; } +body { + background-color: #CCDDFF; + color: #333; + font-family: verdana, sans-serif, arial, courier new +} body, p, ol, ul, td { font-family: verdana, arial, helvetica, sans-serif; @@ -12,9 +16,64 @@ pre { font-size: 11px; } -a { color: #000; } -a:visited { color: #666; } -a:hover { color: #fff; background-color:#000; } +a { + color: #000; +} +a:visited { + color: #666; +} +a:hover { + color: #fff; + background-color:#000; +} + +h1 { + color: #44A4BD; + font-family: verdana, sans-serif, arial, courier new; + text-align: center; + text-transform: uppercase; + text-shadow: 2px 2px 2px #27606E; +} +h2 { + color: #3399CC; + font-family: verdana, sans-serif, arial, courier new; + text-align: center; + text-transform: uppercase +} +h3 { + color: #38703F; + font-family: verdana, sans-serif, arial, courier new; + text-align: left +} +h4 { + color: #3399CC; + font-family: verdana, sans-serif, arial, courier new; + text-align: center +} +h5 { + color: #44A4BD; + font-family: verdana, sans-serif, arial, courier new; + text-align: left +} +h6 { + color: #339944; + font-family: verdana, sans-serif, arial, courier new; + text-align: center +} + +img.aligncenter { + display: block; + margin-left: auto; + margin-right: auto; +} + +.key { + color: #27606E; + font-family: verdana, sans-serif, arial, courier new; + text-align: left; + font-weight: bolder; + text-shadow: 1px 1px 1px #44A4BD; +} .fieldWithErrors { padding: 2px; diff --git a/python/web/settings.py b/python/web/settings.py index 0a841eb..0626ef4 100644 --- a/python/web/settings.py +++ b/python/web/settings.py @@ -69,7 +69,7 @@ TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. - 'web/templates/' + '/home/tirilane/src/pvv/worblehat/trunk/python/web/templates/' ) INSTALLED_APPS = ( diff --git a/python/web/templates/base/main.html b/python/web/templates/base/main.html index 072ec55..400178c 100644 --- a/python/web/templates/base/main.html +++ b/python/web/templates/base/main.html @@ -1,13 +1,16 @@ + {% block title %}{% endblock %} - - + + {% block meta %} {% endblock %} +

Worblehat

+
{% block content %} {% endblock %} diff --git a/python/web/templates/book/view.html b/python/web/templates/book/view.html index 341f1c9..20e3844 100644 --- a/python/web/templates/book/view.html +++ b/python/web/templates/book/view.html @@ -3,14 +3,13 @@ {%block title%} Worblehat 0.1: {{ book.title }} {% endblock %} - {% block content %} -Title: {{ book.title }}
+Title: {{ book.title }}
{% if book.subtitle %} - Subtitle: {{ book.subtitle }}
+Subtitle: {{ book.subtitle }}
{% endif %} -ISBN: {{ book.isbn }}
+ISBN: {{ book.isbn }}
{% for person in people %} - {{ person.relation }} : {{ person.person.first_name }} {{ person.person.last_name }}
+{{ person.relation }}: {{ person.person.first_name }} {{ person.person.last_name }}
{% endfor %} {% endblock %} diff --git a/python/web/templates/person/view.html b/python/web/templates/person/view.html index a3a4874..bba1a4e 100644 --- a/python/web/templates/person/view.html +++ b/python/web/templates/person/view.html @@ -5,8 +5,8 @@ Worblehat 0.1: {{ person.first_name }} {{ person.last_name }} {% endblock %} {% block content %} -Name: {{person.first_name}} {{person.last_name}}
+Name: {{person.first_name}} {{person.last_name}}
{% for book in books %} -{{ book.relation.name }} of: {{ book.book.title }}
+{{ book.relation.name }} of: {{ book.book.title }}
{% endfor %} {% endblock %}