Mercurial > bms / changeset

--- a/README.design	Sun Aug 19 21:46:56 2018 +0200
+++ b/README.design	Fri Aug 24 21:53:14 2018 +0200
@@ -35,10 +35,10 @@
 inventory_mash_profiles		Ok zonder de steps.
 inventory_miscs			Ok.
 inventory_styles		Ok.	Ok.
-inventory_suppliers		Ok.
-inventory_water_profiles	Ok.
-inventory_water_sources		Ok.
-inventory_yeasts		Ok.
+inventory_suppliers		Ok.	Ok.
+inventory_water_profiles	Ok.	Ok.
+inventory_water_sources		Ok.	Ok.
+inventory_yeasts		Ok.	Ok.
 
 Handelsmaten (een zooitje ongeregeld):
 vergistbare ingredienten:	Prijs per kilo, hoeveelheid in gram.

--- a/bmsd/bms.h	Sun Aug 19 21:46:56 2018 +0200
+++ b/bmsd/bms.h	Fri Aug 24 21:53:14 2018 +0200
@@ -130,6 +130,7 @@
     FERMENTER_STAGE_PRIMARY = 0,	///< Fermentation primage stage.
     FERMENTER_STAGE_SECONDARY,		///< Fermenter secondary stage.
     FERMENTER_STAGE_TERTIARY,		///< Fermenter tertiary stage.
+    FERMENTER_STAGE_CARBONATION,	///< Fermenter carbonation stage.
 } FERMENTER_STAGE;
 
 typedef enum

--- a/www/includes/global.inc.php	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/includes/global.inc.php	Fri Aug 24 21:53:14 2018 +0200
@@ -23,13 +23,9 @@
 
 /*
  * Look for the style names in the jqwidgets/styles directory.
- *
- * energyblue of ui-redmond
  */
-//$my_style = 'black';
 //$my_style = 'ui-darkness';
 $my_style = 'ui-mbse';
-//$my_style = 'android';
 
 require_once($_SERVER['DOCUMENT_ROOT'].'/config.php');
 require_once($_SERVER['DOCUMENT_ROOT'].'/version.php');

--- a/www/js/global.js	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/js/global.js	Fri Aug 24 21:53:14 2018 +0200
@@ -20,19 +20,6 @@
  * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  *****************************************************************************/
 
