Using absolute paths to images, fixed the Jinja2 template up a bit

7 files changed, 59 insertions, 97 deletions

diff --git a/web/templates/contact.html.j2.tmpl b/web/templates/contact.html.j2.tmpl
index d2f7bf9..045ab81 100644
--- a/web/templates/contact.html.j2.tmpl
+++ b/web/templates/contact.html.j2.tmpl
@@ -5,10 +5,9 @@
    norder = '-1'
 %]
 [%- PROCESS 'constants.tt' -%]
-{%if form.get %}
+{% if page.get %}
 <p>All the fields have to be filled in ...</p>
-<p><strong>NB:</strong> As a matter of courtesy you should consider adding your name (or even a pseudonym) in the message to us. You know our names as well. Besides, it makes it easier to address you in a response. Thanks.</p>
-<form action="{% form.uri %}" method="post" accept-charset="utf-8">
+<form action="{{ page.uri }}" method="post" accept-charset="utf-8">
 <table width="100%" summary="Mailform">
 <colgroup>
  <col width="30%" />
@@ -19,7 +18,8 @@
  <b>Who should receive the message?:</b>
  </td>
  <td>
- <select name="{% form.recipient %}">
+ <input type="hidden" name="{{ page.hidden }}" value="{{ page.hidden_value }}" />
+ <select name="{{ page.recipient }}">
   <option value="developers" selected="selected">Developers</option>
   [%- FOREACH key IN gpg_keys.sort('name') -%]<option value="[%- key.name | lower -%]">[%- key.name -%]</option>[%- END -%]
   <option value="team">The whole team</option>
@@ -31,7 +31,7 @@
  <b>Your email address (max. 100 chars):</b>
  </td>
  <td>
- <input type="text" name="{% form.sender %}" maxlength="100" class="feld_" />
+ <input type="text" name="{{ page.sender }}" maxlength="100" class="feld_" />
  </td>
  </tr>
 <tr>
@@ -39,19 +39,19 @@
  <b>Subject (max. 100 chars):</b>
  </td>
  <td>
- <input type="hidden" name="{% form.hidden %}" value="{% form.hidden_value %}" />
- <input type="text" name="{% form.subject %}" maxlength="100" class="feld_" />
+ <input type="text" name="{{ page.subject }}" maxlength="100" class="feld_" />
  </td>
  </tr>
 <tr>
  <td colspan="2">
- <b>Here goes your text:</b><br />
- <textarea name="{% form.message %}" rows="15" cols="60" class="feld3"></textarea>
+ <div><b>Here goes your text (barring technical issues it will be transmitted as encrypted email!):</b></div>
+ <textarea name="{{ page.message }}" rows="15" cols="60" class="feld3"></textarea>
  </td>
  </tr>
 <tr>
  <td colspan="2" style="text-align:center; ">
- <input type="submit" value="{% form.send %}" class="btn" />
+ <div><strong>NB:</strong> As a matter of courtesy you should consider adding your name (or even a pseudonym) in the message to us. You know our names as well. Besides, it makes it easier to address you in a response. Thank you.</div>
+ <input type="submit" value="{{ page.send }}" class="btn" />
  </td>
  </tr>
 </table>
@@ -83,24 +83,24 @@ establish whether PGP/MIME can be used in future communication.
 [%- END -%]
 </ul>
 {% else %}
-{% if post.success %}
-<header><h1><span lang="en">Success</span> / <span lang="de">Erfolg</span></h1></header>
+{% if page.success %}
+<h1><span lang="en">Success</span> / <span lang="de">Erfolg</span></h1>
 <section lang="en">
   <h2>Your email was sent successfully (delivery may still fail, though)</h2>
 </section>
 <section lang="de">
   <h2>Ihre Email wurde erfolgreich verschickt (die Zustellung kann dennoch fehlschlagen)</h2>
 </section>
-<article><pre>\n{% post.message %}\n</pre></article>
+<article><pre>\n{{ page.message }}\n</pre></article>
 {% else %}
-<header><h1><span lang="en">Error</span> / <span lang="de">Fehler</span> {% post.status %}</h1></header>
+<h1><span lang="en">Error</span> / <span lang="de">Fehler</span> {{ page.status }}</h1>
 <section lang="en">
   <h2>An error occurred when processing your request.</h2>
-  <p>Status code {% post.status %}: {% post.status_description %}</p>
+  <p>Status code {{ page.status }}: {{ page.status_description }}</p>
 </section>
 <section lang="de">
   <h2>Während der Verarbeitung Ihrer Anfrage kam es zu einem Fehler.</h2>
