From be4f746274b0085debc9fa12b83c8989fea14b47 Mon Sep 17 00:00:00 2001 From: tirilane Date: Sun, 6 Mar 2011 19:04:44 +0000 Subject: [PATCH] =?UTF-8?q?Flytta=20s=C3=B8kefeltet=20til=20hovedtemplaten?= =?UTF-8?q?,=20slik=20at=20den=20n=C3=A5=20er=20p=C3=A5=20alle=20sider.=20?= =?UTF-8?q?Mer=20fikling=20p=C3=A5=20#11=20og=20#12,=20mao.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python/web/media/styles/scaffold.css | 5 +++++ python/web/templates/base/main.html | 10 +++++++++- python/web/templates/index.html | 4 +++- python/web/templates/search/search.html | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/python/web/media/styles/scaffold.css b/python/web/media/styles/scaffold.css index 2fb22b6..9614667 100644 --- a/python/web/media/styles/scaffold.css +++ b/python/web/media/styles/scaffold.css @@ -74,6 +74,11 @@ img.aligncenter { text-shadow: 1px 1px 1px #44A4BD; } +.field { + color: #27606E; + text-align: center; +} + .img { float: left; display: inline; diff --git a/python/web/templates/base/main.html b/python/web/templates/base/main.html index c14b64f..d1fe0d9 100644 --- a/python/web/templates/base/main.html +++ b/python/web/templates/base/main.html @@ -10,7 +10,15 @@

Worblehat

-
+
{% block content %} {% endblock %} +

+
+
+
+ + +
+
diff --git a/python/web/templates/index.html b/python/web/templates/index.html index 58d3873..2191846 100644 --- a/python/web/templates/index.html +++ b/python/web/templates/index.html @@ -6,9 +6,11 @@ Worblehat 0.1. Heisann!! {% block content %} Velkommen til PVVs bokdatabase, Worblehat.
-Her kan du søke etter bøker til din hjertens lyst.

+Her kan du søke etter bøker til din hjertens lyst.
+ {% endblock %} diff --git a/python/web/templates/search/search.html b/python/web/templates/search/search.html index 0f0130a..0bf4492 100644 --- a/python/web/templates/search/search.html +++ b/python/web/templates/search/search.html @@ -6,8 +6,8 @@ Søk {% block content %}

Søk

-Du søkte på {{ search_string }}.
-Fant du ikke det du lette etter? Søk på nytt.

+Du søkte på {{ search_string }}.

+ {% if people %} Personer:
{% for person in people %}