From 85bce0fa0da575040b6e4ef04750475b9a9ae223 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 10 Jul 2015 14:02:13 +0200 Subject: Printing: enhance the one_dive per page template - fix the layout - prevent the notes from expanding - don't overflow the text Signed-off-by: Gehad elrobey Signed-off-by: Lubomir I. Ivanov --- printing_templates/one_dive.html | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'printing_templates') diff --git a/printing_templates/one_dive.html b/printing_templates/one_dive.html index d7ae8d477..52b8097c9 100644 --- a/printing_templates/one_dive.html +++ b/printing_templates/one_dive.html @@ -16,13 +16,17 @@ } table { - -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ - -moz-box-sizing: border-box; /* Firefox, other Gecko */ + -webkit-box-sizing: border-box; box-sizing: border-box; border:max(1px, 0.1vw); border-style:solid; } + td { + padding-left: 0.5vw; + padding-right: 0.5vw; + } + .mainContainer { width: 96%; height: 100%; @@ -45,8 +49,7 @@ .diveDetails { width: 98%; height: 98%; - -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ - -moz-box-sizing: border-box; /* Firefox, other Gecko */ + -webkit-box-sizing: border-box; box-sizing: border-box; border:max(1px, 0.1vw); border-style:solid; @@ -54,20 +57,15 @@ } .diveProfile { - width: 97%; + width: 96%; height: 40%; - margin: 1.5%; - -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ - -moz-box-sizing: border-box; /* Firefox, other Gecko */ - box-sizing: border-box; - border:max(1px, 0.1vw); - border-style:solid; + margin: 2%; } .dataSection { - width: 97%; + width: 98%; height: 40%; - margin: 1.5%; + margin: 1%; } .fieldTitle { @@ -77,18 +75,20 @@ .table_class { float: left; - margin: 1.5%; + margin: 1%; + width: 48%; } .notes_table_class { overflow: hidden; - width: 97%; - margin: 1.5%; - float: left; + width: 98%; + margin: 1%; } .textArea { line-height: {{ template_options.line_spacing }}; + max-height: 19vh; + overflow: hidden; } -- cgit v1.2.3-70-g09d2 From c18e5ec795c309f4ca0993db86a6bf17f000270d Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Mon, 13 Jul 2015 11:19:35 +0200 Subject: Printing: make templates support custom colors Use template_options colors instead of static colors. Signed-off-by: Gehad elrobey Signed-off-by: Lubomir I. Ivanov --- printing_templates/one_dive.html | 4 ++-- printing_templates/two_dives.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'printing_templates') diff --git a/printing_templates/one_dive.html b/printing_templates/one_dive.html index 52b8097c9..ce58b3847 100644 --- a/printing_templates/one_dive.html +++ b/printing_templates/one_dive.html @@ -2,7 +2,7 @@ +

{% block main_rows %} {% for dive in dives %}

@@ -206,5 +211,6 @@

{% endfor %} {% endblock %} +

diff --git a/printing_templates/two_dives.html b/printing_templates/two_dives.html index 8a9df0094..0c8eec14c 100644 --- a/printing_templates/two_dives.html +++ b/printing_templates/two_dives.html @@ -2,7 +2,7 @@ +

{% block main_rows %} {% for dive in dives %}

@@ -217,5 +222,6 @@ {% endblock %}