JAL-845 set split frame divider safely for eXpand Views

[jalview.git] / resources / templates / BioJSTemplate.txt

diff --git a/resources/templates/BioJSTemplate.txt b/resources/templates/BioJSTemplate.txt
index af0e4d2..bf780bb 100644 (file)
--- a/resources/templates/BioJSTemplate.txt
+++ b/resources/templates/BioJSTemplate.txt
@@ -7,15 +7,15 @@
 <!-- <script src="https://s3-eu-west-1.amazonaws.com/biojs/msa/latest/msa.js"></script> -->
 <!-- <link type=text/css rel=stylesheet href=https://s3-eu-west-1.amazonaws.com/biojs/msa/latest/msa.css /> -->
  
- <img src="#jalview_logo#" alt="Jalview Logo" title="This html page was generated from Jalview, to import the data back to Jalview, please drag the generated html file and drop it unto the Jalview workbench.
+ <img src="http://www.jalview.org/help/html/Jalview_Logo.png" alt="Jalview Logo" title="This html page was generated from Jalview, to import the data back to Jalview, please drag the generated html file and drop it unto the Jalview workbench.
  
  Alternatively, you could copy the url from the address bar and use Jalview's url importer (main menu-> File-> Input Alignment-> from URL) to import back the alignment jalview." >
 
 </br>
 </br>
 
-<button onclick="javascipt:openJalviewUsingCurrentUrl();">Launch in Jalview</button>
 <input type="button" name="divToggleButton" id="divToggleButton" onclick="javascipt:toggleMenuVisibility();" value="Show Menu"></input>
+<button onclick="javascipt:openJalviewUsingCurrentUrl();">Launch in Jalview</button>
 
 </br>
 </br> 
@@ -31,8 +31,6 @@
 <script>
 
 function toggleMenuVisibility(){
-       //alert("toggleMenuVisibility called!");
-       
        var menu = document.getElementsByClassName("biojs_msa_menubar");
        var divToggleButton = document.getElementById("divToggleButton");
        if(menu[0].style.display == 'block'){
@@ -46,19 +44,27 @@ function toggleMenuVisibility(){
 
 
 function openJalviewUsingCurrentUrl(){
-       var url = "http://webservices.compbio.dundee.ac.uk:38080/jalviewServlet/services/launchAppDev";
+       var jalviewData = JSON.parse(document.getElementById("seqData").value)
+    var jalviewVersion = jalviewData['jalviewVersion'];
+    var url = jalviewData['webStartUrl'];
        var myForm = document.createElement("form");
        myForm.action = url;
        
-    var myInput = document.createElement("input") ;
-    myInput.setAttribute("name", "jvm-max-heap") ;
-    myInput.setAttribute("value", "2G");
-    myForm.appendChild(myInput) ;
+    var heap = document.createElement("input") ;
+    heap.setAttribute("name", "jvm-max-heap") ;
+    heap.setAttribute("value", "2G");
+    myForm.appendChild(heap) ;
+    
+    var target = document.createElement("input") ;
+    target.setAttribute("name", "open") ;
+    target.setAttribute("value", document.URL);
+    myForm.appendChild(target) ;
+    
+    var jvVersion = document.createElement("input") ;
+    jvVersion.setAttribute("name", "version") ;
+    jvVersion.setAttribute("value", jalviewVersion);
+    myForm.appendChild(jvVersion) ;
     
-    var myInput1 = document.createElement("input") ;
-    myInput1.setAttribute("name", "open") ;
-    myInput1.setAttribute("value", document.URL);
-    myForm.appendChild(myInput1) ;    
 
        document.body.appendChild(myForm) ;
        myForm.submit() ;
@@ -9020,7 +9026,6 @@ m.addView("menu", defMenu);
 
 // call render at the end to display the whole MSA
 m.render();
- 
 toggleMenuVisibility(); 
 toggleMenuVisibility(); 
 });