From 19a6c04496105a9d2f27c64df4f2c9dac648f6e4 Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 11 Apr 2023 17:02:04 -0400
Subject: [PATCH] templates: remove calc, do all through jinja

---
 src/wireviz/templates/bom.html        |  2 +-
 src/wireviz/templates/din-6771.html   | 11 +++++++++--
 src/wireviz/templates/notes.html      |  8 ++++----
 src/wireviz/templates/titleblock.html |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/wireviz/templates/bom.html b/src/wireviz/templates/bom.html
index 380762d..dbf7ef3 100644
--- a/src/wireviz/templates/bom.html
+++ b/src/wireviz/templates/bom.html
@@ -1,7 +1,7 @@
 <style>
   .A4 #bom { /* BOM on top of title block */
     position: absolute;
-    bottom: calc({{ titleblock_rows + 1 }} * 4.25mm);
+    bottom: {{ (titleblock_rows + 1)  * 4.25 }}mm;
     right: 0;
   }
 
diff --git a/src/wireviz/templates/din-6771.html b/src/wireviz/templates/din-6771.html
index a48a0ff..a5b70dd 100644
--- a/src/wireviz/templates/din-6771.html
+++ b/src/wireviz/templates/din-6771.html
@@ -67,11 +67,18 @@
       top: 0;
       left: 0;
       max-width: 100%;
-      height: calc(100% - {{ bottom_rows }}  * 4.25mm);
       text-align: center;
       vertical-align: middle;
     }
 
+    #diagram {
+      {% if sheetsize == A2 %}
+        height: {{ 400 - bottom_rows * 4.25 }}mm;
+      {% else %}
+        height: {{ 277 - bottom_rows * 4.25 }}mm;
+      {% endif %}
+    }
+
     #diagram svg, #diagram img {
       max-width: 95%;
       max-height: 100%;
@@ -104,7 +111,7 @@
         {{ description }}
       </div>
 
-      <div id="diagram">
+      <div id="diagram" class={{ sheetsize }}>
         {{ diagram }}
       </div>
 
diff --git a/src/wireviz/templates/notes.html b/src/wireviz/templates/notes.html
index e24e518..a9f2324 100644
--- a/src/wireviz/templates/notes.html
+++ b/src/wireviz/templates/notes.html
@@ -2,9 +2,9 @@
   .A4 #notes { /* NOTES on top of BOM */
     position: absolute;
     {% if show_bom %}
-    bottom: calc({{ titleblock_rows + bom_rows + 2 }} * 4.25mm);
+    bottom: {{ (titleblock_rows + bom_rows + 2) * 4.25 }}mm;
     {% else %}
-    bottom: calc({{ titleblock_rows + 1 }} * 4.25mm);
+    bottom: {{ (titleblock_rows + 1) * 4.25 }}mm;
     {% endif %}
     right: 0;
   }
@@ -12,11 +12,11 @@
   .A3 #notes, .A2 #notes { /* NOTES on top of title block */
     position: absolute;
     {% if notes_on_right %}
-    bottom: calc({{ titleblock_rows + 1 }} * 4.25mm);
+    bottom: {{ (titleblock_rows + 1) * 4.25 }}mm;
     right: 0;
     {% else %}
     {% if show_bom %}
-    bottom: calc({{ bom_rows + 1 }} * 4.25mm);
+    bottom: {{ (bom_rows + 1) * 4.25 }}mm;
     {% else %}
     bottom: 0;
     {% endif %}
diff --git a/src/wireviz/templates/titleblock.html b/src/wireviz/templates/titleblock.html
index eab7424..b18c6d1 100644
--- a/src/wireviz/templates/titleblock.html
+++ b/src/wireviz/templates/titleblock.html
@@ -7,7 +7,7 @@
 
   #titleblock {
     width: 180mm;
-    height: calc({{ titleblock_rows }} * 4.25mm));
+    height: {{ titleblock_rows * 4.25 }}mm;
   }
 
   #titleblock table, th, td {
@@ -108,7 +108,7 @@
 
 <!-- START OF TEMPLATE --!>
 <div id="titleblock">
-  <table id="titleblock">
+  <table>
     <tr> <!-- ROW 1 --!>
       <!-- REVISIONS            Column 1 to 4 --!>
       {{ revision(1) }}