From 8d0101bf3d94d393615f19396bc2ff2d930f531c Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Mon, 3 Aug 2015 18:21:16 +0200
Subject: Printing: templates should use colors defined in the color palette

Use the colors defined in the color palettes for all font, borders,
table sections and backgrounds of all templates.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html | 30 ++++++++++++++++++++----------
 printing_templates/One Dive.html   | 30 ++++++++++++++++++++----------
 printing_templates/Table.html      |  2 +-
 printing_templates/Two Dives.html  | 32 +++++++++++++++++++++-----------
 4 files changed, 62 insertions(+), 32 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index a3f7951d9..98867d259 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -20,6 +20,7 @@
 			box-sizing: border-box;
 			border:max(1px, 0.1vw);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		td {
@@ -54,6 +55,7 @@
 			box-sizing: border-box;
 			border:max(1px, 0.1vw);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 			float: left;
 		}
 
@@ -65,6 +67,11 @@
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
 			overflow: hidden;
+			color: {{ template_options.color3 }};
+		}
+
+		.fieldData {
+			color: {{ template_options.color4 }};
 		}
 
 		.table_class {
@@ -83,6 +90,7 @@
 			line-height: {{ template_options.line_spacing }};
 			max-height: 19vh;
 			overflow: hidden;
+			color: {{ template_options.color4 }};
 		}
 	</style>
 </head>
@@ -99,7 +107,7 @@
 								<td class="fieldTitle">
 									<h1> Dive No. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.number }} </h1>
 								</td>
 							</tr>
@@ -107,14 +115,15 @@
 								<td class="fieldTitle">
 									<h1> Date </h1>
 								</td>
-									<td><h1> {{ dive.date }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.date }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Location </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.location }} </h1>
 								</td>
 							</tr>
@@ -122,7 +131,7 @@
 								<td class="fieldTitle">
 									<h1> Max depth </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.depth }} </h1>
 								</td>
 							</tr>
@@ -130,7 +139,7 @@
 								<td class="fieldTitle">
 									<h1> Duration </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.duration }} </h1>
 								</td>
 							</tr>
@@ -140,7 +149,7 @@
 								<td class="fieldTitle">
 									<h1> Time. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.time }} </h1>
 								</td>
 							</tr>
@@ -148,14 +157,15 @@
 								<td class="fieldTitle">
 									<h1> Air Temp. </h1>
 								</td>
-									<td><h1> {{ dive.airTemp }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.airTemp }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Water Temp. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.waterTemp }} </h1>
 								</td>
 							</tr>
@@ -163,7 +173,7 @@
 								<td class="fieldTitle">
 									<h1> Buddy </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.buddy }} </h1>
 								</td>
 							</tr>
@@ -171,7 +181,7 @@
 								<td class="fieldTitle">
 									<h1> Dive Master </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.divemaster }} </h1>
 								</td>
 							</tr>
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 40c02b395..ff0d8cd40 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -20,6 +20,7 @@
 			box-sizing: border-box;
 			border:max(1px, 0.1vw);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		td {
@@ -57,6 +58,7 @@
 			box-sizing: border-box; 
 			border:max(1px, 0.1vw);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 			float: left;
 		}
 
@@ -75,6 +77,11 @@
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
 			overflow: hidden;
+			color: {{ template_options.color3 }};
+		}
+
+		.fieldData {
+			color: {{ template_options.color4 }};
 		}
 
 		.table_class {
@@ -91,6 +98,7 @@
 
 		.textArea {
 			line-height: {{ template_options.line_spacing }};
+			color: {{ template_options.color4 }};
 			max-height: 19vh;
 			overflow: hidden;
 		}
@@ -111,7 +119,7 @@
 								<td class="fieldTitle">
 									<h1> Dive No. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.number }} </h1>
 								</td>
 							</tr>
@@ -119,14 +127,15 @@
 								<td class="fieldTitle">
 									<h1> Date </h1>
 								</td>
-									<td><h1> {{ dive.date }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.date }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Location </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.location }} </h1>
 								</td>
 							</tr>
@@ -134,7 +143,7 @@
 								<td class="fieldTitle">
 									<h1> Max depth </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.depth }} </h1>
 								</td>
 							</tr>
@@ -142,7 +151,7 @@
 								<td class="fieldTitle">
 									<h1> Duration </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.duration }} </h1>
 								</td>
 							</tr>
@@ -152,7 +161,7 @@
 								<td class="fieldTitle">
 									<h1> Time. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.time }} </h1>
 								</td>
 							</tr>
@@ -160,14 +169,15 @@
 								<td class="fieldTitle">
 									<h1> Air Temp. </h1>
 								</td>
-									<td><h1> {{ dive.airTemp }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.airTemp }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Water Temp. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.waterTemp }} </h1>
 								</td>
 							</tr>
@@ -175,7 +185,7 @@
 								<td class="fieldTitle">
 									<h1> Buddy </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.buddy }} </h1>
 								</td>
 							</tr>
@@ -183,7 +193,7 @@
 								<td class="fieldTitle">
 									<h1> Dive Master </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.divemaster }} </h1>
 								</td>
 							</tr>
diff --git a/printing_templates/Table.html b/printing_templates/Table.html
index c97267405..2668ccb62 100644
--- a/printing_templates/Table.html
+++ b/printing_templates/Table.html
@@ -47,7 +47,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
-			border-color: color: {{ template_options.color5 }};
+			border-color: {{ template_options.color5 }};
 		}
 
 	</style>
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index 5dba74303..463942ab5 100644
--- a/printing_templates/Two Dives.html	
+++ b/printing_templates/Two Dives.html	
@@ -40,6 +40,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		.table_class {
@@ -52,6 +53,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		.notes_table_class {
@@ -64,14 +66,20 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
+			color: {{ template_options.color3 }};
 			overflow: hidden;
 			padding:0;
 		}
 
+		.fieldData {
+			color: {{ template_options.color4 }};
+		}
+
 		.diveProfile {
 			width: 48%;
 			height: 95%;
@@ -122,7 +130,7 @@
 								<td class="fieldTitle">
 									<h1> Dive No. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.number }} </h1>
 								</td>
 							</tr>
