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/Table.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'printing_templates/Table.html')

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>
-- 
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/Table.html')

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/Table.html')

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 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/Table.html')

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 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/Table.html')

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/Table.html')

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/Table.html')

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