www/js/profile_mash.js

changeset 286
124af734af68
parent 245
3649c3d31d15
child 482
ce814c787b79
--- a/www/js/profile_mash.js	Sat Feb 23 22:56:35 2019 +0100
+++ b/www/js/profile_mash.js	Sun Feb 24 17:23:52 2019 +0100
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2014-2018
+ * Copyright (C) 2014-2019
  *
  * Michiel Broek <mbroek at mbse dot eu>
  *
@@ -174,7 +174,6 @@
 			source: stepAdapter,
 			theme: theme,
 			selectionmode: 'singlerow',
-			localization: getLocalization(),
 			showtoolbar: true,
 			rendertoolbar: function (toolbar) {
 				var me = this;
@@ -183,7 +182,7 @@
 				container.append('<input style="margin-left: 100px;" id="addrowbutton" type="button" value="Nieuwe stap" />');
 				container.append('<input style="margin-left: 450px;" id="deleterowbutton" type="button" value="Verwijder stap" />');
 				$("#addrowbutton").jqxButton({ template: "primary", theme: theme, width: 150 });
-				$("#deleterowbutton").jqxButton({ template: "primary", theme: theme, width: 150 });
+				$("#deleterowbutton").jqxButton({ template: "danger", theme: theme, width: 150 });
 				// create new row.
 				$("#addrowbutton").on('click', function () {
 					var datarow = generaterow();
@@ -208,9 +207,9 @@
 				},
 				{ text: 'Begin &deg;C', datafield: 'step_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
 				{ text: 'Eind &deg;C', datafield: 'end_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' },
-				{ text: 'Rusttijd', datafield: 'step_time', width: 80, align: 'right', cellsalign: 'right' },
-				{ text: 'Opwarmtijd', datafield: 'ramp_time', width: 80, align: 'right', cellsalign: 'right' },
-				{ text: 'Wijzig', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () {
+				{ text: 'Rust min.', datafield: 'step_time', width: 90, align: 'right', cellsalign: 'right' },
+				{ text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' },
+				{ text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () {
 					return "Wijzig";
 					}, buttonclick: function (row) {
 						steprow = row;
@@ -240,7 +239,6 @@
 		source: dataAdapter,
 		theme: theme,
 		showstatusbar: true,
-		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>");
@@ -261,7 +259,7 @@
 		columns: [
 			{ text: 'Maish schema', datafield: 'name', width: 250 },
 			{ text: 'Opmerkingen', datafield: 'notes' },
-			{ text: 'Wijzig', datafield: 'Edit', width: 100, align: 'center', columntype: 'button', cellsrenderer: function () {
+			{ text: '', datafield: 'Edit', width: 100, align: 'center', columntype: 'button', cellsrenderer: function () {
 				return "Wijzig";
 				}, buttonclick: function (row) {
 					editrow = row;

mercurial