Merge pull request #480 from antolinos/issue_479

Menu Protein and crystals appear. It fixes issue #479
ispyb · Nov 26, 2018 · 5df8f9a · 5df8f9a
2 parents 9f85113 + fc3f082
commit 5df8f9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/js/mx/menu/mxmainmenu.js b/js/mx/menu/mxmainmenu.js
@@ -19,20 +19,15 @@ MXMainMenu.prototype.getMenuItems = function() {
 	return [
 		this.getHomeItem(),
 		this.getShipmentItem(),
-		/*{
-                text : this._convertToHTMLWhiteSpan("Proteins and Crystals <sub style='font-size:10px;color:orange'>NEW</sub>"),
-                cls : 'ExiSAXSMenuToolBar',
-                disabled : false,
-                menu : this.getProteinCrystalsMenu() 
-	    	},
+
 			{
                 text : this._convertToHTMLWhiteSpan("Proteins and Crystals <sub style='font-size:10px;color:orange'>NEW</sub>"),
                 cls : 'ExiSAXSMenuToolBar',
                 disabled : false,
                 handler : function(){
                     location.hash = "#/protein/list";
                 }
-	    	},*/
+	    	},
 	    	{
                 text : this._convertToHTMLWhiteSpan("Prepare Experiment"),
                 cls : 'ExiSAXSMenuToolBar',

diff --git a/js/mx/menu/mxmanagermenu.js b/js/mx/menu/mxmanagermenu.js
@@ -32,14 +32,14 @@ MXManagerMenu.prototype.getMenuItems = function() {
 
 				}
 		},
-		/*{
+		{
                 text : this._convertToHTMLWhiteSpan("Proteins and Crystals <sub style='font-size:10px;color:orange'>NEW</sub>"),
                 cls : 'ExiSAXSMenuToolBar',
                 disabled : false,
                 handler : function(){
                     location.hash = "#/protein/list";
                 }
-	    	},*/
+	    },
 		{
 				text : this._convertToHTMLWhiteSpan("Data Explorer"),
 				cls : 'ExiSAXSMenuToolBar',