@@ -130,14 +138,15 @@
 								<td class="fieldTitle">
 									<h1> Date </h1>
 								</td>
-									<td><h1> {{ dive.date }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.date }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Location </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.location }} </h1>
 								</td>
 							</tr>
@@ -145,7 +154,7 @@
 								<td class="fieldTitle">
 									<h1> Max depth </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.depth }} </h1>
 								</td>
 							</tr>
@@ -153,7 +162,7 @@
 								<td class="fieldTitle">
 									<h1> Duration </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.duration }} </h1>
 								</td>
 							</tr>
@@ -163,7 +172,7 @@
 								<td class="fieldTitle">
 									<h1> Time. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.time }} </h1>
 								</td>
 							</tr>
@@ -171,14 +180,15 @@
 								<td class="fieldTitle">
 									<h1> Air Temp. </h1>
 								</td>
-									<td><h1> {{ dive.airTemp }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.airTemp }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Water Temp. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.waterTemp }} </h1>
 								</td>
 							</tr>
@@ -186,7 +196,7 @@
 								<td class="fieldTitle">
 									<h1> Buddy </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.buddy }} </h1>
 								</td>
 							</tr>
@@ -194,7 +204,7 @@
 								<td class="fieldTitle">
 									<h1> Dive Master </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.divemaster }} </h1>
 								</td>
 							</tr>
@@ -210,7 +220,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td>
+								<td class="fieldData">
 									<div class="textArea">
 										<h1> {{ dive.notes }} </h1>
 									</div>
-- 
cgit v1.2.3-70-g09d2


From 9c13e7a071e85de5bf71924ebf280a052ea1b64a Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Tue, 4 Aug 2015 08:01:53 +0200
Subject: Printing: enhance templates layout

Make better use of extra spaces, and decrease the margin sizes.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html | 13 ++++++-------
 printing_templates/One Dive.html   |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index 98867d259..f035e2172 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -37,7 +37,7 @@
 			margin-left: 2%;
 			margin-right: 2%;
 			margin-top: 0%;
-			margin-bottom: 0%;
+			margin-bottom: 2%;
 			overflow: hidden;
 			border-width: 0;
 			page-break-inside: avoid;