-  <p>Statuscode {% post.status %}: <span lang="en">{% post.status_description %}</span> (Beschreibung auf Englisch)</p>
+  <p>Statuscode {{ page.status }}: <span lang="en">{{ page.status_description }}</span> (Beschreibung auf Englisch)</p>
 </section>
 {% endif %}
 {% endif %}
diff --git a/web/templates/include/html-body.tt b/web/templates/include/html-body.tt
index fb681c8..f2f8b70 100644
--- a/web/templates/include/html-body.tt
+++ b/web/templates/include/html-body.tt
@@ -1,7 +1,7 @@
 [%- PROCESS 'constants.tt' -%]
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/1999/xhtml http://www.w3.org/MarkUp/SCHEMA/xhtml-rdfa-2.xsd" lang="en" xml:lang="en" dir="ltr" xmlns:og="http://ogp.me/ns#">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
@@ -10,8 +10,8 @@
   <meta name="description" content="[%- description | html -%]" />
   <meta property="og:title" content="WinDirStat" />
   <meta property="og:description" content="[%- long_desc | html -%]" />
-  <meta property="og:image" content="images/wds_rich_preview.png" />
-  <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+  <meta property="og:image" content="/images/wds_rich_preview.png" />
+  <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
 [%  FOREACH kw IN keywords %]
   <meta name="keywords" content="[%- kw.cont | html -%]" lang="[%- kw.lang | html -%]" />
 
@@ -32,7 +32,7 @@
 [%- USE date(format = '%Y-%m-%d %H:%MZ') -%]
 <body>
 <p style="text-align:center;">
-<img src="images/logo_wds_white.png" alt="WinDirStat logo with text" height="72" width="191" />
+<img src="/images/logo_wds_white.png" alt="WinDirStat logo with text" height="72" width="191" />
 <span style="position:absolute; left:1.5em; z-index:200; font-weight:bold; color:white;">Latest version: [% currver %]</span>
 </p>
 <table id="frame" cellpadding="0" cellspacing="0" border="0" width="100%">
@@ -51,10 +51,10 @@
     [%- IF uuid == page.uuid -%]
     <p class="selected">
     [%- ELSE -%]
-    <p><a href="[% page.fname | uri %]">
+    <p><a href="/[% page.fname | uri %]">
     [%- END -%]
       [%- IF page.uuid == '51f50289-c61f-4cf7-ac07-fd236f442f39' -%]
-      <img src="images/logo_50px.png" alt="Colored WinDirStat logo" height="50" width="50" />
+      <img src="/images/logo_50px.png" alt="Colored WinDirStat logo" height="50" width="50" />
       [%- ELSE -%]
       [%- page.title -%]
       [%- END -%]
@@ -70,21 +70,6 @@
 </tr>
 </table>
 <p />
-<table border="0" width="100%" >
-<colgroup>
- <col width="50%" />
- <col width="50%" />
-</colgroup>
-<tr>
- <td align="left" valign="bottom">
-  <a href="/stats"><img style="border:0;width:32px;height:32px" src="images/stats.png" alt="Project statistics" /></a>
- </td>
- <td align="right" valign="bottom">
-  <a href="http://validator.w3.org/check?uri=referer"><img src="images/valid-xhtml10-gray.png" alt="Valid XHTML 1.0!" height="31" width="88" /></a>&nbsp;
-  <a href="http://jigsaw.w3.org/css-validator/check/referer"><img style="border:0;width:88px;height:31px" src="images/vcss-gray.png" alt="Valid CSS!" /></a>
- </td>
-</tr>
-</table>
 <p style="text-align:center; color:gray;" class="miniari">
 WinDirStat is Open Source software. You can redistribute and/or modify it under the terms of the GNU Public License, version 2 (GPLv2).
 <br />
diff --git a/web/templates/include/styles.css b/web/templates/include/styles.css
index 2e27548..8653bba 100644
--- a/web/templates/include/styles.css
+++ b/web/templates/include/styles.css
@@ -1,5 +1,5 @@
 body {
-	background: url(images/body.png) repeat-x;
+	background: url(/images/body.png) repeat-x;
 	margin:15px;
 	font-family : Arial, Helvetica, sans-serif;
 }
@@ -12,7 +12,7 @@ body {
 	border:1px solid gray;
 	margin:2px;
 	padding:5px;
-	background: url(images/vert.png) bottom repeat-x;
+	background: url(/images/vert.png) bottom repeat-x;
 }
 
 #menu {
