From ad6e4a570b2d2df5df288e24f8dd38a290b15e02 Mon Sep 17 00:00:00 2001
From: tirilane <tirilane@pvv.ntnu.no>
Date: Sun, 6 Mar 2011 21:24:58 +0000
Subject: [PATCH] =?UTF-8?q?Mer=20pirking=20p=C3=A5=20#12.=20N=C3=A5=20er?=
 =?UTF-8?q?=20det=20linker=20og=20s=C3=B8keting=20p=C3=A5=20toppen=20av=20?=
 =?UTF-8?q?sida,=20og=20linken=20til=20kategorier=20p=C3=A5=20b=C3=B8kene?=
 =?UTF-8?q?=20f=C3=B8rer=20faktisk=20til=20kategorien.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 python/web/media/styles/scaffold.css | 16 +++++++++++++++-
 python/web/templates/base/main.html  | 12 ++++--------
 python/web/templates/book/view.html  |  2 +-
 python/web/templates/map/index.html  | 10 ++++++++--
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/python/web/media/styles/scaffold.css b/python/web/media/styles/scaffold.css
index 7ea3da9..17f47e9 100644
--- a/python/web/media/styles/scaffold.css
+++ b/python/web/media/styles/scaffold.css
@@ -76,6 +76,20 @@ img.aligncenter {
   text-shadow: 1px 1px 1px #44A4BD;
 }
 
+.shelf {
+  color: #27606E;
+  font-family: verdana, sans-serif, arial, courier new; 
+  text-align: center; 
+}
+
+.caption {
+  color: #27606E;
+  font-family: verdana, sans-serif, arial, courier new; 
+  text-align: center; 
+  font-weight: bolder;
+  text-shadow: 1px 1px 1px #44A4BD;
+}
+
 .links {
   float: center;
   color: #27606E;
@@ -99,7 +113,7 @@ img.aligncenter {
 }
 
 .input {
-  width: 320px;
+  width: 300px;
 }
 
 .heading {
diff --git a/python/web/templates/base/main.html b/python/web/templates/base/main.html
index 4d10e3b..f933b4e 100644
--- a/python/web/templates/base/main.html
+++ b/python/web/templates/base/main.html
@@ -15,18 +15,14 @@
       <a href="/kart/" class="link">Hyllekart</a> |
       <a href="/kategori/" class="link">Kategorier</a> |
       <a href="/bok/" class="link">Bøker</a> |
-      <a href="/person/" class="link">Forfattere og andre personer</a> <br/>
-    </div>
-    <hr/>
-    {% block content %}
-    {% endblock %}
-    <br/><br/>
-    <hr/>
-    <div class="field">
+      <a href="/person/" class="link">Forfattere og andre personer</a> 
       <form action="/let/" method="get">
         <input type="search" name="searchterm" class="input" placeholder="Søk etter bøker, forfattere eller kategorier" autofocus> 
         <input type="submit" value="Søk!">
       </form>
     </div>
+    <hr/>
+    {% block content %}
+    {% endblock %}
   </body>
 </html>
diff --git a/python/web/templates/book/view.html b/python/web/templates/book/view.html
index b8aedb5..71824c5 100644
--- a/python/web/templates/book/view.html
+++ b/python/web/templates/book/view.html
@@ -21,7 +21,7 @@
 <br>
 {% endfor %}
 {% if book.category %}
-  <span class="key">Kategori:</span> {{ book.category }} <br>
+<span class="key">Kategori:</span> <a href="/kategori/{{ book.category.id }}">{{ book.category }}</a> <br>
 {% endif %}
 {% if book.shelves %}
   <span class="key">Hylle:</span> {{ book.shelves }} <br>
diff --git a/python/web/templates/map/index.html b/python/web/templates/map/index.html
index 3670d7a..4704288 100644
--- a/python/web/templates/map/index.html
+++ b/python/web/templates/map/index.html
@@ -7,7 +7,9 @@ Hyllekart
 
 {% block content %}
 {% for shelf in shelf_lists %}
-<table border="1">
+<span class="img">
+<table border="1" class="shelf" >
+  <caption class="caption">Hylle {% if forloop.last %}B{% else %}A{% endif %}</caption>
   {% for row in shelf.1 %}
   <tr>
     {% for column in row %}
@@ -22,7 +24,11 @@ Hyllekart
   </tr>
   {% endfor %}
 </table>
-<li><a href="/kart/{{ shelf_name }}">{{ shelf_name }}</a></li>
+</span>
+<!---<li><a href="/kart/{{ shelf_name }}">{{ shelf_name }}</a></li>---!>
 {% endfor %}
+<br/>
+<br/>
+<br/>
 {% endblock %}