From 18e2ff358c455104779a312032d35937e3cfcae9 Mon Sep 17 00:00:00 2001
From: Yuchen Jiang <yuchen.jiang@uconn.edu>
Date: Thu, 10 Sep 2015 21:45:28 -0400
Subject: [PATCH] menu update

---
 VQI_GenomeBrowser.js | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/VQI_GenomeBrowser.js b/VQI_GenomeBrowser.js
index 84dfb79..efc4754 100755
--- a/VQI_GenomeBrowser.js
+++ b/VQI_GenomeBrowser.js
@@ -111,30 +111,35 @@ function VQI_GenomeBrowser(id, serviceURL) {
         var menu = "<ul class='nav nav-tabs' style='font-size: 16'>"+
                     "<li class='active'><a data-toggle='tab' href='#home'>Home</a></li>"+
                     "<li><a data-toggle='tab' href='#traks'>Track</a></li>"+
-                    "<li><a data-toggle='tab' href='#data'>Data</a></li>"+
+                    "<li><a data-toggle='tab' href='#analysis'>Analysis</a></li>"+
                     "<li><a data-toggle='tab' href='#other'>Other</a></li>"+
                     "</ul>"
+        var homeTable = "<table cellpadding='5'; style='margin: 0px 20px;font-size: 14'>"+
+                        "<tr> <td id='trackNavContainer'> </td></tr>"+
+                        "<tr> <td id=''> </td></tr>"+
+                        "<tr> <td id=''> </td></tr>"+
+                        "</table>"
 
         var tackMenuTable = "<table cellpadding='5'; style='margin: 0px 20px;font-size: 14'>"+
-                        "<tr> <td id='trackNavContainer'> </td></tr>"+
+                        "<tr> <td id='uploadDataContainer'> </td></tr>"+
                         "<tr> <td id='recentTrackContainer'> </td></tr>"+
-                        "<tr> <td id='colocalizeContainer'> </td></tr>"+
+                        "<tr> <td id='exportRemoveContainer'> </td></tr>"+
                         "</table>"
 
-        var dataMenuTable = "<table cellpadding='5'; style='margin: 0px 20px;font-size: 14'>"+
-                        "<tr> <td id='uploadDataContainer'> </td></tr>"+
-                        "<tr> <td id='exportContainer'> </td></tr>"+
+        var analysisMenuTable = "<table cellpadding='5'; style='margin: 0px 20px;font-size: 14'>"+
+                        "<tr> <td id='colocalizeContainer'> </td></tr>"+
+                        "<tr> <td id='mcEntContainer'> </td></tr>"+
                         "</table>"
 
         var menuContent =  "<div class='tab-content'>"+
-                            "<div id='home' class='tab-pane fade in active'></div>"+
+                            "<div id='home' class='tab-pane fade in active' style='height: 130px; width: 800px; background-color:#F0F0F0'>"+homeTable+"</div>"+
                             "<div id='traks' class='tab-pane fade ' style='height: 130px; width: 800px; background-color:#F0F0F0'>"+tackMenuTable+"</div>"+
-                            "<div id='data' class='tab-pane fade' style='height: 130px; width: 800px; background-color:#F0F0F0'>"+dataMenuTable+"</div>"+
+                            "<div id='analysis' class='tab-pane fade' style='height: 130px; width: 800px; background-color:#F0F0F0'>"+analysisMenuTable+"</div>"+
                             "<div id='other' class='tab-pane fade'></div>"+  
                             "</div>"
 
 
-        var menuContainer = "<div class='container-fluid'>"+menu+menuContent+"</div>";
+        var menuContainer = "<div class='container-fluid' >"+menu+menuContent+"</div>";
         $("#" + divId).append(menuContainer);
 
     };
@@ -338,6 +343,7 @@ function VQI_GenomeBrowser(id, serviceURL) {
         });
 
         var f = document.createElement("form");
+        fileInput.style.display="inline";
         f.innerHTML = "Add track by uploading file: ";
         f.appendChild(fileInput);
         $("#" + divId + " #uploadDataContainer").append(f);
@@ -364,12 +370,14 @@ function VQI_GenomeBrowser(id, serviceURL) {
     
 
     this.makeSelectionForm = function () {
-        var removeButton = "<input type='button' id='removetrackbutton' value='Remove Track'>";
-        var exportButton = "<input type='button' id='exporttrackbutton' value='Export'>";
+        var removeButton = "<input type='button' id='removetrackbutton' value='Remove Selected Track'>";
+        var exportButton = "<input type='button' id='exporttrackbutton' value='Export Selected Track'>";
         var mcScoreButton = "<input type='button' id='mcscoreTracks' value='MC System' onclick='VQI_ControlPanel.scoreButtonClicked()'>";
         var entScoreButton = "<input type='button' id='entscoreTracks' value='EMT Score' onclick='VQI_ControlPanel.EMTScoreButtonClicked()'>";
-        var form = "<form id='selectionForm'>" + removeButton + exportButton + mcScoreButton + entScoreButton + "</form>";
-        $("#" + divId).append(form);
+        var removeExportform = "<form id='removeExportForm'>" + removeButton + "&nbsp&nbsp&nbsp"+exportButton +"</form>";
+        var mcEntForm = "<form id='mcEntForm'>" + mcScoreButton + "&nbsp&nbsp&nbsp"+entScoreButton +"</form>";
+        $("#" + divId +" #exportRemoveContainer").append(removeExportform);
+        $("#" + divId +" #mcEntContainer").append(mcEntForm);
         $("#" + divId + " #removetrackbutton").on("click", removeSelectedTracks.bind(this));
         $("#" + divId + " #exporttrackbutton").on("click", exportSelectedTracks.bind(this));
     };