@@ -60,7 +60,7 @@ a.wdslnk:hover, a.wdslnk:active {
 
 #menu .selected{
 	border-color: gray white gray gray;
-	background: url(images/hor.png) repeat-y;
+	background: url(/images/hor.png) repeat-y;
 }
 
 #menu a:hover {
diff --git a/web/templates/index.html.tmpl b/web/templates/index.html.tmpl
index de53929..a6a4ccd 100644
--- a/web/templates/index.html.tmpl
+++ b/web/templates/index.html.tmpl
@@ -13,7 +13,7 @@ for various versions of <strong>Microsoft Windows</strong>.<br /><strong><em>Not
 <li>The treemap, which shows the whole contents of the directory tree straight away,</li>
 <li>The extension list, which serves as a legend and shows statistics about the file types.</li>
 </ul>
-<img src="images/windirstat.jpg" alt="Screenshot"/>
+<img src="/images/windirstat.jpg" alt="Screenshot"/>
 <p>The treemap represents each file as a colored rectangle, the area of which is proportional to the file's size. The rectangles are arranged in such a way, that directories again make up rectangles, which contain all their files and subdirectories. So their area is proportional to the size of the subtrees. The color of a rectangle indicates the type of the file, as shown in the extension list. The cushion shading additionally brings out the directory structure.
 </p>
 [% END %]
diff --git a/web/templates/logo.html.tmpl b/web/templates/logo.html.tmpl
index dcbb2c7..81dc4a9 100644
--- a/web/templates/logo.html.tmpl
+++ b/web/templates/logo.html.tmpl
@@ -8,14 +8,14 @@
 The logos are available under the terms of the Creative Commons license <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
 <h3>Application icon</h3>
 <p>Different resolutions, colored, dithered, black & white.<br />
-<img src="images/logo/WinDirStat_3d.ico" alt="WDS application icon" /></p>
+<img src="/images/logo/WinDirStat_3d.ico" alt="WDS application icon" /></p>
 <h3>Logo (color)</h3>
 <p>Click for scalable SVG version.<br />
-<a href="images/logo/logo_color.svg"><img src="images/logo/logo_color.png" alt="Colored WDS logo" width="512" height="512" /></a></p>
+<a href="/images/logo/logo_color.svg"><img src="/images/logo/logo_color.png" alt="Colored WDS logo" width="512" height="512" /></a></p>
 <h3>Logo (gray)</h3>
 <p>Click for scalable SVG version.<br />
-<a href="images/logo/logo_gray.svg"><img src="images/logo/logo_gray.png" alt="Grayscale WDS logo" width="512" height="512" /></a></p>
+<a href="/images/logo/logo_gray.svg"><img src="/images/logo/logo_gray.png" alt="Grayscale WDS logo" width="512" height="512" /></a></p>
 <h3>Logo (black/white)</h3>
 <p>Click for scalable SVG version.<br />
-<a href="images/logo/logo_bw.svg"><img src="images/logo/logo_bw.png" alt="Black and white WDS logo" width="512" height="512" /></a></p>
+<a href="/images/logo/logo_bw.svg"><img src="/images/logo/logo_bw.png" alt="Black and white WDS logo" width="512" height="512" /></a></p>
 [% END %]
diff --git a/web/templates/translations.html.tmpl b/web/templates/translations.html.tmpl
index f461ca4..64e504a 100644
--- a/web/templates/translations.html.tmpl
+++ b/web/templates/translations.html.tmpl
@@ -23,7 +23,6 @@
      </th>
      <th class="langtabhead">Language<br />(english)
      </th>
-
      <th class="langtabhead">Language<br />(local)
      </th>
      <th class="langtabhead">Language ID(s)
@@ -33,7 +32,6 @@
    </tr>
    <tr>
      <td class="newest langtab"><br />1.1.2<br />&nbsp;
-
      </td>
      <td class="langtab"><br />Czech
      </td>
@@ -42,9 +40,8 @@
      <td class="langtab"><br />CES/CZE (0405)
      </td>
      <td rowspan="2" class="langtab bordleft">
-       <a href="images/0405/select.png"><img src="images/0405/select.jpg" width="130" height="100" alt="Directory selection in Czech"/></a>
-       <a href="images/0405/wds_full.png"><img src="images/0405/wds_full.jpg" width="138" height="100" alt="Overall interface in Czech"/></a>
-
+       <a href="/images/0405/select.png"><img src="/images/0405/select.jpg" width="130" height="100" alt="Directory selection in Czech"/></a>
+       <a href="/images/0405/wds_full.png"><img src="/images/0405/wds_full.jpg" width="138" height="100" alt="Overall interface in Czech"/></a>
      </td>
    </tr>
    <tr>