-function createElements() {
-	$('#aboutWindow').jqxWindow({
-		resizable: true,
-		minWidth: 300,
-		minHeight: 300,
-		theme: theme,
-		autoOpen: false,
-		isModal: true
-	});
-	$('#aboutWindow').jqxWindow('focus');
-}
-
-
 
 function getLocalization() {
 	var localizationobj = {};
@@ -85,12 +72,21 @@
 
 
 $(document).ready(function () {
+	$('#aboutWindow').jqxWindow({
+		resizable: true,
+		minWidth: 300,
+		minHeight: 300,
+		theme: theme,
+		autoOpen: false,
+		isModal: true
+	});
+	$('#aboutWindow').jqxWindow('focus');
+
 	$("#jqxMenu").jqxMenu({
 		width: 1280,
 		height: '30px',
 		theme: theme
 	});
-	createElements();
 	$("#jqxWidget").css('visibility', 'visible');
 });
 

--- a/www/js/inv_equipments.js	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/js/inv_equipments.js	Fri Aug 24 21:53:14 2018 +0200
@@ -26,7 +26,7 @@
 		theme: theme,
 		position: { x: 490, y: 210 },
 		width: 300,
-		height: 145,
+		height: 175,
 		resizable: false,
 		isModal: true,
 		modalOpacity: 0.4,
@@ -179,14 +179,14 @@
 		localization: getLocalization(),
 		renderstatusbar: function (statusbar) {
 			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
-			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
+			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
-			addButton.jqxButton({  width: 60, height: 20 });
+			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
 			// add new row.
 			addButton.click(function (event) {
 				editrow = -1;
-				$("#popupWindow").jqxWindow({ position: { x: 230, y: 30 } });
+				$("#popupWindow").jqxWindow({ position: { x: 180, y: 30 } });
 				$("#name").val('');
 				$("#boil_size").val('18');
 				$("#batch_size").val('15.3');
@@ -213,16 +213,16 @@
 		filterable: true,
 		filtermode: 'excel',
 		columns: [
-			{ text: 'Equipment Name', datafield: 'name', width: 250 },
-			{ text: 'Boil Size', datafield: 'boil_size', width: 90, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'Batch Size', datafield: 'batch_size', width: 90, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'Notes', datafield: 'notes' },
-			{ text: 'Edit', datafield: 'Edit', width: 80, columntype: 'button', cellsrenderer: function () {
-				return "Edit";
+			{ text: 'Installatie naam', datafield: 'name', width: 200 },
+			{ text: 'Kook volume', datafield: 'boil_size', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Batch volume', datafield: 'batch_size', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Opmerkingen', datafield: 'notes' },
+			{ text: 'Wijzig', datafield: 'Edit', width: 120, align: 'center', columntype: 'button', cellsrenderer: function () {
+				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
 					editrow = row;
-					$("#popupWindow").jqxWindow({ position: { x: 230, y: 30 } });
+					$("#popupWindow").jqxWindow({ position: { x: 180, y: 30 } });
 					// get the clicked row's data and initialize the input fields.
 					var dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow);
 					$("#name").val(dataRecord.name);
@@ -253,7 +253,7 @@
 	});
 	// initialize the popup window and buttons.
 	$("#popupWindow").jqxWindow({
-		width: 800, resizable: false, theme: theme, isModal: true, autoOpen: false, cancelButton: $("#Cancel"), modalOpacity: 0.40
+		width: 900, resizable: false, theme: theme, isModal: true, autoOpen: false, cancelButton: $("#Cancel"), modalOpacity: 0.40
 	});
 	$("#popupWindow").on('open', function () {
 		$("#name").jqxInput('selectAll');

--- a/www/js/inv_fermentables.js	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/js/inv_fermentables.js	Fri Aug 24 21:53:14 2018 +0200
@@ -26,7 +26,7 @@
 		theme: theme,
 		position: { x: 490, y: 210 },
 		width: 300,
-		height: 145,
+		height: 175,
 		resizable: false,
 		isModal: true,
 		modalOpacity: 0.4,
@@ -165,10 +165,10 @@
 		localization: getLocalization(),
 		renderstatusbar: function (statusbar) {
 			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
-			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
+			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
-			addButton.jqxButton({ width: 60, height: 20 });
+			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
 			// add new row.
 			addButton.click(function (event) {
 				editrow = -1;
@@ -199,17 +199,17 @@
 		filterable: true,
 		filtermode: 'excel',
 		columns: [
-			{ text: 'Vergistbaar product', datafield: 'name', width: 250 },
+			{ text: 'Vergistbaar product', datafield: 'name', width: 270 },
 			{ text: 'Soort', datafield: 'type', align: 'center', cellsalign: 'center', width: 90 },
 			{ text: 'Mout type', datafield: 'graintype', align: 'center', cellsalign: 'center', width: 90 },
 			{ text: 'Herkomst', datafield: 'origin', width: 150 },
-			{ text: 'Producent', datafield: 'supplier', width: 150 },
+			{ text: 'Producent', datafield: 'supplier', width: 200 },
 			{ text: 'Kleur', datafield: 'color', width: 70, align: 'right', cellsalign: 'right' },
 			{ text: 'Opbrengst', datafield: 'yield', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'p1' },
-			{ text: 'Vooraad', datafield: 'inventory', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
-			{ text: 'Prijs', datafield: 'cost', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'c2' },
-			{ text: 'Edit', datafield: 'Edit', width: 120, align: 'center', columntype: 'button', cellsrenderer: function () {
-				return "Edit";
+			{ text: 'Vooraad', datafield: 'inventory', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
+			{ text: 'Prijs', datafield: 'cost', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'c2' },
+			{ text: 'Wijzig', datafield: 'Edit', width: 120, align: 'center', columntype: 'button', cellsrenderer: function () {
+				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
 					editrow = row;

--- a/www/js/inv_hops.js	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/js/inv_hops.js	Fri Aug 24 21:53:14 2018 +0200
@@ -26,7 +26,7 @@
 		theme: theme,
 		position: { x: 490, y: 210 },
 		width: 300,
-		height: 145,
+		height: 175,
 		resizable: false,
 		isModal: true,
 		modalOpacity: 0.4,
@@ -157,10 +157,10 @@
 		localization: getLocalization(),
 		renderstatusbar: function (statusbar) {
 			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
-			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
+			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
-			addButton.jqxButton({  width: 60, height: 20 });
+			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
 			// add new row.
 			addButton.click(function (event) {
 				editrow = -1;
@@ -201,8 +201,8 @@
 			{ text: 'Oogst datum', datafield: 'production_date', align: 'center', cellsalign: 'center', width: 100 },
 			{ text: 'Voor, gr.', datafield: 'inventory', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
 			{ text: 'Prijs /kg', datafield: 'cost', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'c2' },
-			{ text: 'Edit', datafield: 'Edit', columntype: 'button', align: 'center', cellsrenderer: function () {
-				return "Edit";
+			{ text: 'Wijzig', datafield: 'Wijzig', columntype: 'button', align: 'center', cellsrenderer: function () {
+				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
 					editrow = row;

--- a/www/js/inv_miscs.js	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/js/inv_miscs.js	Fri Aug 24 21:53:14 2018 +0200
@@ -24,7 +24,7 @@
 		theme: theme,
 		position: { x: 490, y: 210 },
 		width: 300,
-		height: 145,
+		height: 175,
 		resizable: false,
 		isModal: true,
 		modalOpacity: 0.4,
@@ -141,10 +141,10 @@
 		localization: getLocalization(),
 		renderstatusbar: function (statusbar) {
 			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
-			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
+			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
-			addButton.jqxButton({  width: 60, height: 20 });
+			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
 			// add new row.
 			addButton.click(function (event) {
 				editrow = -1;
@@ -167,15 +167,15 @@
 		filterable: true,
 		filtermode: 'excel',
 		columns: [
-			{ text: 'Ingredient naam', datafield: 'name', width: 250 },
-			{ text: 'Soort', datafield: 'type', width: 90 },
-			{ text: 'Gebruik', datafield: 'use_use', width: 90 },
-			{ text: 'Tijd', datafield: 'time', width: 90, cellsalign: 'right', cellsformat: 'f2' },
-			{ text: 'Voorraad.', datafield: 'inventory', width: 70, cellsalign: 'right' },
-			{ text: 'Prijs', datafield: 'cost', width: 70, cellsalign: 'right', cellsformat: 'c2' },
-			{ text: 'THT datum', datafield: 'tht_date', width: 100 },
-			{ text: 'Edit', datafield: 'Edit', columntype: 'button', cellsrenderer: function () {
-				return "Edit";
+			{ text: 'Ingredient naam', datafield: 'name', width: 525 },
+			{ text: 'Soort', datafield: 'type', align: 'center', cellsalign: 'center', width: 100 },
+			{ text: 'Gebruik', datafield: 'use_use', align: 'center', cellsalign: 'center', width: 100 },
+			{ text: 'Tijd', datafield: 'time', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f2' },
+			{ text: 'Voor. gr/ml.', datafield: 'inventory', width: 110, align: 'right', cellsalign: 'right' },
+			{ text: 'Prijs kg/l', datafield: 'cost', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'c2' },
+			{ text: 'THT datum', datafield: 'tht_date', width: 100, align: 'center', cellsalign: 'center' },
+			{ text: 'Wijzig', datafield: 'Edit', columntype: 'button', align: 'center', cellsrenderer: function () {
+				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
 					editrow = row;

--- a/www/js/inv_styles.js	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/js/inv_styles.js	Fri Aug 24 21:53:14 2018 +0200
@@ -26,7 +26,7 @@
 		theme: theme,
 		position: { x: 490, y: 210 },
 		width: 300,
-		height: 145,
+		height: 175,
 		resizable: false,
 		isModal: true,
 		modalOpacity: 0.4,
@@ -161,10 +161,10 @@
 		localization: getLocalization(),
 		renderstatusbar: function (statusbar) {
 			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
-			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
+			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
-			addButton.jqxButton({  width: 60, height: 20 });
+			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
 			// add new row.
 			addButton.click(function (event) {
 				editrow = -1;
@@ -198,21 +198,21 @@
 		filtermode: 'excel',
 		columns: [
 			{ text: 'Groep', datafield: 'style_letter', width: 30 },
-			{ text: 'Style Name', datafield: 'name', width: 250 },
-			{ text: 'OG', datafield: 'og_min', width: 60, cellsalign: 'right', cellsformat: 'f3' },
-			{ text: 'OG', datafield: 'og_max', width: 60, cellsalign: 'right', cellsformat: 'f3' },
-			{ text: 'FG', datafield: 'fg_min', width: 60, cellsalign: 'right', cellsformat: 'f3' },
-			{ text: 'FG', datafield: 'fg_max', width: 60, cellsalign: 'right', cellsformat: 'f3' },
-			{ text: 'IBU', datafield: 'ibu_min', width: 60, cellsalign: 'right', cellsformat: 'f0' },
-			{ text: 'IBU', datafield: 'ibu_max', width: 60, cellsalign: 'right', cellsformat: 'f0' },
-			{ text: 'EBC', datafield: 'color_min', width: 60, cellsalign: 'right', cellsformat: 'f0' },
-			{ text: 'EBC', datafield: 'color_max', width: 60, cellsalign: 'right', cellsformat: 'f0' },
-			{ text: 'Co2', datafield: 'carb_min', width: 60, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'Co2', datafield: 'carb_max', width: 60, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'ABV', datafield: 'abv_min', width: 60, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'ABV', datafield: 'abv_max', width: 60, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'Edit', datafield: 'Edit', columntype: 'button', cellsrenderer: function () {
-				return "Edit";
+			{ text: 'Style Name', datafield: 'name' },
+			{ text: 'OG', datafield: 'og_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
+			{ text: 'OG', datafield: 'og_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
+			{ text: 'FG', datafield: 'fg_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
+			{ text: 'FG', datafield: 'fg_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f3' },
+			{ text: 'IBU', datafield: 'ibu_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
+			{ text: 'IBU', datafield: 'ibu_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
+			{ text: 'EBC', datafield: 'color_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
+			{ text: 'EBC', datafield: 'color_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f0' },
+			{ text: 'Co2', datafield: 'carb_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Co2', datafield: 'carb_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'ABV', datafield: 'abv_min', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'ABV', datafield: 'abv_max', width: 60, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Wijzig', datafield: 'Edit', width: 120, align: 'center', columntype: 'button', cellsrenderer: function () {
+				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
 					editrow = row;

--- a/www/js/inv_water_profiles.js	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/js/inv_water_profiles.js	Fri Aug 24 21:53:14 2018 +0200
@@ -26,7 +26,7 @@
 		theme: theme,
 		position: { x: 490, y: 210 },
 		width: 300,
-		height: 145,
+		height: 175,
 		resizable: false,
 		isModal: true,
 		modalOpacity: 0.4,
@@ -136,10 +136,10 @@
 		localization: getLocalization(),
 		renderstatusbar: function (statusbar) {
 			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
-			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
+			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
-			addButton.jqxButton({  width: 60, height: 20 });
+			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
 			// add new row.
 			addButton.click(function (event) {
 				editrow = -1;
@@ -160,15 +160,15 @@
 		filterable: true,
 		filtermode: 'excel',
 		columns: [
-			{ text: 'Water Profile', datafield: 'name', width: 250 },
-			{ text: 'Notes', datafield: 'notes', width: 450 },
-			{ text: 'Natrium', datafield: 'sodium', width: 80, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'Chloride', datafield: 'chloride', width: 80, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'Sulfaat', datafield: 'sulfate', width: 80, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'Zuurgraad', datafield: 'ph', width: 80, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'alkaliteit', datafield: 'total_alkalinity', width: 80, cellsalign: 'right', cellsformat: 'f1' },
-			{ text: 'Edit', datafield: 'Edit', columntype: 'button', cellsrenderer: function () {
-				return "Edit";
+			{ text: 'Water Profiel', datafield: 'name', width: 250 },
+			{ text: 'Opmerkingen', datafield: 'notes', width: 475 },
+			{ text: 'Natrium', datafield: 'sodium', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Chloride', datafield: 'chloride', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Sulfaat', datafield: 'sulfate', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Zuurgraad', datafield: 'ph', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Alkaliteit', datafield: 'total_alkalinity', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
+			{ text: 'Wijzig', datafield: 'Edit', columntype: 'button', cellsrenderer: function () {
+				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
 					editrow = row;

--- a/www/js/inv_water_sources.js	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/js/inv_water_sources.js	Fri Aug 24 21:53:14 2018 +0200
@@ -26,7 +26,7 @@
 		theme: theme,
 		position: { x: 490, y: 210 },
 		width: 300,
-		height: 145,
+		height: 175,
 		resizable: false,
 		isModal: true,
 		modalOpacity: 0.4,
@@ -144,10 +144,10 @@
 		localization: getLocalization(),
 		renderstatusbar: function (statusbar) {
 			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
-			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
+			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
-			addButton.jqxButton({  width: 60, height: 20 });
+			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
 			// add new row.
 			addButton.click(function (event) {
 				editrow = -1;
@@ -172,11 +172,11 @@
 		filterable: true,
 		filtermode: 'excel',
 		columns: [
-			{ text: 'Water Profile', datafield: 'name', width: 250 },
-			{ text: 'Notes', datafield: 'notes', width: 850 },
+			{ text: 'Water leverancier', datafield: 'name', width: 250 },
+			{ text: 'Opmerkingen', datafield: 'notes', width: 850 },
 			{ text: 'Standaard', datafield: 'default_water', columntype: 'checkbox', width: 80 },
-			{ text: 'Edit', datafield: 'Edit', columntype: 'button', cellsrenderer: function () {
-				return "Edit";
+			{ text: 'Wijzig', datafield: 'Edit', columntype: 'button', cellsrenderer: function () {
+				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
 					editrow = row;

--- a/www/js/inv_yeasts.js	Sun Aug 19 21:46:56 2018 +0200
+++ b/www/js/inv_yeasts.js	Fri Aug 24 21:53:14 2018 +0200
@@ -26,7 +26,7 @@
 		theme: theme,
 		position: { x: 490, y: 210 },
 		width: 300,
-		height: 145,
+		height: 175,
 		resizable: false,
 		isModal: true,
 		modalOpacity: 0.4,
@@ -153,10 +153,10 @@
 		localization: getLocalization(),
 		renderstatusbar: function (statusbar) {
 			var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
-			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Add</span></div>");
+			var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>");
 			container.append(addButton);
 			statusbar.append(container);
-			addButton.jqxButton({  width: 60, height: 20 });
+			addButton.jqxButton({ theme: theme, width: 120, height: 20 });
 			// add new row.
 			addButton.click(function (event) {
 				editrow = -1;
@@ -191,8 +191,8 @@
 			{ text: 'Vergistingsgraad', datafield: 'attenuation', width: 120, align: 'right', cellsalign: 'right', cellsformat: 'p0' },
 			{ text: 'Voor. gr/ml', datafield: 'inventory', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
 			{ text: 'Prijs kg/l', datafield: 'cost', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'c2' },
-			{ text: 'Edit', datafield: 'Edit', columntype: 'button', align: 'center', cellsrenderer: function () {
-				return "Edit";
+			{ text: 'Wijzig', datafield: 'Edit', columntype: 'button', align: 'center', cellsrenderer: function () {
+				return "Wijzig";
 				}, buttonclick: function (row) {
 					// open the popup window when the user clicks a button.
 					editrow = row;