From 6895c0eca5550b449ee616b7d3b3c5beb8b54ab3 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Wed, 22 Nov 2017 20:58:42 +0200 Subject: [PATCH] printing: delete `One Dive Simple.html` and cleanup The previous commit by Willem introduced a new HTML template file which is not needed, as it was decided to override the default `One Dive.html`. This patch also include small cleanup in the new version of `One Dive.html`. Signed-off-by: Lubomir I. Ivanov --- printing_templates/One Dive Simple.html | 227 ------------------------ printing_templates/One Dive.html | 12 +- 2 files changed, 5 insertions(+), 234 deletions(-) delete mode 100644 printing_templates/One Dive Simple.html diff --git a/printing_templates/One Dive Simple.html b/printing_templates/One Dive Simple.html deleted file mode 100644 index 7f7945396..000000000 --- a/printing_templates/One Dive Simple.html +++ /dev/null @@ -1,227 +0,0 @@ - - - - - -
-{% block main_rows %} - {% for dive in dives %} -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - -
-

Dive No.

-
-

{{ dive.number }}

-
-

Date

-
-

{{ dive.date }}

-
-

Location

-
-

{{ dive.location }}

-
-

Max. depth

-
-

{{ dive.depth }}

-
-

Duration

-
-

{{ dive.duration }}

-
- - - - - - - - - - - - - - - - - - - - - - -
-

Time.

-
-

{{ dive.time }}

-
-

Air Temp.

-
-

{{ dive.airTemp }}

-
-

Water Temp.

-
-

{{ dive.waterTemp }}

-
-

Buddy

-
-

{{ dive.buddy }}

-
-

Divemaster

-
-

{{ dive.divemaster }}

-
- - - - - - - - - -
-

Notes

-
-
-

{{ dive.notes|safe }}

-
-
-
-
-
-
- {% endfor %} -{% endblock %} -
- - diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html index 7192610d4..a9ee00471 100644 --- a/printing_templates/One Dive.html +++ b/printing_templates/One Dive.html @@ -4,7 +4,7 @@ body { {{ print_options.grayscale }}; padding: 0; - margin: 0 0 0 6%; + margin: 0 0 0 6%; font-size: {{ template_options.font_size }}vw; line-height: {{ template_options.line_spacing }}; font-family: {{ template_options.font }}; @@ -239,15 +239,13 @@ - + - - + + {% endfor %} {% endblock %} - - - +