@@ -60,8 +60,7 @@
 		}
 
 		.dataSection {
-			width: 98%;
-			margin: 1%;
+			width: 100%;
 		}
 
 		.fieldTitle {
@@ -76,14 +75,14 @@
 
 		.table_class {
 			float: left;
-			margin: 1%;
-			width: 48%;
+			margin: 0.5%;
+			width: 49%;
 		}
 
 		.notes_table_class {
 			overflow: hidden;
-			width: 98%;
-			margin: 1%;
+			width: 99%;
+			margin: 0.5%;
 		}
 
 		.textArea {
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index ff0d8cd40..24108c69f 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -86,14 +86,14 @@
 
 		.table_class {
 			float: left;
-			margin: 1%;
-			width: 48%;
+			margin: 0.5%;
+			width: 49%;
 		}
 
 		.notes_table_class {
 			overflow: hidden;
-			width: 98%;
-			margin: 1%;
+			width: 99%;
+			margin: 0.5%;
 		}
 
 		.textArea {
-- 
cgit v1.2.3-70-g09d2


From 11841563d25a18bee5fc5e52139ca3d89d601818 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Wed, 5 Aug 2015 19:18:13 +0200
Subject: Printing: add six dives per page template

Six dives per page templates makes good use of the page area, it can be
mainly used to produce a lightweight print outs.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Six Dives.html | 175 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 printing_templates/Six Dives.html

(limited to 'printing_templates')

diff --git a/printing_templates/Six Dives.html b/printing_templates/Six Dives.html
new file mode 100644
index 000000000..3c64d5ec3
--- /dev/null
+++ b/printing_templates/Six Dives.html	
@@ -0,0 +1,175 @@
+<html>
+<head>
+	<style>
+		body {
+			{{ print_options.grayscale }};
+			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: {{ template_options.font_size }}vw;
+			float: left;
+			margin: 0px;
+		}
+
+		p {
+			font-size: {{ template_options.font_size }}vw;
+			float: left;
+			margin: 0px;
+		}
+
+		td {
+			margin:0px;
+		}
+
+		#footer {
+			height: 100%;
+			width: 100%;
+			float: left;
+		}
+
+		.mainContainer {
+			width: 50%;
+			height: 33.333333%;
+			margin-left: 0%;
+			margin-right: 0%;
+			margin-top: 0;
+			margin-bottom: 0;
+			overflow: hidden;
+			page-break-inside: avoid;
+			float: left;
+		}
+
+		.innerContainer {
+			height: 98%;
+			width: 98%;
+			padding: 0%;
+			margin-top: 1%;
+			margin-bottom: 1%;
+			overflow: hidden;
+			background-color: {{ template_options.color1 }};
+		}
+
+		.table_class {
+			overflow: hidden;
+			width: 100%;
+			margin: 0%;
+			float: left;
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+			border:max(0.1vw, 1px);
+			border-style:solid;
+			border-color: {{ template_options.color5 }};
+			font-size: {{ template_options.font_size }}vw;
+		}
+
+		.notes_table_class {
+			overflow: hidden;
+			max-width: 100%;
+			min-width: 100%;
+			margin: 0.5%;
+			float: left;
+		}
+
+		.diveProfile {
+			width: 100%;
+			height: 95%;
+			margin-left: 0%;
+			margin-right: 0%;
+			margin-bottom: 0%;
+			margin-top: 0.5%;
+			float: right;
+		}
+
+		.diveDetails {
+			width: 98.5%;
+			float: left;
+		}
+
+		.dataPart {
+			height: 45%;
+			max-height: 60%;
+		}
+
+		.dataSection{
+			width: 100%;
+		}
+
+		.textArea {
+			overflow: hidden !important;
+			text-overflow: ellipsis;
+			line-height: {{ template_options.line_spacing }};
+		}
+	</style>
+</head>
+<body data-numberofdives = 6>
+<div id="body_div">
+{% block main_rows %}
+	{% for dive in dives %}
+		<div class="mainContainer">
+			<div class="innerContainer">
+				<div class="diveDetails">
+					<div class="dataPart">
+						<div class="diveProfile" id="dive_{{ dive.id }}">
+						</div>
+						<div class="dataSection">
+							<table style="float:left;width:100%;">
+								<tr>
+									<td>
+										<h1> Dive # {{ dive.number }} - {{ dive.date }} {{ dive.time }}</h1>
+										<p style="float:right;"> Max depth: {{ dive.depth }} </p>
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<p> {{ dive.location }} </p> 
+										<p  style="float:right;"> Duration: {{ dive.duration }} </p>
+									</td>
+								</tr>
+							</table>
+							<table class="table_class">
+								<tr>
+									<td> Gas used: {{ dive.gas }}</td>
+									<td> Tags: {{ dive.tags }}</td>
+									<td> SAC: {{ dive.sac }}</td>
+								</tr>
+								<tr>
+									<td> Divemaster: {{ dive.divemaster }}</td>
+									<td> Buddy: {{ dive.buddy }}</td>
+									<td> Rating: {{ dive.rating }}/5</td>
+								</tr>
+							</table>
+						</div>
+					</div>
+					<div class="notesPart">
+						<table class="notes_table_class">
+							<tbody>
+								<tr>
+									<td>
+										<p> Notes: </p>
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<div class="textArea">
+											<p> {{ dive.notes }} </p>
+										</div>
+									</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+		</div>
+	{% endfor %}
+{% endblock %}
+</div>
+<div id="footer">
+</div>
+</body>
+</html>
-- 
cgit v1.2.3-70-g09d2


From e0ecccfa7bebaebb532d532f9a40b8d85facdecc Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Fri, 7 Aug 2015 09:53:34 +0200
Subject: Printing: fix color numbers in printing templates

After adding the additional 'Table Cells 2' color to the color palette
fix the colors assigned to each field.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html |  8 ++++----
 printing_templates/One Dive.html   | 10 +++++-----
 printing_templates/Six Dives.html  |  2 +-
 printing_templates/Table.html      |  6 +++---
 printing_templates/Two Dives.html  | 10 +++++-----
 5 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index f035e2172..cab684e7e 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -20,7 +20,7 @@
 			box-sizing: border-box;
 			border:max(1px, 0.1vw);
 			border-style:solid;
-			border-color: {{ template_options.color5 }};
+			border-color: {{ template_options.color6 }};
 		}
 
 		td {
@@ -55,7 +55,7 @@
 			box-sizing: border-box;
 			border:max(1px, 0.1vw);
 			border-style:solid;
-			border-color: {{ template_options.color5 }};
+			border-color: {{ template_options.color6 }};
 			float: left;
 		}
 
@@ -66,11 +66,11 @@
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
 			overflow: hidden;
-			color: {{ template_options.color3 }};
+			color: {{ template_options.color4 }};
 		}
 
 		.fieldData {
-			color: {{ template_options.color4 }};
+			color: {{ template_options.color5 }};
 		}
 
 		.table_class {
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 24108c69f..bdf7ab3a7 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -20,7 +20,7 @@
 			box-sizing: border-box;
 			border:max(1px, 0.1vw);
 			border-style:solid;
-			border-color: {{ template_options.color5 }};
+			border-color: {{ template_options.color6 }};
 		}
 
 		td {
@@ -58,7 +58,7 @@
 			box-sizing: border-box; 
 			border:max(1px, 0.1vw);
 			border-style:solid;
-			border-color: {{ template_options.color5 }};
+			border-color: {{ template_options.color6 }};
 			float: left;
 		}
 
@@ -77,11 +77,11 @@
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
 			overflow: hidden;
-			color: {{ template_options.color3 }};
+			color: {{ template_options.color4 }};
 		}
 
 		.fieldData {
-			color: {{ template_options.color4 }};
+			color: {{ template_options.color5 }};
 		}
 
 		.table_class {
@@ -98,7 +98,7 @@
 
 		.textArea {
 			line-height: {{ template_options.line_spacing }};
-			color: {{ template_options.color4 }};
+			color: {{ template_options.color5 }};
 			max-height: 19vh;
 			overflow: hidden;
 		}
diff --git a/printing_templates/Six Dives.html b/printing_templates/Six Dives.html
index 3c64d5ec3..65d81f1cb 100644
--- a/printing_templates/Six Dives.html	
+++ b/printing_templates/Six Dives.html	
@@ -63,7 +63,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
-			border-color: {{ template_options.color5 }};
+			border-color: {{ template_options.color6 }};
 			font-size: {{ template_options.font_size }}vw;
 		}
 
diff --git a/printing_templates/Table.html b/printing_templates/Table.html
index 2668ccb62..3cf65be96 100644
--- a/printing_templates/Table.html
+++ b/printing_templates/Table.html
@@ -47,7 +47,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
-			border-color: {{ template_options.color5 }};
+			border-color: {{ template_options.color6 }};
 		}
 
 	</style>