@@ -54,7 +51,6 @@
    <tr>
      <td class="langtab"><br />1.0.0<br />(+help)
      </td>
-
      <td class="langtab"><br />German
      </td>
      <td class="langtab"><br />Deutsch
@@ -62,10 +58,9 @@
      <td class="langtab"><br />DEU/GER (0407)
      </td>
      <td rowspan="2" class="langtab bordleft">
-       <a href="images/0407/select.png"><img src="images/0407/select.jpg" width="130" height="100" alt="Directory selection in German"/></a>
-       <a href="images/0407/wds_full.png"><img src="images/0407/wds_full.jpg" width="138" height="100" alt="Overall interface in German"/></a>
+       <a href="/images/0407/select.png"><img src="/images/0407/select.jpg" width="130" height="100" alt="Directory selection in German"/></a>
+       <a href="/images/0407/wds_full.png"><img src="/images/0407/wds_full.jpg" width="138" height="100" alt="Overall interface in German"/></a>
      </td>
-
    </tr>
    <tr>
      <td colspan="4" class="translator">WDS team
@@ -76,18 +71,16 @@
      </td>
      <td class="langtab"><br />English
      </td>
-
      <td class="langtab"><br />English
      </td>
      <td class="langtab"><br />ENG (0409)
      </td>
      <td rowspan="2" class="langtab bordleft">
-       <a href="images/0409/select.png"><img src="images/0409/select.jpg" width="130" height="100" alt="Directory selection in English"/></a>
-       <a href="images/0409/wds_full.png"><img src="images/0409/wds_full.jpg" width="138" height="100" alt="Overall interface in English"/></a>
+       <a href="/images/0409/select.png"><img src="/images/0409/select.jpg" width="130" height="100" alt="Directory selection in English"/></a>
+       <a href="/images/0409/wds_full.png"><img src="/images/0409/wds_full.jpg" width="138" height="100" alt="Overall interface in English"/></a>
      </td>
    </tr>
    <tr>
-
      <td colspan="4" class="translator">WDS team
      </td>
    </tr>
@@ -98,18 +91,16 @@
      </td>
      <td class="langtab"><br />Espa&#xF1;ol
      </td>
-
      <td class="langtab"><br />ESL/SPA (040a)
      </td>
      <td rowspan="2" class="langtab bordleft">
-       <a href="images/040a/select.png"><img src="images/040a/select.jpg" width="130" height="100" alt="Directory selection in Spanish"/></a>
-       <a href="images/040a/wds_full.png"><img src="images/040a/wds_full.jpg" width="138" height="100" alt="Overall interface in Spanish"/></a>
+       <a href="/images/040a/select.png"><img src="/images/040a/select.jpg" width="130" height="100" alt="Directory selection in Spanish"/></a>
+       <a href="/images/040a/wds_full.png"><img src="/images/040a/wds_full.jpg" width="138" height="100" alt="Overall interface in Spanish"/></a>
      </td>
    </tr>
    <tr>
      <td colspan="4" class="translator">Thanks to Sergio Omar Maurelli
      </td>
-
    </tr>
    <tr>
      <td class="newest langtab"><br />1.1.2<br />&nbsp;
@@ -120,10 +111,9 @@
      </td>
      <td class="langtab"><br />FIN (040b)
      </td>
-
      <td rowspan="2" class="langtab bordleft">
-<!--       <a href="images/040b/select.png"><img src="images/040b/select.jpg" width="130" height="100" alt="Directory selection in Finnish"/></a>
-       <a href="images/040b/wds_full.png"><img src="images/040b/wds_full.jpg" width="138" height="100" alt="Overall interface in Finnish"/></a>-->
+<!--       <a href="/images/040b/select.png"><img src="/images/040b/select.jpg" width="130" height="100" alt="Directory selection in Finnish"/></a>
+       <a href="/images/040b/wds_full.png"><img src="/images/040b/wds_full.jpg" width="138" height="100" alt="Overall interface in Finnish"/></a>-->
      </td>
    </tr>
    <tr>
@@ -132,7 +122,6 @@
    </tr>
    <tr>
      <td class="langtab"><br />1.1.0<br />&nbsp;
-
      </td>
      <td class="langtab"><br />French
      </td>
