diff -r 2ee6ad5d6f14 -r a720353fada9 www/js/inv_equipments.js --- 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 = $("
"); - var addButton = $("
Add
"); + var addButton = $("
Nieuw
"); 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');