diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
index bda936e2b52517c9d6aea7555a25e7f67e7a66cd..cdc1d86362db61fcf37555301eaefef6427e93de 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
@@ -731,3 +731,18 @@ table.downloads {
#settings-slider-low-storage, #settings-slider-low-box {
width : 100% !important;
}
+
+/*
+ * FancyTree custom icon
+ */
+
+span.fancytree-custom-icon {
+ margin-top: 2px;
+ width: 1em;
+ height: 1em;
+ display: inline-block;
+ vertical-align: top;
+ background-repeat: no-repeat;
+ background-position: 0 0;
+ margin-left: .5em;
+}
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/img/jupyter-icon.png b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/img/jupyter-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5f6f2757a194d2d5423c68d544d2b69e9abffb1
Binary files /dev/null and b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/img/jupyter-icon.png differ
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
index 1213409cef02a1d37bee1f30d97ad817e5d65f36..ac80a96958f45315a66925f0a9e8686a9b89adb7 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
@@ -111,7 +111,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
//Jupyter Button
if(profile.jupyterIntegrationServerEndpoint) {
- var $jupyterBtn = FormUtil.getButtonWithIcon("glyphicon-log-in", function () {
+ var $jupyterBtn = FormUtil.getButtonWithImage("./img/jupyter-icon.png", function () {
var jupyterNotebook = new JupyterNotebookController(_this._dataSetFormModel.dataSet);
jupyterNotebook.init();
});
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerModel.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerModel.js
index 042544cb906857b70ea1e2822fcff642a0edbf2b..32404d9aa08c12cbaadad8009eea30f7f075389c 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerModel.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerModel.js
@@ -100,7 +100,7 @@ function DataSetViewerModel(containerId, profile, entity, serverFacade, datastor
if(this._isJupyterNotebook(datasetFile.pathInDataSet)) {
var notebookURL = profile.getDefaultDataStoreURL() + "/" + datasetCode + "/" + datasetFile.pathInDataSet + "?sessionID=" + mainController.serverFacade.getSession();
var onclick = "JupyterUtil.copyNotebook(\"" + datasetCode + "\",\"" + notebookURL + "\");"
- return "<span onclick='" + onclick + "' class='glyphicon glyphicon-log-in'></span>";
+ return "<span onclick='" + onclick + "'><img src='./img/jupyter-icon.png' style='width:17px; height:17px;' /></span>";
}
return null;
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
index 0daa25ac05a2c7cd03a9de9446f62723370b5c8f..b82e46d5dfd29c95c561c3e07c7ec6168ec0d155 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
@@ -139,7 +139,7 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
//Jupyter Button
if(profile.jupyterIntegrationServerEndpoint) {
- var $jupyterBtn = FormUtil.getButtonWithIcon("glyphicon-log-in", function () {
+ var $jupyterBtn = FormUtil.getButtonWithImage("./img/jupyter-icon.png", function () {
var jupyterNotebook = new JupyterNotebookController(_this._experimentFormModel.experiment);
jupyterNotebook.init();
});
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
index 62982d361428bec8da645ae0933a321cfb300f64..70240c1f632711ab666d771bf9ef1cfd3baf487b 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
@@ -122,7 +122,7 @@ function ProjectFormView(projectFormController, projectFormModel) {
//Jupyter Button
if(profile.jupyterIntegrationServerEndpoint) {
- var $jupyterBtn = FormUtil.getButtonWithIcon("glyphicon-log-in", function () {
+ var $jupyterBtn = FormUtil.getButtonWithImage("./img/jupyter-icon.png", function () {
var jupyterNotebook = new JupyterNotebookController(_this._projectFormModel.project);
jupyterNotebook.init();
});
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index daae92dbf0645385574b5bbd9249badf62d1d52c..72613ce2f13b8b2baa267ed0d9223de68e7afe2e 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -244,7 +244,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
//Jupyter Button
if(profile.jupyterIntegrationServerEndpoint) {
- var $jupyterBtn = FormUtil.getButtonWithIcon("glyphicon-log-in", function () {
+ var $jupyterBtn = FormUtil.getButtonWithImage("./img/jupyter-icon.png", function () {
var jupyterNotebook = new JupyterNotebookController(_this._sampleFormModel.sample);
jupyterNotebook.init();
});
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 0a93acba2e58086220587b6151e6fb9beb321839..87b2f23731f4fb3c1d3dedc4fe962cf98d187e27 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
@@ -170,10 +170,10 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
if(profile.jupyterEndpoint) {
var jupyterLink = _this.getLinkForNode("Jupyter Workspace", "JUPYTER_WORKSPACE", "showJupyterWorkspace", null);
- treeModelUtils.push({ title : jupyterLink, entityType: "JUPYTER_WORKSPACE", key : "JUPYTER_WORKSPACE", folder : false, lazy : false, view : "showJupyterWorkspace", icon : "glyphicon glyphicon-log-in" });
+ treeModelUtils.push({ title : jupyterLink, entityType: "JUPYTER_WORKSPACE", key : "JUPYTER_WORKSPACE", folder : false, lazy : false, view : "showJupyterWorkspace" });
var jupyterNotebook = _this.getLinkForNode("New Jupyter Notebook", "NEW_JUPYTER_NOTEBOOK", "showNewJupyterWorkspaceCreator", null);
- treeModelUtils.push({ title : jupyterNotebook, entityType: "NEW_JUPYTER_NOTEBOOK", key : "NEW_JUPYTER_NOTEBOOK", folder : false, lazy : false, view : "showNewJupyterNotebookCreator", icon : "glyphicon glyphicon-log-in" });
+ treeModelUtils.push({ title : jupyterNotebook, entityType: "NEW_JUPYTER_NOTEBOOK", key : "NEW_JUPYTER_NOTEBOOK", folder : false, lazy : false, view : "showNewJupyterNotebookCreator" });
}
if(profile.mainMenu.showUserProfile && profile.isFileAuthenticationService && profile.isFileAuthenticationUser) {
@@ -580,5 +580,17 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
if (stock) {
stock.setExpanded(true);
}
+
+ setCustomIcon($tree, "JUPYTER_WORKSPACE", "./img/jupyter-icon.png");
+ setCustomIcon($tree, "NEW_JUPYTER_NOTEBOOK", "./img/jupyter-icon.png");
+ }
+
+ function setCustomIcon($tree, nodeKey, iconImage) {
+ var $customIconNode = $("<span>", { class : "fancytree-custom-icon" }).append($("<img>", { "src" : iconImage, 'style' : 'width:16px; height:16px;'}));
+ var node = $tree.fancytree("getTree").getNodeByKey(nodeKey);
+ var $nodeSpan = $(node.span);
+ var $nodeSpanIcon = $nodeSpan.find(".fancytree-icon");
+ $customIconNode.insertAfter($nodeSpanIcon);
+ $nodeSpanIcon.remove();
}
}
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormView.js
index 04644c623b28ee42d509121c609f5e52d7a56fd6..14395e6e736036586f1ff244ecad4763d54b6c4d 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormView.js
@@ -56,7 +56,7 @@ function SpaceFormView(spaceFormController, spaceFormModel) {
//Jupyter Button
if(profile.jupyterIntegrationServerEndpoint) {
- var $jupyterBtn = FormUtil.getButtonWithIcon("glyphicon-log-in", function () {
+ var $jupyterBtn = FormUtil.getButtonWithImage("./img/jupyter-icon.png", function () {
var jupyterNotebook = new JupyterNotebookController(_this._spaceFormModel.space);
jupyterNotebook.init();
});