diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-11-22 20:58:42 +0200 |
|---|---|---|
| committer | Lubomir I. Ivanov <neolit123@gmail.com> | 2017-11-24 19:44:45 +0200 |
| commit | 6895c0eca5550b449ee616b7d3b3c5beb8b54ab3 (patch) | |
| tree | 78b4192fa7d6a497a25501c9087a1e29e2a95c99 /printing_templates | |
| parent | 4de47fbd8713b422ca66f38299dc2c0dac4d8507 (diff) | |
| download | subsurface-6895c0eca5550b449ee616b7d3b3c5beb8b54ab3.tar.gz | |
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 <neolit123@gmail.com>
Diffstat (limited to 'printing_templates')
| -rw-r--r-- | printing_templates/One Dive Simple.html | 227 | ||||
| -rw-r--r-- | printing_templates/One Dive.html | 12 |
2 files changed, 5 insertions, 234 deletions
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 @@ -<html> -<head> - <style> - body { - {{ print_options.grayscale }}; - padding: 0; - margin: 0; - 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; - } - - table { - -webkit-box-sizing: border-box; - box-sizing: border-box; - border-width: {{ template_options.borderwidth }}px; - border-style:solid; - border-color: {{ template_options.color6 }}; - } - - td { - padding-left: 0.5vw; - padding-right: 0.5vw; - } - - #body_div { - background-color: {{ template_options.color1 }}; - } - - .mainContainer { - width: 98%; - height: 100%; - margin-left: 1%; - margin-right: 1%; - margin-top: 0%; - margin-bottom: 0%; - overflow: hidden; - border-width: 0; - page-break-inside: avoid; - } - - .innerContainer { - width: 100%; - height: 99%; - padding-top: 1%; - overflow: hidden; - } - - .diveDetails { - width: 100%; - height: 98%; - float: left; - } - - .diveProfile { - width: 99%; - height: 40%; - margin: 0.5%; - } - - .dataSection { - width: 100%; - height: 40%; - margin: 0%; - } - - .fieldTitle { - background-color: {{ template_options.color2 }}; - overflow: hidden; - color: {{ template_options.color4 }}; - } - - .fieldData { - background-color: {{ template_options.color3 }}; - color: {{ template_options.color5 }}; - } - - .table_class { - float: left; - margin: 0.5%; - width: 49%; - } - - .notes_table_class { - overflow: hidden; - width: 99%; - margin: 0.5%; - } - - .textArea { - line-height: {{ template_options.line_spacing }}; - color: {{ template_options.color5 }}; - max-height: 19vh; - overflow: hidden; - } - </style> -</head> -<body data-numberofdives = 1> -<div id="body_div"> -{% block main_rows %} - {% for dive in dives %} - <div class="mainContainer"> - <div class="innerContainer"> - <div class="diveDetails"> - <div class="diveProfile" id="dive_{{ dive.id }}"> - </div> - <div class="dataSection"> - <table class="table_class"> - <tbody><tr> - <td class="fieldTitle"> - <h1> Dive No. </h1> - </td> - <td class="fieldData"> - <p> {{ dive.number }} </p> - </td> - </tr> - <tr> - <td class="fieldTitle"> - <h1> Date </h1> - </td> - <td class="fieldData"> - <p> {{ dive.date }} </p> - </td> - </tr> - <tr> - <td class="fieldTitle"> - <h1> Location </h1> - </td> - <td class="fieldData"> - <p> {{ dive.location }} </p> - </td> - </tr> - <tr> - <td class="fieldTitle"> - <h1> Max. depth </h1> - </td> - <td class="fieldData"> - <p> {{ dive.depth }} </p> - </td> - </tr> - <tr> - <td class="fieldTitle"> - <h1> Duration </h1> - </td> - <td class="fieldData"> - <p> {{ dive.duration }} </p> - </td> - </tr> - </tbody></table> - <table class="table_class"> - <tbody><tr> - <td class="fieldTitle"> - <h1> Time. </h1> - </td> - <td class="fieldData"> - <p> {{ dive.time }} </p> - </td> - </tr> - <tr> - <td class="fieldTitle"> - <h1> Air Temp. </h1> - </td> - <td class="fieldData"> - <p> {{ dive.airTemp }} </p> - </td> - </tr> - <tr> - <td class="fieldTitle"> - <h1> Water Temp. </h1> - </td> - <td class="fieldData"> - <p> {{ dive.waterTemp }} </p> - </td> - </tr> - <tr> - <td class="fieldTitle"> - <h1> Buddy </h1> - </td> - <td class="fieldData"> - <p> {{ dive.buddy }} </p> - </td> - </tr> - <tr> - <td class="fieldTitle"> - <h1> Divemaster </h1> - </td> - <td class="fieldData"> - <p> {{ dive.divemaster }} </p> - </td> - </tr> - </tbody> - </table> - <table class="notes_table_class"> - <tbody> - <tr> - <td class="fieldTitle"> - <h1> Notes </h1> - </td> - </tr> - <tr> - <td class="fieldData"> - <div class="textArea"> - <p> {{ dive.notes|safe }} </p> - </div> - </td> - </tr> - </tbody> - </table> - </div> - </div> - </div> - </div> - {% endfor %} -{% endblock %} -</div> -</body> -</html> 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%; <!-- Provide LH margin for binding the page --> + margin: 0 0 0 6%; <!-- Provide LH margin for binding the page --> font-size: {{ template_options.font_size }}vw; line-height: {{ template_options.line_spacing }}; font-family: {{ template_options.font }}; @@ -239,15 +239,13 @@ </tr> </tbody> </table> - </div> <!-- notesSection --> + </div> <!-- notesSection --> - </div> <!-- innerContainer --> - </div> <!-- mainContainer --> + </div> <!-- innerContainer --> + </div> <!-- mainContainer --> {% endfor %} {% endblock %} - -</div> <!-- Body_div --> - +</div> </body> </html> |