@@ -55,7 +55,7 @@
 <body data-numberofdives = 0>
 <div id="body_div">
 <table class="table_class">
-	<tr style="background-color: {{ template_options.color2 }}; color: {{ template_options.color3 }}">
+	<tr style="background-color: {{ template_options.color2 }}; color: {{ template_options.color4 }}">
 		<th>Dive #</th>
 		<th>Date</th>
 		<th>Time</th>
@@ -66,7 +66,7 @@
 	</tr>
 {% block main_rows %}
 	{% for dive in dives %}
-		<tr style="color: {{ template_options.color4 }}">
+		<tr style="color: {{ template_options.color5 }}">
 			<th>{{ dive.number }}</th>
 			<th>{{ dive.date }}</th>
 			<th>{{ dive.time }}</th>
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index 463942ab5..288a20262 100644
--- a/printing_templates/Two Dives.html	
+++ b/printing_templates/Two Dives.html	
@@ -40,7 +40,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
-			border-color: {{ template_options.color5 }};
+			border-color: {{ template_options.color6 }};
 		}
 
 		.table_class {
@@ -53,7 +53,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
-			border-color: {{ template_options.color5 }};
+			border-color: {{ template_options.color6 }};
 		}
 
 		.notes_table_class {
@@ -66,18 +66,18 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
-			border-color: {{ template_options.color5 }};
+			border-color: {{ template_options.color6 }};
 		}
 
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
-			color: {{ template_options.color3 }};
+			color: {{ template_options.color4 }};
 			overflow: hidden;
 			padding:0;
 		}
 
 		.fieldData {
-			color: {{ template_options.color4 }};
+			color: {{ template_options.color5 }};
 		}
 
 		.diveProfile {
-- 
cgit v1.2.3-70-g09d2


From 04fc07405a9931ee78292e1fef10c3a0b779734a Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Fri, 7 Aug 2015 10:07:57 +0200
Subject: Printing: add color3 to templates and make it effective

Use the added color for 'Table cells 2'

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html | 1 +
 printing_templates/One Dive.html   | 1 +
 printing_templates/Table.html      | 2 +-
 printing_templates/Two Dives.html  | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index cab684e7e..c5b1d4ba9 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -71,6 +71,7 @@
 
 		.fieldData {
 			color: {{ template_options.color5 }};
+			background-color: {{ template_options.color3 }};
 		}
 
 		.table_class {
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index bdf7ab3a7..4bf15decd 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -81,6 +81,7 @@
 		}
 
 		.fieldData {
+			background-color: {{ template_options.color3 }};
 			color: {{ template_options.color5 }};
 		}
 
diff --git a/printing_templates/Table.html b/printing_templates/Table.html
index 3cf65be96..c21fc3f33 100644
--- a/printing_templates/Table.html
+++ b/printing_templates/Table.html
@@ -66,7 +66,7 @@
 	</tr>
 {% block main_rows %}
 	{% for dive in dives %}
-		<tr style="color: {{ template_options.color5 }}">
+		<tr style="background-color: {{ template_options.color3 }}; color: {{ template_options.color5 }};">
 			<th>{{ dive.number }}</th>
 			<th>{{ dive.date }}</th>
 			<th>{{ dive.time }}</th>
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index 288a20262..f3ecccebd 100644
--- a/printing_templates/Two Dives.html	
+++ b/printing_templates/Two Dives.html	
@@ -78,6 +78,7 @@
 
 		.fieldData {
 			color: {{ template_options.color5 }};
+			background-color: {{ template_options.color3 }};
 		}
 
 		.diveProfile {
-- 
cgit v1.2.3-70-g09d2


From ebd83b15dad4343d38bf5485b2308f0e5c079120 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Fri, 7 Aug 2015 15:16:32 +0200
Subject: Printing: make the actual data font width regular (not bold)

The actual data needs to be regular font not a bold font, so use <p>
instead of <h1> tag for the actual data fields.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html | 27 ++++++++++++++++-----------
 printing_templates/One Dive.html   | 27 ++++++++++++++++-----------
 printing_templates/Two Dives.html  | 27 ++++++++++++++++-----------
 3 files changed, 48 insertions(+), 33 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index c5b1d4ba9..3141d0f3e 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -15,6 +15,11 @@
 			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;
@@ -108,7 +113,7 @@
 									<h1> Dive No. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.number }} </h1>
+									<p> {{ dive.number }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -116,7 +121,7 @@
 									<h1> Date </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.date }} </h1>
+									<p> {{ dive.date }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -124,7 +129,7 @@
 									<h1> Location </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.location }} </h1>
+									<p> {{ dive.location }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -132,7 +137,7 @@
 									<h1> Max depth </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.depth }} </h1>
+									<p> {{ dive.depth }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -140,7 +145,7 @@
 									<h1> Duration </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.duration }} </h1>
+									<p> {{ dive.duration }} </p>
 								</td>
 							</tr>
 						</tbody></table>
@@ -150,7 +155,7 @@
 									<h1> Time. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.time }} </h1>
+									<p> {{ dive.time }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -158,7 +163,7 @@
 									<h1> Air Temp. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.airTemp }} </h1>
+									<p> {{ dive.airTemp }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -166,7 +171,7 @@
 									<h1> Water Temp. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.waterTemp }} </h1>
+									<p> {{ dive.waterTemp }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -174,7 +179,7 @@
 									<h1> Buddy </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.buddy }} </h1>
+									<p> {{ dive.buddy }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -182,7 +187,7 @@
 									<h1> Dive Master </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.divemaster }} </h1>
+									<p> {{ dive.divemaster }} </p>
 								</td>
 							</tr>
 							</tbody>
