diff --git a/jupyter-openbis-extension/__init__.py b/jupyter-openbis-extension/__init__.py index 8a739fc32b7bc0b029023662e0988ebd83623aed..74a9e2bba62a85cf68fc172b2321508d98e336e4 100644 --- a/jupyter-openbis-extension/__init__.py +++ b/jupyter-openbis-extension/__init__.py @@ -1,7 +1,7 @@ name = 'jupyter-openbis-extension.server' __author__ = 'Swen Vermeul' __email__ = 'swen@ethz.ch' -__version__ = '0.2.5' +__version__ = '0.2.7' def _jupyter_server_extension_paths(): return [{ diff --git a/jupyter-openbis-extension/static/downloadDialog.js b/jupyter-openbis-extension/static/downloadDialog.js index 321597a871d66dade89345b859b5c7ca233b402e..95a0069317a4553c3d1821e8c495238f47b63c47 100644 --- a/jupyter-openbis-extension/static/downloadDialog.js +++ b/jupyter-openbis-extension/static/downloadDialog.js @@ -11,7 +11,8 @@ define([ spinner.className="openbis-feedback" spinner.src="" function showSpinner() { - spinner.src="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.5.8/ajax-loader.gif" + var userName = window.location.pathname.split("/")[2]; + spinner.src = '/user/' + userName+ '/nbextensions/jupyter-openbis-extension/spinner.gif' } function hideSpinner() { spinner.src="" diff --git a/jupyter-openbis-extension/static/entitySearcher.js b/jupyter-openbis-extension/static/entitySearcher.js index 4da8d27eecee452f5e821fa19614f6eb9c813f6d..c44487778167652a1a5a84e97ad3591e5a482c56 100644 --- a/jupyter-openbis-extension/static/entitySearcher.js +++ b/jupyter-openbis-extension/static/entitySearcher.js @@ -78,32 +78,17 @@ define(["jquery", "./jquery-select2/js/select2.min"], console.log(sessionToken); state.openbisService = v3 var userName = window.location.pathname.split("/")[2]; - _this.loadResource('/user/' + userName + '/nbextensions/openbis/jquery-select2/css/select2.min.css', 'css', function () { + _this.loadResource('/user/' + userName+ '/nbextensions/jupyter-openbis-extension/jquery-select2/css/select2.min.css', 'css', function() { _this.createDropdown(element, state, upload) }) }) .fail(function (result) { alert('openbis v3 service login failed for ' + apiUrl + " : property 'trusted-cross-origin-domains' is probably not set in service.properties.") - console.log(element); - let entityIdentifier = document.createElement("INPUT") - entityIdentifier.type = "text" - entityIdentifier.name = "entityIdentifier" - entityIdentifier.size = 40 - entityIdentifier.placeholder = "Sample or Experiment identifier/permId" - entityIdentifier.value = state.entityIdentifier - element.parentNode.removeChild(element.nextElementSibling) - element.parentNode.insertBefore(entityIdentifier, element.nextSibling) }) }, function (err){ - let entityIdentifier = document.createElement("INPUT") - entityIdentifier.type = "text" - entityIdentifier.name = "entityIdentifier" - entityIdentifier.size = 40 - entityIdentifier.placeholder = "Sample or Experiment identifier/permId" - console.log(element); - element.innerHTML = entityIdentifier + alert('failed to load required libraries') }) } else { diff --git a/jupyter-openbis-extension/static/uploadDialog.js b/jupyter-openbis-extension/static/uploadDialog.js index d437deb5f1e691c802f9f49b318389e4daa6a8f4..3aca46503f9ad2e4c337c14f2007d1612dc57e9c 100644 --- a/jupyter-openbis-extension/static/uploadDialog.js +++ b/jupyter-openbis-extension/static/uploadDialog.js @@ -24,7 +24,8 @@ define([ spinner.className="openbis-feedback" spinner.src="" function showSpinner(env) { - spinner.src = env.notebook.base_url + "nbextensions/openbis/spinner.gif" + var userName = window.location.pathname.split("/")[2]; + spinner.src = '/user/' + userName+ '/nbextensions/jupyter-openbis-extension/spinner.gif' } function hideSpinner(env) { spinner.src="" diff --git a/setup.py b/setup.py index 3846ddffcdc3134fbbdcbbec2bcf82c2969cd11a..64269d91f2c8e902a41bb62e635ca2d0461ee7d9 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setup( name='jupyter-openbis-extension', - version= '0.2.5', + version= '0.2.7', author='Swen Vermeul | ID SIS | ETH Zürich', author_email='swen@ethz.ch', description='Extension for Jupyter notebooks to connect to openBIS and download/upload datasets, inluding the notebook itself',