Mercurial > bms / changeset

--- a/www/js/rec_edit.js	Fri Dec 07 20:58:23 2018 +0100
+++ b/www/js/rec_edit.js	Fri Dec 07 21:26:54 2018 +0100
@@ -403,7 +403,7 @@
 		var fermentablelist = new $.jqx.dataAdapter(fermentableInvSource);
 
 		$("#fermentableGrid").jqxGrid({
-			width: 1050,
+			width: 1150,
 			height: 400,
 			source: fermentableAdapter,
 			theme: theme,
@@ -417,7 +417,7 @@
 				var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>");
 				toolbar.append(container);
 				container.append('<div style="float: left; margin-left: 165px;" id="faddrowbutton"></div>');
-				container.append('<input style="float: left; margin-left: 230px;" id="fdeleterowbutton" type="button" value="Verwijder mout" />');
+				container.append('<input style="float: left; margin-left: 505px;" id="fdeleterowbutton" type="button" value="Verwijder mout" />');
 				// add fermentable from dropdownlist.
 				$("#faddrowbutton").jqxDropDownList({
 					placeHolder: "Kies mout:",
@@ -493,20 +493,20 @@
 				$('#jqxTabs').jqxTabs('next');
 			},
 			columns: [
-				{ text: 'Mout/suiker', editable: false, datafield: 'f_name', 
+				{ text: 'Vergistbaar ingredi&euml;nt', editable: false, datafield: 'f_name',
 				  cellsrenderer:  function (row, columnfield, value, defaulthtml, columnproperties) {
 					var rowData = $("#fermentableGrid").jqxGrid('getrowdata', row);
 					return "<span style='margin: 3px; margin-top: 6px; float: "+columnproperties.cellsalign+"'>" +rowData.f_name + " (" + rowData.f_color + " EBC)</span>";
 				  }
 			       	},
-				{ text: 'Type', editable: false, width: 100, datafield: 'f_type' },
+				{ text: 'Type', editable: false, align: 'center', cellsalign: 'center', width: 100, datafield: 'f_type' },
 				{ text: 'Moment', width: 110, align: 'center', cellsalign: 'center', datafield: 'f_added', columntype: 'dropdownlist',
 				  createeditor: function (row, column, editor) {
 					var srcAdded = [ "Mash", "Boil", "Fermentation", "Lagering", "Bottle" ];
 					editor.jqxDropDownList({ autoDropDownHeight: true, source: srcAdded });
 				  }
 				},
-				{ text: 'Opbrengst', editable: false, datafield: 'f_yield', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1' },
+				{ text: 'Opbrengst', editable: false, datafield: 'f_yield', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'p1' },
 				{ text: 'Gewicht Kg', datafield: 'f_amount', width: 110, align: 'right', cellsalign: 'right', cellsformat: 'f3',
 				  columntype: 'numberinput',
 				  validation: function (cell, value) {
@@ -521,7 +521,7 @@
 					editor.jqxNumberInput({ inputMode: 'simple', decimalDigits: 3 });
 				  }
 				},
-				{ text: 'Procent', datafield: 'f_percentage', width: 110, align: 'right', cellsalign: 'right', cellsformat: 'p1',
+				{ text: 'Percentage', datafield: 'f_percentage', width: 110, align: 'right', cellsalign: 'right', cellsformat: 'p1',
 				  columntype: 'numberinput',
 				  validation: function (cell, value) {
 					if (value < 0 || value > 100) {

--- a/www/rec_edit.php	Fri Dec 07 20:58:23 2018 +0100
+++ b/www/rec_edit.php	Fri Dec 07 21:26:54 2018 +0100
@@ -104,8 +104,8 @@
       <div style="overflow: hidden;">
        <table>
         <tr>
-         <td align="right" style="vertical-align: top;">Ingredienten:</td>
-         <td align="left" colspan="3"><div id="fermentableGrid">Graat</div></td>
+         <td align="right" style="vertical-align: top;">Ingredi&euml;nten:</td>
+         <td align="left" colspan="3"><div id="fermentableGrid"></div></td>
         </tr>
        </table>
       </div>