@@ -197,7 +202,7 @@
 							<tr>
 								<td>
 									<div class="textArea">
-										<h1> {{ dive.notes }} </h1>
+										<p> {{ dive.notes }} </p>
 									</div>
 								</td>
 							</tr>
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 4bf15decd..362af29eb 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -15,6 +15,11 @@
 			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;
@@ -121,7 +126,7 @@
 									<h1> Dive No. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.number }} </h1>
+									<p> {{ dive.number }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -129,7 +134,7 @@
 									<h1> Date </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.date }} </h1>
+									<p> {{ dive.date }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -137,7 +142,7 @@
 									<h1> Location </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.location }} </h1>
+									<p> {{ dive.location }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -145,7 +150,7 @@
 									<h1> Max depth </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.depth }} </h1>
+									<p> {{ dive.depth }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -153,7 +158,7 @@
 									<h1> Duration </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.duration }} </h1>
+									<p> {{ dive.duration }} </p>
 								</td>
 							</tr>
 						</tbody></table>
@@ -163,7 +168,7 @@
 									<h1> Time. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.time }} </h1>
+									<p> {{ dive.time }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -171,7 +176,7 @@
 									<h1> Air Temp. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.airTemp }} </h1>
+									<p> {{ dive.airTemp }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -179,7 +184,7 @@
 									<h1> Water Temp. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.waterTemp }} </h1>
+									<p> {{ dive.waterTemp }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -187,7 +192,7 @@
 									<h1> Buddy </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.buddy }} </h1>
+									<p> {{ dive.buddy }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -195,7 +200,7 @@
 									<h1> Dive Master </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.divemaster }} </h1>
+									<p> {{ dive.divemaster }} </p>
 								</td>
 							</tr>
 							</tbody>
@@ -210,7 +215,7 @@
 							<tr>
 								<td>
 									<div class="textArea">
-										<h1> {{ dive.notes }} </h1>
+										<p> {{ dive.notes }} </p>
 									</div>
 								</td>
 							</tr>
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index f3ecccebd..ed1013e18 100644
--- a/printing_templates/Two Dives.html	
+++ b/printing_templates/Two Dives.html	
@@ -15,6 +15,11 @@
 			float: left;
 		}
 
+		p {
+			font-size: {{ template_options.font_size }}vw;
+			float: left;
+		}
+
 		#body_div {
 			background-color: {{ template_options.color1 }};
 		}
@@ -132,7 +137,7 @@
 									<h1> Dive No. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.number }} </h1>
+									<p> {{ dive.number }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -140,7 +145,7 @@
 									<h1> Date </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.date }} </h1>
+									<p> {{ dive.date }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -148,7 +153,7 @@
 									<h1> Location </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.location }} </h1>
+									<p> {{ dive.location }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -156,7 +161,7 @@
 									<h1> Max depth </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.depth }} </h1>
+									<p> {{ dive.depth }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -164,7 +169,7 @@
 									<h1> Duration </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.duration }} </h1>
+									<p> {{ dive.duration }} </p>
 								</td>
 							</tr>
 						</tbody></table>
@@ -174,7 +179,7 @@
 									<h1> Time. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.time }} </h1>
+									<p> {{ dive.time }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -182,7 +187,7 @@
 									<h1> Air Temp. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.airTemp }} </h1>
+									<p> {{ dive.airTemp }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -190,7 +195,7 @@
 									<h1> Water Temp. </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.waterTemp }} </h1>
+									<p> {{ dive.waterTemp }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -198,7 +203,7 @@
 									<h1> Buddy </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.buddy }} </h1>
+									<p> {{ dive.buddy }} </p>
 								</td>
 							</tr>
 							<tr>
@@ -206,7 +211,7 @@
 									<h1> Dive Master </h1>
 								</td>
 								<td class="fieldData">
-									<h1> {{ dive.divemaster }} </h1>
+									<p> {{ dive.divemaster }} </p>
 								</td>
 							</tr>
 						</tbody></table>
@@ -223,7 +228,7 @@
 							<tr>
 								<td class="fieldData">
 									<div class="textArea">
-										<h1> {{ dive.notes }} </h1>
+										<p> {{ dive.notes }} </p>
 									</div>
 								</td>
 							</tr>
-- 
cgit v1.2.3-70-g09d2


From dc56d1fa54e97d562a7b4df166faadf0b73e410c Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Fri, 7 Aug 2015 16:45:07 +0200
Subject: Printing: remove the outer most border for all templates

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html | 5 -----
 printing_templates/One Dive.html   | 5 -----
 printing_templates/Two Dives.html  | 5 -----
 3 files changed, 15 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index 3141d0f3e..a322738ba 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -56,11 +56,6 @@
 
 		.diveDetails {
 			width: 98%;
-			-webkit-box-sizing: border-box;
-			box-sizing: border-box;
-			border:max(1px, 0.1vw);
-			border-style:solid;
-			border-color: {{ template_options.color6 }};
 			float: left;
 		}
 
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 362af29eb..92ab3cf84 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -59,11 +59,6 @@
 		.diveDetails {
 			width: 98%;
 			height: 98%;
-			-webkit-box-sizing: border-box;
-			box-sizing: border-box; 
-			border:max(1px, 0.1vw);
-			border-style:solid;
-			border-color: {{ template_options.color6 }};
 			float: left;
 		}
 
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index ed1013e18..66b5bf46d 100644
--- a/printing_templates/Two Dives.html	
+++ b/printing_templates/Two Dives.html	
@@ -41,11 +41,6 @@
 			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;
