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: [PATCH] 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(-)

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>