diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ResearchCollectionExport/ResearchCollectionExportView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ResearchCollectionExport/ResearchCollectionExportView.js index 45d54e05ae55b1e227276c35c538db88bd1823df..fa97054bbcc0ef9b17d3cc9d3cdb4c2e1ff6beae 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ResearchCollectionExport/ResearchCollectionExportView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ResearchCollectionExport/ResearchCollectionExportView.js @@ -50,7 +50,7 @@ function ResearchCollectionExportView(researchCollectionExportController, resear var $formTitle = $('<h2>').append('Research Collection Export Builder'); $header.append($formTitle); - var $exportButton = $('<input>', { 'type': 'submit', 'class': 'btn btn-primary', 'value': 'Export Selected', + var $exportButton = $('<input>', {'type': 'submit', 'class': 'btn btn-primary', 'value': 'Export Selected', 'onClick': '$("form[name=\'rcExportForm\']").submit()'}); $header.append($exportButton); }; diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js index d694ed75448f0e4d42a607c3034a5e1650c72ac0..c563e3821700ab51bc2b4a0558801014c3560af7 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js @@ -269,32 +269,32 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { var treeModelExports = []; if (profile.mainMenu.showExports) { - var exportBuilderLink = _this.getLinkForNode("Export Builder", "EXPORT_BUILDER", "showExportTreePage", null); + var exportBuilderLink = _this.getLinkForNode("Export to ZIP", "EXPORT_TO_ZIP", "showExportTreePage", null); treeModelExports.push({ - displayName: "Export Builder", title: exportBuilderLink, entityType: "EXPORT_BUILDER", key: "EXPORT_BUILDER", + displayName: "Export to ZIP", title: exportBuilderLink, entityType: "EXPORT_TO_ZIP", key: "EXPORT_TO_ZIP", folder: false, lazy: false, view: "showExportTreePage", icon: "glyphicon glyphicon-export" }); } if (profile.mainMenu.showResearchCollectionExportBuilder) { - var researchCollectionExportBuilderLink = _this.getLinkForNode("Research Collection Export Builder", - "RESEARCH_COLLECTION_EXPORT_BUILDER", "showResearchCollectionExportPage", null); + var researchCollectionExportBuilderLink = _this.getLinkForNode("Export to Research Collection", + "EXPORT_TO_RESEARCH_COLLECTION", "showResearchCollectionExportPage", null); treeModelExports.push({ - displayName: "Research Collection Export Builder", title: researchCollectionExportBuilderLink, - entityType: "RESEARCH_COLLECTION_EXPORT_BUILDER", key: "RESEARCH_COLLECTION_EXPORT_BUILDER", folder: false, lazy: false, + displayName: "Export to Research Collection", title: researchCollectionExportBuilderLink, + entityType: "EXPORT_TO_RESEARCH_COLLECTION", key: "EXPORT_TO_RESEARCH_COLLECTION", folder: false, lazy: false, view: "showResearchCollectionExportPage", icon: "./img/research-collection-icon.png" }); } if (profile.mainMenu.showZenodoExportBuilder) { - var zenodoExportBuilderLink = _this.getLinkForNode("Zenodo Export Builder", "ZENODO_EXPORT_BUILDER", "showZenodoExportPage", null); + var zenodoExportBuilderLink = _this.getLinkForNode("Export to Zenodo", "EXPORT_TO_ZENODO", "showZenodoExportPage", null); treeModelExports.push({ - displayName: "Zenodo Export Builder", title: zenodoExportBuilderLink, entityType: "ZENODO_EXPORT_BUILDER", - key: "ZENODO_EXPORT_BUILDER", folder: false, lazy: false, view: "showZenodoExportPage", icon: "glyphicon glyphicon-export" + displayName: "Export to Zenodo", title: zenodoExportBuilderLink, entityType: "EXPORT_TO_ZENODO", + key: "EXPORT_TO_ZENODO", folder: false, lazy: false, view: "showZenodoExportPage", icon: "glyphicon glyphicon-export" }); } - treeModelUtils.push({ displayName: "Export", title: "Export", entityType: "EXPORT", key: "EXPORT", folder: true, lazy: false, + treeModelUtils.push({ displayName: "Exports", title: "Exports", entityType: "EXPORTS", key: "EXPORTS", folder: true, lazy: false, expanded: false, children: treeModelExports, icon: "glyphicon glyphicon-export" }); } @@ -322,22 +322,22 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { treeModel.push({ displayName: "About", title : "About", entityType: "ABOUT", key : "ABOUT", folder : false, lazy : false, view : "showAbout", icon : "glyphicon glyphicon-info-sign" }); Â Â Â Â Â Â Â Â var glyph_opts = { - Â Â Â Â map: { - Â Â Â Â doc: "glyphicon glyphicon-file", - Â Â Â Â docOpen: "glyphicon glyphicon-file", - Â Â Â Â checkbox: "glyphicon glyphicon-unchecked", - Â Â Â Â checkboxSelected: "glyphicon glyphicon-check", - Â Â Â Â checkboxUnknown: "glyphicon glyphicon-share", - Â Â Â Â dragHelper: "glyphicon glyphicon-play", - Â Â Â Â dropMarker: "glyphicon glyphicon-arrow-right", - Â Â Â Â error: "glyphicon glyphicon-warning-sign", - Â Â Â Â expanderClosed: "glyphicon glyphicon-plus-sign", - Â Â Â Â expanderLazy: "glyphicon glyphicon-plus-sign", // glyphicon-expand - Â Â Â Â expanderOpen: "glyphicon glyphicon-minus-sign", // glyphicon-collapse-down - Â Â Â Â folder: "glyphicon glyphicon-folder-close", - Â Â Â Â folderOpen: "glyphicon glyphicon-folder-open", - Â Â Â Â loading: "glyphicon glyphicon-refresh" - Â Â Â Â } + Â Â Â Â map: { + Â Â Â Â doc: "glyphicon glyphicon-file", + Â Â Â Â docOpen: "glyphicon glyphicon-file", + Â Â Â Â checkbox: "glyphicon glyphicon-unchecked", + Â Â Â Â checkboxSelected: "glyphicon glyphicon-check", + Â Â Â Â checkboxUnknown: "glyphicon glyphicon-share", + Â Â Â Â dragHelper: "glyphicon glyphicon-play", + Â Â Â Â dropMarker: "glyphicon glyphicon-arrow-right", + Â Â Â Â error: "glyphicon glyphicon-warning-sign", + Â Â Â Â expanderClosed: "glyphicon glyphicon-plus-sign", + Â Â Â Â expanderLazy: "glyphicon glyphicon-plus-sign", // glyphicon-expand + Â Â Â Â expanderOpen: "glyphicon glyphicon-minus-sign", // glyphicon-collapse-down + Â Â Â Â folder: "glyphicon glyphicon-folder-close", + Â Â Â Â folderOpen: "glyphicon glyphicon-folder-open", + Â Â Â Â loading: "glyphicon glyphicon-refresh" + Â Â Â Â } }; Â Â Â Â Â Â Â Â var onLazyLoad = function(event, data) { @@ -400,7 +400,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { Â Â Â Â }); Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }); Â Â Â Â Â Â Â Â Â Â Â Â }); - Â Â Â Â } + Â Â Â Â }; Â Â Â Â Â Â Â Â switch(type) { Â Â Â Â Â Â Â Â case "LAB_NOTEBOOK": @@ -680,24 +680,24 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { Â Â Â Â Â Â Â Â Â Â Â Â }); Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â } - Â Â Â Â } + Â Â Â Â }; Â Â Â Â Â Â Â Â var getCancelResultsFunction = function(dfd) { - Â Â Â Â Â Â Â Â Â Â Â Â return function() { - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dfd.resolve([]); - Â Â Â Â Â Â Â Â Â Â Â Â } - Â Â Â Â } +Â Â Â Â Â Â Â Â Â Â Â Â return function() { +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dfd.resolve([]); +Â Â Â Â Â Â Â Â Â Â Â Â } + Â Â Â Â }; Â Â Â Â Â Â Â Â if(samplesToShow.length > 50) { - Â Â Â Â Â Â Â Â Â Â Â Â var toExecute = function() { -Â Â Â Â Â Â Â Â Â Â Â Â Util.blockUIConfirm("Do you want to show " + samplesWithoutELNParents.length + " " + ELNDictionary.Samples + " on the tree?", -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â getOkResultsFunction(dfd, samplesToShow), -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â getCancelResultsFunction(dfd)); - Â Â Â Â } +Â Â Â Â Â Â Â Â Â Â Â Â var toExecute = function() { +Â Â Â Â Â Â Â Â Â Â Â Â Util.blockUIConfirm("Do you want to show " + samplesWithoutELNParents.length + " " + ELNDictionary.Samples + " on the tree?", + Â Â Â Â Â Â Â Â Â Â Â Â getOkResultsFunction(dfd, samplesToShow), + Â Â Â Â Â Â Â Â Â Â Â Â getCancelResultsFunction(dfd)); + Â Â Â Â }; Â Â Â Â Â Â Â Â - Â Â Â Â Â Â Â Â Â Â Â Â setTimeout(toExecute, 1000); + Â Â Â Â Â Â Â Â setTimeout(toExecute, 1000); Â Â Â Â } else { - Â Â Â Â Â Â Â Â Â Â Â Â getOkResultsFunction(dfd, samplesToShow)(); + Â Â Â Â Â Â Â Â getOkResultsFunction(dfd, samplesToShow)(); Â Â Â Â } Â Â Â Â Â Â Â Â Â Â Â Â }); Â Â Â Â Â Â Â Â Â Â Â Â break; @@ -841,7 +841,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â setCustomIcon($tree, "JUPYTER_WORKSPACE", "./img/jupyter-icon.png"); Â Â Â Â Â Â Â Â setCustomIcon($tree, "NEW_JUPYTER_NOTEBOOK", "./img/jupyter-icon.png"); - } + }; function setCustomIcon($tree, nodeKey, iconImage) { Â Â Â Â Â Â Â Â var node = $tree.fancytree("getTree").getNodeByKey(nodeKey); diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ZenodoExport/ZenodoExportView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ZenodoExport/ZenodoExportView.js index 5c3fd4a7344006d48f2a50701c95cdafb7561298..b44753cbb05108866ed151077664742a18d232de 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ZenodoExport/ZenodoExportView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ZenodoExport/ZenodoExportView.js @@ -45,5 +45,9 @@ function ZenodoExportView(exportController, exportModel) { var $formTitle = $('<h2>').append('Zenodo Export Builder'); $header.append($formTitle); + + var $exportButton = $('<input>', { 'type': 'submit', 'class': 'btn btn-primary', 'value': 'Export Selected', + 'onClick': '$("form[name=\'rcExportForm\']").submit()'}); + $header.append($exportButton); }; } \ No newline at end of file