-			border-color: {{ template_options.color6 }};
 		}
 
 		.table_class {
-- 
cgit v1.2.3-70-g09d2


From d72ba4f15a2616888a777bf2b70c7df639979f31 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Sat, 8 Aug 2015 01:39:46 +0200
Subject: Printing: remove templates additional margins

Remove extra margins and paddings in templates.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html | 14 +++++++-------
 printing_templates/One Dive.html   | 22 +++++++++++-----------
 printing_templates/Six Dives.html  |  4 ++--
 printing_templates/Table.html      | 10 +++++-----
 printing_templates/Two Dives.html  | 15 ++++++---------
 5 files changed, 31 insertions(+), 34 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index a322738ba..2686d8c66 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -38,9 +38,9 @@
 		}
 
 		.mainContainer {
-			width: 96%;
-			margin-left: 2%;
-			margin-right: 2%;
+			width: 100%;
+			margin-left: 0%;
+			margin-right: 0%;
 			margin-top: 0%;
 			margin-bottom: 2%;
 			overflow: hidden;
@@ -49,13 +49,13 @@
 		}
 
 		.innerContainer {
-			width: 98%;
-			padding: 1%;
+			width: 100%;
+			padding: 0%;
 			overflow: hidden;
 		}
 
 		.diveDetails {
-			width: 98%;
+			width: 100%;
 			float: left;
 		}
 
@@ -76,8 +76,8 @@
 
 		.table_class {
 			float: left;
+			width: 49.25%;
 			margin: 0.5%;
-			width: 49%;
 		}
 
 		.notes_table_class {
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 92ab3cf84..546fc2f07 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -38,10 +38,10 @@
 		}
 
 		.mainContainer {
-			width: 96%;
+			width: 98%;
 			height: 100%;
-			margin-left: 2%;
-			margin-right: 2%;
+			margin-left: 1%;
+			margin-right: 1%;
 			margin-top: 0%;
 			margin-bottom: 0%;
 			overflow: hidden;
@@ -50,28 +50,28 @@
 		}
 
 		.innerContainer {
-			width: 98%;
-			height: 98%;
-			padding: 1%;
+			width: 100%;
+			height: 100%;
+			padding: 0%;
 			overflow: hidden;
 		}
 
 		.diveDetails {
-			width: 98%;
+			width: 100%;
 			height: 98%;
 			float: left;
 		}
 
 		.diveProfile {
-			width: 96%;
+			width: 99%;
 			height: 40%;
-			margin: 2%;
+			margin: 0.5%;
 		}
 
 		.dataSection {
-			width: 98%;
+			width: 100%;
 			height: 40%;
-			margin: 1%;
+			margin: 0%;
 		}
 
 		.fieldTitle {
diff --git a/printing_templates/Six Dives.html b/printing_templates/Six Dives.html
index 65d81f1cb..1d3966d3b 100644
--- a/printing_templates/Six Dives.html	
+++ b/printing_templates/Six Dives.html	
@@ -47,7 +47,7 @@
 		.innerContainer {
 			height: 98%;
 			width: 98%;
-			padding: 0%;
+			padding: 1%;
 			margin-top: 1%;
 			margin-bottom: 1%;
 			overflow: hidden;
@@ -86,7 +86,7 @@
 		}
 
 		.diveDetails {
-			width: 98.5%;
+			width: 100%;
 			float: left;
 		}
 
diff --git a/printing_templates/Table.html b/printing_templates/Table.html
index c21fc3f33..4d692ef21 100644
--- a/printing_templates/Table.html
+++ b/printing_templates/Table.html
@@ -28,10 +28,10 @@
 		}
 
 		.mainContainer {
-			width: 96%;
+			width: 99%;
 			height: 100%;
-			margin-left: 2%;
-			margin-right: 2%;
+			margin-left: 0.5%;
+			margin-right: 0.5%;
 			margin-top: 0%;
 			margin-bottom: 0%;
 			overflow: hidden;
@@ -41,8 +41,8 @@
 
 		.table_class {
 			overflow: hidden;
-			width: 97%;
-			margin: 1.5%;
+			width: 100%;
+			margin: 0%;
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index 66b5bf46d..eb68cd18d 100644
--- a/printing_templates/Two Dives.html	
+++ b/printing_templates/Two Dives.html	
@@ -25,10 +25,10 @@
 		}
 
 		.mainContainer {
-			width: 96%;
+			width: 99%;
 			height: 50%;
-			margin-left: 2%;
-			margin-right: 2%;
+			margin-left: 0.5%;
+			margin-right: 0.5%;
 			margin-top: 0;
 			margin-bottom: 0;
 			overflow: hidden;
@@ -37,7 +37,6 @@
 
 		.innerContainer {
 			height: 85%;
-			padding: 0.5%;
 			margin-top: 1%;
 			margin-bottom: 1%;
 			overflow: hidden;
@@ -45,8 +44,7 @@
 
 		.table_class {
 			overflow: hidden;
-			max-width: 25%;
-			min-width: 25%;
+			width: 25%;
 			margin: 0.5%;
 			float: left;
 			-webkit-box-sizing: border-box;
@@ -58,8 +56,7 @@
 
 		.notes_table_class {
 			overflow: hidden;
-			max-width: 100%;
-			min-width: 100%;
+			width: 99%;
 			margin: 0.5%;
 			float: left;
 			-webkit-box-sizing: border-box;
@@ -92,7 +89,7 @@
 		}
 
 		.diveDetails {
-			width: 98.5%;
+			width: 100%;
 			float: left;
 		}
 
-- 
cgit v1.2.3-70-g09d2


From cfa34cc0221c206d00c8a8f40a1b0dfddb29aacd Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Mon, 10 Aug 2015 17:59:18 +0200
Subject: Printing: add more padding on the top of the profile

add more padding on the top of the profile so that the
left-right-top padding around the profile is the same.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/One Dive.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 546fc2f07..176698616 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -51,8 +51,8 @@
 
 		.innerContainer {
 			width: 100%;
-			height: 100%;
-			padding: 0%;
+			height: 99%;
+			padding-top: 1%;
 			overflow: hidden;
 		}
 
-- 
cgit v1.2.3-70-g09d2


From d7f1a6b96e27999795798d066adb1cc8a1887ec3 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Mon, 10 Aug 2015 19:35:42 +0200
Subject: Printing: remove extra white spaces from 6 dives template

The are some rounding errors in the 6 dives template.
Solve them them by adding the color to the main body div.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Six Dives.html | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Six Dives.html b/printing_templates/Six Dives.html
index 1d3966d3b..2bf23a145 100644
--- a/printing_templates/Six Dives.html	
+++ b/printing_templates/Six Dives.html	
@@ -32,6 +32,11 @@
 			float: left;
 		}
 
+		#body_div {
+			background-color: {{ template_options.color1 }};
+			float: left;
+		}
+
 		.mainContainer {
 			width: 50%;
 			height: 33.333333%;
@@ -45,13 +50,12 @@
 		}
 
 		.innerContainer {
-			height: 98%;
+			height: 99%;
 			width: 98%;
-			padding: 1%;
-			margin-top: 1%;
-			margin-bottom: 1%;
+			padding-left: 1%;
+			padding-right: 1%;
+			padding-top: 1%;
 			overflow: hidden;
-			background-color: {{ template_options.color1 }};
 		}
 
 		.table_class {
@@ -81,7 +85,7 @@
 			margin-left: 0%;
 			margin-right: 0%;
 			margin-bottom: 0%;
-			margin-top: 0.5%;
+			margin-top: 0%;
 			float: right;
 		}
 
@@ -168,8 +172,8 @@
 		</div>
 	{% endfor %}
 {% endblock %}
-</div>
 <div id="footer">
 </div>
+</div>
 </body>
 </html>
-- 
cgit v1.2.3-70-g09d2


From efe8dc9b5771fe51171060170ac002c82f29e317 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Mon, 10 Aug 2015 20:06:43 +0200
Subject: Printing: remove the outer border from table template

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Table.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Table.html b/printing_templates/Table.html
index 4d692ef21..0a65b2a92 100644
--- a/printing_templates/Table.html
+++ b/printing_templates/Table.html
@@ -21,6 +21,11 @@
 			-webkit-column-break-inside: avoid;
 			padding-top: 1vh;
 			padding-bottom: 1vh;
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+			border:max(1px, 0.1vw);
+			border-style:solid;
+			border-color: {{ template_options.color6 }};
 		}
 
 		#body_div {
@@ -43,11 +48,6 @@
 			overflow: hidden;
 			width: 100%;
 			margin: 0%;
-			-webkit-box-sizing: border-box;
-			box-sizing: border-box;
-			border:max(0.1vw, 1px);
-			border-style:solid;
-			border-color: {{ template_options.color6 }};
 		}
 
 	</style>
