--- 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;