# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1536154700 -7200
# Node ID a17c644a0510af5901c492c6b027af55800bed88
# Parent  b1f2a893572fa3a4b21d6b3d6ec5b43e72674075
Added waters total table

diff -r b1f2a893572f -r a17c644a0510 www/css/style.css
--- a/www/css/style.css	Tue Sep 04 23:12:13 2018 +0200
+++ b/www/css/style.css	Wed Sep 05 15:38:20 2018 +0200
@@ -19,12 +19,23 @@
 
 
 
+#water_totals {
+    width: 960px;
+    background: #353536;
+    margin-top: 15px;
+    border: 1px solid;
+    border-color: #59b4d4;
+    border-radius: 5px 5px 5px 5px;
+}
+
+
+
 #node_table {
     width: 600px;
     background: #353536;
     margin: 50px;
     border: 2px solid;
-    border-color: #888;
+    border-color: #59b4d4;
     border-radius: 5px 5px 5px 5px;
 }
 
@@ -35,7 +46,7 @@
     background: #252526;
     margin: 5px;
     border: 2px solid;
-    border-color: #888;
+    border-color: #59b4d4;
     border-radius: 5px 5px 5px 5px;
 }
 
@@ -81,7 +92,7 @@
     background-color: #252526;
     margin: 5px;
     border: 2px solid;
-    border-color: #888;
+    border-color: #59b4d4;
     border-radius: 5px 5px 5px 5px;
 }
 
@@ -94,7 +105,7 @@
     margin-top: 170;
     background-color: #252526;
     border: 2px solid;
-    border-color: #888;
+    border-color: #59b4d4;
     border-radius: 5px 5px 5px 5px;
 }
 
diff -r b1f2a893572f -r a17c644a0510 www/js/recipes.js
--- a/www/js/recipes.js	Tue Sep 04 23:12:13 2018 +0200
+++ b/www/js/recipes.js	Wed Sep 05 15:38:20 2018 +0200
@@ -344,8 +344,8 @@
 
 	// initialize the popup window and buttons.
 	$("#popupWindow").jqxWindow({
-		width: 1200,
-		height: 620,
+		width: 1202,
+		height: 622,
 		resizable: false,
 		theme: theme,
 		isModal: true,
diff -r b1f2a893572f -r a17c644a0510 www/recipes.php
--- a/www/recipes.php	Tue Sep 04 23:12:13 2018 +0200
+++ b/www/recipes.php	Wed Sep 05 15:38:20 2018 +0200
@@ -136,17 +136,52 @@
      <div> <!-- tab water -->
       <div style="overflow: hidden;">
        <table>
-<!--        <tr>
-         <td align="right" style="vertical-align: top;">Schema naam:</td>
-         <td align="left" colspan="3" style="vertical-align: top;"><input id="name" /></td>
-        </tr>
+        <tr>
+         <td style="vertical-align: top; padding: 3px;float: right:">Water:</td>
+	 <td style="padding: 3px; float: left;"><div id="waterGrid"></div></td>
+	</tr>
         <tr>
-         <td align="right" style="vertical-align: top;">Opmerkingen:</td>
-         <td align="left" colspan="3"><textarea id="notes"></textarea></td>
-        </tr> -->
-        <tr>
-         <td align="right" style="vertical-align: top; padding: 3px;">Water:</td>
-         <td align="left" style="padding: 3px;"><div id="waterGrid"></div></td>
+         <td></td>
+         <td>
+          <div id='water_totals'>
+ 	   <table style="width: 100%;">
+            <caption>Water overzicht</caption>
+    	    <tr>
+	     <td></td>
+             <td style="width: 80px; padding: 3px;">Volume</td>
+             <td style="width: 80px; padding: 3px;">Ca</td>
+             <td style="width: 80px; padding: 3px;">Mg</td>
+             <td style="width: 80px; padding: 3px;">Na</td>
+             <td style="width: 80px; padding: 3px;">HCO3</td>
+             <td style="width: 80px; padding: 3px;">Cl</td>
+	     <td style="width: 80px; padding: 3px;">SO4</td>
+             <td style="width: 80px; padding: 3px;">pH</td>
+ 	    </tr>
+            <tr>
+	     <td style="vertical-align: top; padding: 3px; float: left;">Gemengd water:</td>
+             <td><div id="wg_volume"></div></td>
+             <td><div id="wg_calcium"></div></td>
+             <td><div id="wg_magnesium"></div></td>
+             <td><div id="wg_sodium"></div></td>
+             <td><div id="wg_total_alkalinity"></div></td>
+             <td><div id="wg_chloride"></div></td>
+	     <td><div id="wg_sulfate"></div></td>
+             <td><div id="wg_ph"></div></td>
+            </tr>
+            <tr>
+	     <td style="vertical-align: top; padding: 3px; float: left;">Behandeld water:</td>
+             <td><div></div></td>
+             <td><div id="wb_calcium"></div></td>
+             <td><div id="wb_magnesium"></div></td>
+             <td><div id="wb_sodium"></div></td>
+             <td><div id="wb_total_alkalinity"></div></td>
+             <td><div id="wb_chloride"></div></td>
+	     <td><div id="wb_sulfate"></div></td>
+             <td><div></div></td>
+            </tr>
+           </table>
+	  </div>
+         </td>
         </tr>
        </table>
       </div>