-- 
cgit v1.2.3-70-g09d2


From 72b35d8e79e8d404b4dc0d47d9a9af82958be718 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Tue, 11 Aug 2015 23:02:00 +0200
Subject: Printing: use border width from Grantlee backend

Find the border-width dynamically from the Grantlee backend.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html | 2 +-
 printing_templates/One Dive.html   | 2 +-
 printing_templates/Six Dives.html  | 2 +-
 printing_templates/Table.html      | 2 +-
 printing_templates/Two Dives.html  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index 2686d8c66..cb136c3f2 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -23,7 +23,7 @@
 		table {
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
-			border:max(1px, 0.1vw);
+			border-width: {{ template_options.borderwidth }}px;
 			border-style:solid;
 			border-color: {{ template_options.color6 }};
 		}
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 176698616..0014c4680 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -23,7 +23,7 @@
 		table {
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
-			border:max(1px, 0.1vw);
+			border-width: {{ template_options.borderwidth }}px;
 			border-style:solid;
 			border-color: {{ template_options.color6 }};
 		}
diff --git a/printing_templates/Six Dives.html b/printing_templates/Six Dives.html
index 2bf23a145..5b2652f05 100644
--- a/printing_templates/Six Dives.html	
+++ b/printing_templates/Six Dives.html	
@@ -65,7 +65,7 @@
 			float: left;
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
-			border:max(0.1vw, 1px);
+			border-width: {{ template_options.borderwidth }}px;
 			border-style:solid;
 			border-color: {{ template_options.color6 }};
 			font-size: {{ template_options.font_size }}vw;
diff --git a/printing_templates/Table.html b/printing_templates/Table.html
index 0a65b2a92..173904faf 100644
--- a/printing_templates/Table.html
+++ b/printing_templates/Table.html
@@ -23,7 +23,7 @@
 			padding-bottom: 1vh;
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
-			border:max(1px, 0.1vw);
+			border-width: {{ template_options.borderwidth }}px;
 			border-style:solid;
 			border-color: {{ template_options.color6 }};
 		}
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index eb68cd18d..13cb5cff6 100644
--- a/printing_templates/Two Dives.html	
+++ b/printing_templates/Two Dives.html	
@@ -49,7 +49,7 @@
 			float: left;
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
-			border:max(0.1vw, 1px);
+			border-width: {{ template_options.borderwidth }}px;
 			border-style:solid;
 			border-color: {{ template_options.color6 }};
 		}
@@ -61,7 +61,7 @@
 			float: left;
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
-			border:max(0.1vw, 1px);
+			border-width: {{ template_options.borderwidth }}px;
 			border-style:solid;
 			border-color: {{ template_options.color6 }};
 		}
-- 
cgit v1.2.3-70-g09d2


