From 9fe2851a2a5f81ebca62bdf45428b6c2cee98ad1 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Mon, 12 Nov 2018 21:15:14 +0000 Subject: Using absolute paths to images, fixed the Jinja2 template up a bit --- web/templates/contact.html.j2.tmpl | 32 ++++++++-------- web/templates/include/html-body.tt | 29 ++++----------- web/templates/include/styles.css | 6 +-- web/templates/index.html.tmpl | 2 +- web/templates/logo.html.tmpl | 8 ++-- web/templates/translations.html.tmpl | 71 ++++++++++++------------------------ web/templates/unicode.html.tmpl | 8 ++-- 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 %}

All the fields have to be filled in ...

NB: 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.

+ @@ -19,7 +18,8 @@ Who should receive the message?: @@ -39,19 +39,19 @@ Subject (max. 100 chars):

- +	- +
- - +
- Here goes your text: - + Here goes your text (barring technical issues it will be transmitted as encrypted email!): +
- + NB: 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. +

@@ -83,24 +83,24 @@ establish whether PGP/MIME can be used in future communication. [%- END -%] {% else %} -{% if post.success %} -

Success / Erfolg

+{% if page.success %} +

Success / Erfolg

Your email was sent successfully (delivery may still fail, though)

Ihre Email wurde erfolgreich verschickt (die Zustellung kann dennoch fehlschlagen)

\n{% post.message %}\n

\n{{ page.message }}\n

{% else %} -

Error / Fehler {% post.status %}

Error / Fehler {{ page.status }}

An error occurred when processing your request.

Status code {% post.status %}: {% post.status_description %}

Status code {{ page.status }}: {{ page.status_description }}

Während der Verarbeitung Ihrer Anfrage kam es zu einem Fehler.

Statuscode {% post.status %}: {% post.status_description %} (Beschreibung auf Englisch)

Statuscode {{ page.status }}: {{ page.status_description }} (Beschreibung auf Englisch)

{% 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' -%] - - + + @@ -10,8 +10,8 @@ - - + + [% FOREACH kw IN keywords %] @@ -32,7 +32,7 @@ [%- USE date(format = '%Y-%m-%d %H:%MZ') -%]

- WinDirStat logo with text + Latest version: [% currver %]

@@ -51,10 +51,10 @@ [%- IF uuid == page.uuid -%]

[%- ELSE -%] -

[%- END -%] [%- IF page.uuid == '51f50289-c61f-4cf7-ac07-fd236f442f39' -%] - Colored WinDirStat logo + [%- ELSE -%] [%- page.title -%] [%- END -%] @@ -70,21 +70,6 @@

- -- - - - - - - -

- - - - -

WinDirStat is Open Source software. You can redistribute and/or modify it under the terms of the GNU Public License, version 2 (GPLv2).
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 Microsoft Windows.
Not

The treemap, which shows the whole contents of the directory tree straight away,

The extension list, which serves as a legend and shows statistics about the file types.
- +
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.
[% 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 CC BY 3.0.

Application icon

Different resolutions, colored, dithered, black & white.
-
+

Logo (color)

Click for scalable SVG version.
-
+

Logo (gray)

Click for scalable SVG version.
-
+

Logo (black/white)

Click for scalable SVG version.
-
+
[% 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 @@ Language
(english) - Language
(local) Language ID(s) @@ -33,7 +32,6 @@
1.1.2
-
Czech @@ -42,9 +40,8 @@
CES/CZE (0405) - - - + + @@ -54,7 +51,6 @@
1.0.0
(+help) -
German
Deutsch @@ -62,10 +58,9 @@
DEU/GER (0407) - - + + - WDS team @@ -76,18 +71,16 @@
English -
English
ENG (0409) - - + + - WDS team @@ -98,18 +91,16 @@
Español -
ESL/SPA (040a) - - + + Thanks to Sergio Omar Maurelli -
1.1.2
@@ -120,10 +111,9 @@
FIN (040b) - - + @@ -132,7 +122,6 @@
1.1.0
-
French @@ -141,18 +130,15 @@
FRA/FRE (040c) - - - + + Thanks to Pascal Delrot and 'UltraSam' - -
1.1.2
(+help)
Hungarian @@ -162,9 +148,8 @@
HUN (040e) - - - + + @@ -173,7 +158,6 @@
1.1.2
-
Italian @@ -182,9 +166,8 @@
ITA (0410) - - - + + @@ -193,7 +176,6 @@
1.1.2
-
Dutch @@ -202,8 +184,8 @@
DUT/NLA (0413) - + @@ -222,14 +204,13 @@
POL (0415) - - + + Thanks to Dariusz Małachowski -
1.1.1
@@ -240,16 +221,14 @@
RUS (0419) - - - + + Thanks to Sergey Polyetayev (Сергей Полетаев) -
1.1.2
@@ -260,10 +239,9 @@
EST (0425) - - + @@ -273,7 +251,6 @@ 12 languages overall. Helpfile available in 4 of these languages. - [% 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 @@

Without Unicode:

- + - +
ANSI on a German system (click for full view)

@@ -48,8 +48,8 @@

With Unicode:

- - + +
Unicode on a German system (click for full view)
-- cgit v1.2.3