diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-05 12:01:43 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-05 12:01:43 -0700 |
| commit | 9c6a3a7ff387578ddede2e69d8b994a11cf8eaee (patch) | |
| tree | 72a08592a24d8d3d1f4fc7d7713da8029bc80c3f /printing_templates | |
| parent | 35dc81410518e6d39ba8b3f99348884778bedc5b (diff) | |
| parent | cc53dc7acf801f022612678f697e6d76c2443153 (diff) | |
| download | subsurface-9c6a3a7ff387578ddede2e69d8b994a11cf8eaee.tar.gz | |
Merge branch 'custom-print' of github.com:neolit123/subsurface
Diffstat (limited to 'printing_templates')
| -rw-r--r-- | printing_templates/custom.html | 50 | ||||
| -rw-r--r-- | printing_templates/one_dive.html | 12 | ||||
| -rw-r--r-- | printing_templates/two_dives.html | 37 |
3 files changed, 83 insertions, 16 deletions
diff --git a/printing_templates/custom.html b/printing_templates/custom.html new file mode 100644 index 000000000..52fdb4b49 --- /dev/null +++ b/printing_templates/custom.html @@ -0,0 +1,50 @@ +<html> +<head> + <style> + body { + background-color: white; + 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; + } + + .mainContainer { + width: 96%; + height: 100%; + margin-left: 2%; + margin-right: 2%; + margin-top: 0%; + margin-bottom: 0%; + overflow: hidden; + border-width: 0; + page-break-inside: avoid; + } + + .innerContainer { + width: 98%; + height: 98%; + padding: 1%; + overflow: hidden; + } + </style> +</head> +<body data-numberofdives = 1> +{% block main_rows %} + {% for dive in dives %} + <div class="mainContainer"> + <div class="innerContainer"> + <h1>This template is empty</h1> + <!-- Template must be filled --> + </div> + </div> + {% endfor %} +{% endblock %} +</body> +</html> diff --git a/printing_templates/one_dive.html b/printing_templates/one_dive.html index 754dc85bc..d7ae8d477 100644 --- a/printing_templates/one_dive.html +++ b/printing_templates/one_dive.html @@ -5,12 +5,14 @@ background-color: white; padding: 0; margin: 0; - font-size: 1.2vw; + font-size: {{ template_options.font_size }}vw; + line-height: {{ template_options.line_spacing }}; + font-family: {{ template_options.font }}; } h1 { - font-size: 1.2vw; float: left; + font-size: {{ template_options.font_size }}vw; } table { @@ -84,9 +86,13 @@ margin: 1.5%; float: left; } + + .textArea { + line-height: {{ template_options.line_spacing }}; + } </style> </head> -<body> +<body data-numberofdives = 1> {% block main_rows %} {% for dive in dives %} <div class="mainContainer"> diff --git a/printing_templates/two_dives.html b/printing_templates/two_dives.html index 574579f90..62502272b 100644 --- a/printing_templates/two_dives.html +++ b/printing_templates/two_dives.html @@ -5,10 +5,13 @@ background-color: white; padding: 0px; margin: 0px; + font-size: {{ template_options.font_size }}vw; + line-height: {{ template_options.line_spacing }}; + font-family: {{ template_options.font }}; } h1 { - font-size: 0.9cm; + font-size: {{ template_options.font_size }}vw; float: left; } @@ -20,49 +23,56 @@ margin-top: 0; margin-bottom: 0; overflow: hidden; - border-width: 0px; page-break-inside: avoid; } .innerContainer { height: 85%; - border-style: solid; padding: 0.5%; margin-top: 1%; margin-bottom: 1%; overflow: hidden; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border:max(0.1vw, 1px); + border-style:solid; } .table_class { overflow: hidden; max-width: 25%; min-width: 25%; - box-shadow: 5px 5px 5px #888888; margin: 1.5%; float: left; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border:max(0.1vw, 1px); + border-style:solid; } .notes_table_class { overflow: hidden; max-width: 100%; min-width: 100%; - box-shadow: 5px 5px 5px #888888; margin: 1.5%; float: left; + -webkit-box-sizing: border-box; + box-sizing: border-box; + border:max(0.1vw, 1px); + border-style:solid; } .fieldTitle { background-color: #CfC7C5; overflow: hidden; + padding:0; } .diveProfile { width: 37%; - height: 70%; + height: 95%; margin: 1.5%; float: right; - border-style: solid; - padding: 3mm; } .diveDetails { @@ -80,9 +90,10 @@ } .textArea { - max-height: 43ex; overflow: hidden !important; text-overflow: ellipsis; + max-height: 10.3vw; + line-height: {{ template_options.line_spacing }}; } #footer { @@ -91,14 +102,14 @@ } </style> </head> -<body> +<body data-numberofdives = 2> {% block main_rows %} {% for dive in dives %} <div class="mainContainer"> <div class="innerContainer"> <div class="diveDetails"> <div class="dataPart"> - <table class="table_class" border="1"> + <table class="table_class"> <tbody><tr> <td class="fieldTitle"> <h1> Dive No. </h1> @@ -139,7 +150,7 @@ </td> </tr> </tbody></table> - <table class="table_class" border="1"> + <table class="table_class"> <tbody><tr> <td class="fieldTitle"> <h1> Time. </h1> @@ -184,7 +195,7 @@ </div> </div> <div class="notesPart"> - <table class="notes_table_class" border="1"> + <table class="notes_table_class"> <tbody><tr> <td class="fieldTitle"> <h1> Notes </h1> |