@@ -141,18 +130,15 @@
      <td class="langtab"><br />FRA/FRE (040c)
      </td>
      <td rowspan="2" class="langtab bordleft">
-       <a href="images/040c/select.png"><img src="images/040c/select.jpg" width="130" height="100" alt="Directory selection in French"/></a>
-       <a href="images/040c/wds_full.png"><img src="images/040c/wds_full.jpg" width="138" height="100" alt="Overall interface in French"/></a>
-
+       <a href="/images/040c/select.png"><img src="/images/040c/select.jpg" width="130" height="100" alt="Directory selection in French"/></a>
+       <a href="/images/040c/wds_full.png"><img src="/images/040c/wds_full.jpg" width="138" height="100" alt="Overall interface in French"/></a>
      </td>
    </tr>
    <tr>
      <td colspan="4" class="translator">Thanks to Pascal Delrot and <a href="http://ultravnc.sf.net">'UltraSam'</a>
-
      </td>
    </tr>
    <tr>
-
      <td class="newest langtab"><br />1.1.2<br />(+help)
      </td>
      <td class="langtab"><br />Hungarian
@@ -162,9 +148,8 @@
      <td class="langtab"><br />HUN (040e)
      </td>
      <td rowspan="2" class="langtab bordleft">
-       <a href="images/040e/select.png"><img src="images/040e/select.jpg" width="130" height="100" alt="Directory selection in Hungarian"/></a>
-
-       <a href="images/040e/wds_full.png"><img src="images/040e/wds_full.jpg" width="138" height="100" alt="Overall interface in Hungarian"/></a>
+       <a href="/images/040e/select.png"><img src="/images/040e/select.jpg" width="130" height="100" alt="Directory selection in Hungarian"/></a>
+       <a href="/images/040e/wds_full.png"><img src="/images/040e/wds_full.jpg" width="138" height="100" alt="Overall interface in Hungarian"/></a>
      </td>
    </tr>
    <tr>
@@ -173,7 +158,6 @@
    </tr>
    <tr>
      <td class="newest langtab"><br />1.1.2<br />&nbsp;
-
      </td>
      <td class="langtab"><br />Italian
      </td>
@@ -182,9 +166,8 @@
      <td class="langtab"><br />ITA (0410)
      </td>
      <td rowspan="2" class="langtab bordleft">
-       <a href="images/0410/select.png"><img src="images/0410/select.jpg" width="130" height="100" alt="Directory selection in Italian"/></a>
-       <a href="images/0410/wds_full.png"><img src="images/0410/wds_full.jpg" width="138" height="100" alt="Overall interface in Italian"/></a>
-
+       <a href="/images/0410/select.png"><img src="/images/0410/select.jpg" width="130" height="100" alt="Directory selection in Italian"/></a>
+       <a href="/images/0410/wds_full.png"><img src="/images/0410/wds_full.jpg" width="138" height="100" alt="Overall interface in Italian"/></a>
      </td>
    </tr>
    <tr>
@@ -193,7 +176,6 @@
    </tr>
    <tr>
      <td class="newest langtab"><br />1.1.2<br />&nbsp;
-
      </td>
      <td class="langtab"><br />Dutch
      </td>
@@ -202,8 +184,8 @@
      <td class="langtab"><br />DUT/NLA (0413)
      </td>
      <td rowspan="2" class="langtab bordleft">
-<!--       <a href="images/0413/select.png"><img src="images/0413/select.jpg" width="130" height="100" alt="Directory selection in Italian"/></a>
-       <a href="images/0413/wds_full.png"><img src="images/0413/wds_full.jpg" width="138" height="100" alt="Overall interface in Italian"/></a>-->
+<!--       <a href="/images/0413/select.png"><img src="/images/0413/select.jpg" width="130" height="100" alt="Directory selection in Italian"/></a>
+       <a href="/images/0413/wds_full.png"><img src="/images/0413/wds_full.jpg" width="138" height="100" alt="Overall interface in Italian"/></a>-->
      </td>
    </tr>
 
@@ -222,14 +204,13 @@
      <td class="langtab"><br />POL (0415)
      </td>
      <td rowspan="2" class="langtab bordleft">
