diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/img/eln-lims-dropbox-example.png b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/img/eln-lims-dropbox-example.png index 0f4494f8c1a9537700f55ee53ea310c78a64ccb5..d19477b7b5d99afbb450d8dae2ef94d479ce1db2 100644 Binary files a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/img/eln-lims-dropbox-example.png and b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/img/eln-lims-dropbox-example.png differ diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js index 9f086cd392d8e0337c166c7e01d08c4d6a5f0cc4..cdf3e2ed87a93cf969f437532ed62ba1be958d29 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js @@ -951,7 +951,7 @@ var FormUtil = new function() { var $dialog = $("<div>"); $dialog .append($("<div>") - .append($("<legend>").text("Name generator for dataset upload with dropbox"))); + .append($("<legend>").text("Helper tool for Dataset upload using eln-lims dropbox:"))); mainController.serverFacade.listDataSetTypes((function(data) { @@ -961,11 +961,13 @@ var FormUtil = new function() { $dialog.append($formFieldContainer); // info text - $formFieldContainer.append(FormUtil.getInfoText("Usage example: ")) - .append("1. In your dropbox location, create a folder with the provided Dropbox Folder Name. ").append("<br>") - .append("2. Inside this folder, create another one with a name of your choice containing the data you want to upload.").append("<br>") - .append("3. After the dropbox uploads your data you should find a new dataset with your chosen name and your data starting from your named folder.").append("<br>") - .append("<center><img src='./img/eln-lims-dropbox-example.png' width='100%' ></center>"); + $formFieldContainer.append(FormUtil.getInfoText("Example and usage instructions: ")) + .append("<center><img src='./img/eln-lims-dropbox-example.png' width='100%' ></center>").append("<br>") + .append("<center><b>Screenshot example showing the eln-lims dropbox network folder and how the results will be visualized on the UI after upload</b></center>").append("<br>") + .append("1. The eln-lims dropbox requires you to provide a root folder with a specific name. This name contains information to tell the system where your uploaded data should be attached to. This helper tool will let you generate this name using the form below to upload data to the entity shown on the form that opened this pop-up.").append("<br>") + .append("2. Inside the root folder with the name generated with this tool, you should put another folder with a name of your choice containing the data you want to upload.").append("<br>") + .append("3. After uploading your data should appear on the entity selected by the root folder."); + // dataset type dropdown var $dataSetTypeSelector = FormUtil.getDataSetsDropDown('DATASET_TYPE', dataSetTypes); @@ -982,6 +984,14 @@ var FormUtil = new function() { .append($("<label>", { class : "control-label" }).text("Dataset name:"))) .append($nameInput); + var ownerHint = "to upload data to the current "; + if(nameElements[0] === "O") { + ownerHint += ELNDictionary.Sample; + } else if(nameElements[0] === "E") { + ownerHint += ELNDictionary.ExperimentELN; + } + ownerHint += " " + nameElements[nameElements.length-1]; + // dropbox folder name ouput var $dropboxFolderName = $("<input>", { class : "form-control", @@ -997,7 +1007,7 @@ var FormUtil = new function() { $formFieldContainer .append($("<div>", { class : "form-group" }) .append($("<label>", { class : "control-label" }) - .text("Dropbox Folder Name:")) + .text("Generated root folder name for the dropbox " + ownerHint + ":")) .append($("<div>", { class : "input-group" }) .append($dropboxFolderName) .append($("<span>", { class : "input-group-btn"})