From c862636cf049321d73508ea10fe823aed64affa9 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Thu, 13 Aug 2015 23:23:33 +0200
Subject: Printing: add 'dontbreak' css class to dives

Prevent breaking the dives in flowlayout, and the rows
in the table template. They should have the 'dontbreak'
css selector.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html | 2 +-
 printing_templates/Table.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index cb136c3f2..a69494ce3 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -98,7 +98,7 @@
 <div id="body_div">
 {% block main_rows %}
 	{% for dive in dives %}
-		<div class="mainContainer">
+		<div class="mainContainer dontbreak">
 			<div class="innerContainer">
 				<div class="diveDetails">
 					<div class="dataSection">
diff --git a/printing_templates/Table.html b/printing_templates/Table.html
index 173904faf..e4d921fae 100644
--- a/printing_templates/Table.html
+++ b/printing_templates/Table.html
@@ -66,7 +66,7 @@
 	</tr>
 {% block main_rows %}
 	{% for dive in dives %}
-		<tr style="background-color: {{ template_options.color3 }}; color: {{ template_options.color5 }};">
+		<tr class="dontbreak" style="background-color: {{ template_options.color3 }}; color: {{ template_options.color5 }};">
 			<th>{{ dive.number }}</th>
 			<th>{{ dive.date }}</th>
 			<th>{{ dive.time }}</th>
-- 
cgit v1.2.3-70-g09d2


From 4f9349f5487d59627b8b27875275c70c7fc913b1 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Thu, 13 Aug 2015 23:38:20 +0200
Subject: Printing: use the same background for all the data cells flow layout

Dive notes should have the same background as the remaining data cells.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Flowlayout.html | 2 +-
 printing_templates/One Dive.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index a69494ce3..2615c35a8 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -195,7 +195,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td>
+								<td class="fieldData">
 									<div class="textArea">
 										<p> {{ dive.notes }} </p>
 									</div>
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 0014c4680..020c67b30 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -208,7 +208,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td>
+								<td class="fieldData">
 									<div class="textArea">
 										<p> {{ dive.notes }} </p>
 									</div>
-- 
cgit v1.2.3-70-g09d2


From 2d360e8a6d99b510f06d42a1590ecafe7c3c7896 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Fri, 14 Aug 2015 02:05:31 +0200
Subject: Printing: add table backgrounds and borders to six dives template

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Six Dives.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'printing_templates')

diff --git a/printing_templates/Six Dives.html b/printing_templates/Six Dives.html
index 5b2652f05..3f2c7b95e 100644
--- a/printing_templates/Six Dives.html	
+++ b/printing_templates/Six Dives.html	
@@ -8,6 +8,7 @@
 			font-size: {{ template_options.font_size }}vw;
 			line-height: {{ template_options.line_spacing }};
 			font-family: {{ template_options.font }};
+			color: {{ template_options.color4 }};
 		}
 
 		h1 {
@@ -69,6 +70,8 @@
 			border-style:solid;
 			border-color: {{ template_options.color6 }};
 			font-size: {{ template_options.font_size }}vw;
+			background-color: {{ template_options.color3 }};
+			color: {{ template_options.color4 }};
 		}
 
 		.notes_table_class {
-- 
cgit v1.2.3-70-g09d2


From f7fcc96bff2ca9965a4edfd61524a13cb5e2c183 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Fri, 14 Aug 2015 21:15:07 +0200
Subject: Printing: enhance 2 dives template

- Add more text padding on the left
- Reduce the width of the profile so that the padding on the right of it
is equal to the padding bottom from it.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
---
 printing_templates/Two Dives.html | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'printing_templates')

diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index 13cb5cff6..95cc9a088 100644
--- a/printing_templates/Two Dives.html	
+++ b/printing_templates/Two Dives.html	
@@ -45,6 +45,7 @@
 		.table_class {
 			overflow: hidden;
 			width: 25%;
+			height: 99%;
 			margin: 0.5%;
 			float: left;
 			-webkit-box-sizing: border-box;
@@ -58,7 +59,6 @@
 			overflow: hidden;
 			width: 99%;
 			margin: 0.5%;
-			float: left;
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
 			border-width: {{ template_options.borderwidth }}px;
@@ -69,23 +69,20 @@
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
 			color: {{ template_options.color4 }};
-			overflow: hidden;
-			padding:0;
+			padding-left: 2%;
 		}
 
 		.fieldData {
 			color: {{ template_options.color5 }};
 			background-color: {{ template_options.color3 }};
+			padding-left: 2%;
 		}
 
 		.diveProfile {
-			width: 48%;
-			height: 95%;
-			margin-left: 0%;
-			margin-right: 0%;
-			margin-bottom: 0%;
-			margin-top: 0.5%;
-			float: right;
+			float: left;
+			height: 99%;
+			width: 47%;
+			margin: 0.5%;
 		}
 
 		.diveDetails {
@@ -94,12 +91,16 @@
 		}
 
 		.dataPart {
-			height: 45%;
-			max-height: 60%;
+			height: 64%;
+			padding-bottom: 1%;
+			width: 100%;
+			float: left;
 		}
 
 		.notesPart {
 			height: 35%;
+			width: 100%;
+			float: left;
 		}
 
 		.textArea {
@@ -213,7 +214,7 @@
 					<div class="notesPart">
 						<table class="notes_table_class">
 							<tbody><tr>
-								<td class="fieldTitle">
+								<td style="padding-left:1%" class="fieldTitle">
 									<h1> Notes </h1>
 								</td>
 							</tr>
@@ -232,7 +233,7 @@
 	{% endfor %}
 {% endblock %}
 <div id="footer">
-<div>
+</div>
 </div>
 </body>
 </html>
-- 
cgit v1.2.3-70-g09d2