diff --git a/printing_templates/One Dive Simple.html b/printing_templates/One Dive Simple.html new file mode 100644 index 000000000..7f7945396 --- /dev/null +++ b/printing_templates/One Dive Simple.html @@ -0,0 +1,227 @@ + + + + + +
+{% 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 7f7945396..7192610d4 100644 --- a/printing_templates/One Dive.html +++ b/printing_templates/One Dive.html @@ -4,19 +4,17 @@ body { {{ print_options.grayscale }}; padding: 0; - margin: 0; + margin: 0 0 0 6%; font-size: {{ template_options.font_size }}vw; line-height: {{ template_options.line_spacing }}; font-family: {{ template_options.font }}; } h1 { - float: left; font-size: {{ template_options.font_size }}vw; } p { - float: left; font-size: {{ template_options.font_size }}vw; } @@ -26,11 +24,17 @@ border-width: {{ template_options.borderwidth }}px; border-style:solid; border-color: {{ template_options.color6 }}; + border-collapse: separate; + } + + tr { + height: 4vh; } td { - padding-left: 0.5vw; - padding-right: 0.5vw; + padding: 0; + margin: 0; + padding-left: 1%; } #body_div { @@ -38,70 +42,101 @@ } .mainContainer { - width: 98%; + width: 97%; height: 100%; - margin-left: 1%; + margin-left: 0%; margin-right: 1%; margin-top: 0%; margin-bottom: 0%; - overflow: hidden; - border-width: 0; + border-width: 1px; page-break-inside: avoid; } .innerContainer { - width: 100%; + width: 99%; height: 99%; - padding-top: 1%; - overflow: hidden; + padding-top: 0%; } .diveDetails { width: 100%; - height: 98%; - float: left; + margin: 0.0%; + } + + .dataSection { + width: 100%; + margin: 0.0% 0% 0% 0%; } .diveProfile { - width: 99%; - height: 40%; - margin: 0.5%; + width: 99.5%; + height: 45%; + margin: 0.2% 0% 0.5% 0.5%; } - .dataSection { + .notesSection { width: 100%; - height: 40%; - margin: 0%; + margin: 0.0%; + min-height: 35%; } .fieldTitle { background-color: {{ template_options.color2 }}; overflow: hidden; color: {{ template_options.color4 }}; + width: 7%; + padding-left:5px; } .fieldData { background-color: {{ template_options.color3 }}; color: {{ template_options.color5 }}; + width: 13%; + padding: o$ 1% 0% 1%; } .table_class { - float: left; - margin: 0.5%; - width: 49%; + margin: 0%; + width: 100%; } + td.insert_column_inner { + border-left-style:solid; + border-left-color: {{ template_options.color6 }}; + background-color: {{ template_options.color2 }}; + color: {{ template_options.color4 }}; + border: 5px solid black; + } + + td.insert_column_outer { + background-color: {{ template_options.color2 }}; + color: {{ template_options.color4 }}; + } + .notes_table_class { overflow: hidden; - width: 99%; - margin: 0.5%; + width: 100%; + margin: 0.0% 0% 0% 0%; + max-height: 35%; } + .notes_table_class td.fieldTitle { + max-height: 0.15vh; + } + .textArea { line-height: {{ template_options.line_spacing }}; color: {{ template_options.color5 }}; - max-height: 19vh; - overflow: hidden; + font-size: {{ template_options.font_size }}vw; + padding: 1%; + } + + td.fieldTitle b { + font-size: {{ template_options.font_size }}vw; + } + + .hidden_div { + display: none; } @@ -111,14 +146,17 @@ {% for dive in dives %}
-
-
-
-
+
- + + + - - - - - - - - - - - - - - -
-

Dive No.

+ Date + 		+

{{ dive.date }}

+ 		+ Dive No.

{{ dive.number }}

@@ -126,57 +164,27 @@
-

Date

- 		-

{{ dive.date }}

-
-

Location

- 		-

{{ dive.location }}

-
-

Max. depth

- 		-

{{ dive.depth }}

-
-

Duration

- 		-

{{ dive.duration }}

-
- - - - - + + + + + + -
-

Time.

+ Time

{{ dive.time }}

-

Air Temp.

+ Gases 		-

{{ dive.airTemp }}

+

{{ dive.gas }}

-

Water Temp.

+ Location + 		+

{{ dive.location }}

+ 		+ Water Temp.

{{ dive.waterTemp }}

@@ -184,7 +192,13 @@
-

Buddy

+ Max Depth + 		+

{{ dive.depth }}

+ 		+ Buddy

{{ dive.buddy }}

@@ -192,36 +206,48 @@
-

Divemaster

+ Duration + 		+

{{ dive.duration }}

+ 		+ Dive Master

{{ dive.divemaster }}

- - - - - - - - - -
-

Notes

-
-
-

{{ dive.notes|safe }}

-
-
-
-
-
+ +
+
+ +
+ + + + + + + + + +
+ Notes +
+

{{ dive.notes|safe }}

+
+
+ +
+ + {% endfor %} {% endblock %} - + + +