-       <a href="images/0415/select.png"><img src="images/0415/select.jpg" width="130" height="100" alt="Directory selection in Polish"/></a>
-       <a href="images/0415/wds_full.png"><img src="images/0415/wds_full.jpg" width="138" height="100" alt="Overall interface in Polish"/></a>
+       <a href="/images/0415/select.png"><img src="/images/0415/select.jpg" width="130" height="100" alt="Directory selection in Polish"/></a>
+       <a href="/images/0415/wds_full.png"><img src="/images/0415/wds_full.jpg" width="138" height="100" alt="Overall interface in Polish"/></a>
      </td>
    </tr>
    <tr>
      <td colspan="4" class="translator">Thanks to Dariusz Ma&#x142;achowski
      </td>
-
    </tr>
    <tr>
      <td class="langtab"><br />1.1.1<br />&nbsp;
@@ -240,16 +221,14 @@
      </td>
      <td class="langtab"><br />RUS (0419)
      </td>
-
      <td rowspan="2" class="langtab bordleft">
-       <a href="images/0419/select.png"><img src="images/0419/select.jpg" width="130" height="100" alt="Directory selection in Russian"/></a>
-       <a href="images/0419/wds_full.png"><img src="images/0419/wds_full.jpg" width="138" height="100" alt="Overall interface in Russian"/></a>
+       <a href="/images/0419/select.png"><img src="/images/0419/select.jpg" width="130" height="100" alt="Directory selection in Russian"/></a>
+       <a href="/images/0419/wds_full.png"><img src="/images/0419/wds_full.jpg" width="138" height="100" alt="Overall interface in Russian"/></a>
      </td>
    </tr>
    <tr>
      <td colspan="4" class="translator">Thanks to Sergey Polyetayev (&#x421;&#x435;&#x440;&#x433;&#x435;&#x439; &#x41F;&#x43E;&#x43B;&#x435;&#x442;&#x430;&#x435;&#x432;)
      </td>
-
    </tr>
    <tr>
      <td class="langtab"><br />1.1.2<br />&nbsp;
@@ -260,10 +239,9 @@
      </td>
      <td class="langtab"><br />EST (0425)
      </td>
-
      <td rowspan="2" class="langtab bordleft">
-<!--       <a href="images/0425/select.png"><img src="images/0425/select.jpg" width="130" height="100" alt="Directory selection in Estonian"/></a>
-       <a href="images/0425/wds_full.png"><img src="images/0425/wds_full.jpg" width="138" height="100" alt="Overall interface in Estonian"/></a>-->
+<!--       <a href="/images/0425/select.png"><img src="/images/0425/select.jpg" width="130" height="100" alt="Directory selection in Estonian"/></a>
+       <a href="/images/0425/wds_full.png"><img src="/images/0425/wds_full.jpg" width="138" height="100" alt="Overall interface in Estonian"/></a>-->
      </td>
    </tr>
    <tr>
@@ -273,7 +251,6 @@
    <tr>
      <td colspan="5" class="langtab" style="text-align: left; font-weight: bold; background-color: #dddddd;">12 languages overall. Helpfile available in 4 of these languages.
      </td>
-
    </tr>
   </table>
 [% END %]
diff --git a/web/templates/unicode.html.tmpl b/web/templates/unicode.html.tmpl
index c8c59b3..513b9c9 100644
--- a/web/templates/unicode.html.tmpl
+++ b/web/templates/unicode.html.tmpl
@@ -26,9 +26,9 @@
       <ol>
         <li style="clear:both;"><em>Without</em> Unicode:<br />
           <div class="cent" style="float:left; border:1px solid green; margin:0.2em; width:325px;">
-           <a href="images/unicode/ANSI_WDS_DEU.png">
+           <a href="/images/unicode/ANSI_WDS_DEU.png">
 
-           <img src="images/unicode/ANSI_WDS_DEU_small.png" width="232" height="124" alt="ANSI version on a German system"/>
+           <img src="/images/unicode/ANSI_WDS_DEU_small.png" width="232" height="124" alt="ANSI version on a German system"/>
            </a>
           <div class="cent miniari" style="color:gray;">ANSI on a German system (click for full view)</div>
           </div>
@@ -48,8 +48,8 @@
           </li>
         <li style="clear:both;"><em>With</em> Unicode:<br />
           <div class="cent" style="float:left; border:1px solid green; margin:0.2em; width:325px;">
-           <a href="images/unicode/Unicode_WDS.png">
-           <img src="images/unicode/Unicode_WDS_small.png" width="323" height="124" alt="Unicode version on a German system"/>
+           <a href="/images/unicode/Unicode_WDS.png">
+           <img src="/images/unicode/Unicode_WDS_small.png" width="323" height="124" alt="Unicode version on a German system"/>
            </a>
           <div class="cent miniari" style="color:gray;">Unicode on a German system (click for full view)</div>