diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js index 0cdba21a4795a9e4be5ed7f15ad933251873e198..dfecc6899c977968d4dfae805713ab3d7dbd243a 100644 --- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js +++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js @@ -537,8 +537,8 @@ var BarcodeUtil = new function() { Util.unblockUI(); }); - $window.append($('<legend>').append("Read Barcodes")); - $window.append(FormUtil.getInfoText("Please scan one or more barcodes. The barcodes will be listed below if the scan is successful.")); + $window.append($('<legend>').append("Scan Barcode/QR code")); + $window.append(FormUtil.getInfoText("Please scan one or more barcodes/qr codes. The barcodes/qr codes will be listed below if the scan is successful.")); $window.append($('<legend>').append('Found')); $window.append($btnAccept).append(' ').append($btnCancel); diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js index 49a031b5633cfb4af05191a5ff4ff3e5058578bd..17c690bb4be86756f527798070d7bbdb5836e93b 100644 --- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js +++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js @@ -655,7 +655,7 @@ function LinksView(linksController, linksModel) { } linksView.getAddAnyBarcode = function() { - var $addBtn = FormUtil.getButtonWithIcon("glyphicon-barcode", null); + var $addBtn = FormUtil.getButtonWithIcon("glyphicon-barcode", null, null, "Scan Barcode/QR code"); $addBtn.click(function() { BarcodeUtil.readBarcodeMulti("Add Objects", function(objects) { for(var oIdx = 0; oIdx < objects.length; oIdx++) { diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetBrowserController.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetBrowserController.js index b51422bef4a21ab8685669ce61451a881131df64..d1b70828154133b3b2791d0147e62edb91e7c69f 100644 --- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetBrowserController.js +++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetBrowserController.js @@ -2484,7 +2484,7 @@ class SideMenuWidgetBrowserController extends window.NgComponents.default.Browse _createBarcodesGeneratorNode() { if (profile.mainMenu.showBarcodes) { return { - text: "Barcodes Generator", + text: "Barcodes/QR codes Generator", object: { type: this.TYPE_GENERATE_BARCODES, id: this.TYPE_GENERATE_BARCODES,