diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js index bc4bf5628e3c887fae0fc52ef5ac907a575c131f..70724ece792448a43b95ce76ad3c819036784f95 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js @@ -109,9 +109,13 @@ function MainController(profile) { //Page reload using the URL info var queryString = Util.queryString(); var viewName = queryString.viewName; - var viewData = queryString.viewData + var viewData = queryString.viewData; + var hideMenu = queryString.hideMenu; if(viewName && viewData) { localReference.changeView(viewName, viewData); + if(hideMenu === "true") { + localReference.sideMenu.hideSideMenu(); + } } else { localReference.changeView("showHelloPage", null); } diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js index 5ed9bc290af564d51ff6e829a1f726b860c5b23b..5a67ef50f3c5319da4a004162ba28442f8a1204e 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js @@ -389,7 +389,7 @@ function SampleTable(serverFacade, sampleTableId, profile, sampleTypeCode, inspe var imageOnClick = "javascript:Util.showImage($('#preview"+sample.identifier.replace(/\//g,'-')+"').attr('src')); event.stopPropagation();"; var url = document.location.href; url = url.substring(0,url.lastIndexOf("/") + 1); - var sampleLink = "<a href='"+url+"?viewName=showViewSamplePageFromPermId&viewData=" + sample.permId + "' target='_blank'>" + sample.code + "</a>"; + var sampleLink = "<a href='"+url+"?viewName=showViewSamplePageFromPermId&viewData=" + sample.permId + "&hideMenu=true' target='_blank'>" + sample.code + "</a>"; if(localReference.isSearch) { tableFields = [sampleLink, "<img data-preview-loaded='false' onClick=\""+imageOnClick+"\" class='zoomableImage' id='preview"+sample.identifier.replace(/\//g,'-')+"' src='./img/image_loading.gif' style='height:80px;'></img>", sample.sampleTypeCode, sample.properties, sample.properties ]; diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js index cf1dcbc657cc3d8bc97ea62244a1fa2dbcc4c5be..f3a9c26870dfc898321f7f3fe6017e4a43a1f8a7 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js @@ -31,6 +31,7 @@ function SideMenuWidget(mainController, containerId, serverFacade) { this._menuDOMBody = null; this._menuStructure = new SideMenuWidgetComponent(false, true, "Main Menu", null, { children : [] }, 'showHelloPage', null, ""); this._pointerToMenuNode = this._menuStructure; + this.isHidden = false; this._getProjectNodeForCode = function(projectCode) { for(var sIdx = 0; sIdx < this._menuStructure.newMenuIfSelected.children.length; sIdx++) { @@ -206,6 +207,7 @@ function SideMenuWidget(mainController, containerId, serverFacade) { .append($("<span>", { "class" : "glyphicon glyphicon-resize-horizontal" })); $("#main").append($toggleButtonShow); + this.isHidden = true; } this.showSideMenu = function() { @@ -213,6 +215,7 @@ function SideMenuWidget(mainController, containerId, serverFacade) { $("#toggleButtonShow").remove(); $("#mainContainer").removeClass("col-md-12"); $("#mainContainer").addClass("col-md-10"); + this.isHidden = false; } this._repaint = function() {