X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=examples%2Flinkedapplets_ng.html;h=0449c0bcba037b517a9097b87b217b99e7c5fa86;hb=ddcf4db31dc41b15dc21314cb6c85192d15bdf6c;hp=57869611fb0ba30f5187e98b623bec86aa07a56c;hpb=3eddf87cb1eb8046d191c65ec69d83264a3c41c0;p=jalview.git

diff --git a/examples/linkedapplets_ng.html b/examples/linkedapplets_ng.html
index 5786961..0449c0b 100644
--- a/examples/linkedapplets_ng.html
+++ b/examples/linkedapplets_ng.html
@@ -17,103 +17,72 @@
  * The Jalview Authors are detailed in the 'AUTHORS' file.
 -->
 
+<div id="view_decorated" name="view_decorated"  style="margin:8px; padding:10px; border: 2px solid red; text-align:center; display:none;"><b>Click <a href="index.html#linkedapplets_ng"> here</a> to view decorated page</b></div>
+
 <!-- boiler plate link to alternate demopage -->
 <div style="width: 100%">
 <div style="width:35%; align:left; float:right;">
 <div style="margin:8px; padding:10px; border: 2px solid black; align: left;">
-<p>Quick Links to jars for example:<br/><a href="jalviewApplet.jar">jalviewApplet.jar</a> and <a href="JmolApplet-12.2.4.jar">JmolApplet.jar</a>
+<p>Quick Links to jars for example:<br/><a href="jalviewApplet.jar">jalviewApplet.jar</a> and <a href="JmolApplet-14.2.14_2015.06.11.jar">JmolApplet.jar</a>
 </p></div>
 </div>
 </div>
 
+
+
+
+
 <!-- content template start -->
-<script src="javascript/deployJava.js"></script>
-<script src="javascript/jshashtable-2.1.js" language="javascript"></script>
-<script src="javascript/jalview.js" language="javascript"></script>
-<script>  //deployJava.debug="true";
-  
-  function lJvApp() {
-    var jvapp = document.getElementById("jvapp");
-    var jvfollower = document.getElementById("jvfollower");
-    setConsole(document.getElementById("stdout"));
-    //jvapp.setSeparator(""+jvapp.getSeparator());
-    linkJvJmol(jvapp);
-  };
-
-  function lJvFollow() {
-    var jvapp = document.getElementById("jvapp");
-    var jvfollower = document.getElementById("jvfollower");
-    //jvfollower.setSeparator(""+jvfollower.getSeparator());
-    linkJvJmol(jvfollower);
-  };
-</script>
+
     <h2>JalviewLite Linked Applets Demo</h2>
     <p>The two applets below use <a href="javascript:doSubmit('jalviewLiteJs')">JalviewLite's javascript API</a> to exchange events about the currently selected region and mouse position in the alignment.
     </p>
-	<script> 
-  var attributes = {
-    code : 'jalview.bin.JalviewLite',
-    archive : 'jalviewApplet.jar,JmolApplet-12.2.4.jar',
-    width : 800,
-    height : 300,
-    mayscript : 'True', scriptable: 'True',
-    id : 'jvapp'
-  };
-  var parameters = {
-    oninit : "lJvApp",
-    automaticScrolling : "true",
-    file : "plantfdx.fa",
-    annotations : "plantfdx.annotations",
-    debug : "true",
-    wrap : "false",
-    // separator : "^",
-    showAnnotation : "true",
-    embedded : "true",
-    showFullId : "false",
-    RGB : "F2F2FF",
-    linkLabel_1 : "EMBL-EBI Search",
-    linkUrl_1 : "http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"
-    ,
-    linkLabel_2 : "Uniprot"
-    ,
-    linkUrl_2 : "http://www.uniprot.org/uniprot/$SEQUENCE_ID$",
-    permissions : 'sandbox',
-    APPLICATION_URL : "http://www.jalview.org/services/launchApp"
-  };
- 
-  deployJava.runApplet(attributes, parameters, '1.6');
-</script>
-<script> 
-  var attributes = {
-    code : 'jalview.bin.JalviewLite',
-    archive : 'jalviewApplet.jar,JmolApplet-12.2.4.jar',
-    width : 800,
-    height : 300,
-    mayscript : 'True', scriptable: 'True',
-    id : "jvfollower"
-  };
-  var parameters = {
-    oninit : "lJvFollow",
-    file : "plantfdx.fa",
-    annotations : "plantfdx.annotations",
-    automaticScrolling : "true",
-    debug : "true",
-    wrap : "false",
-    // separator : "^",
-    showAnnotation : "true",
-    embedded : "true",
-    showFullId : "false",
-    RGB : "F2F2FF",
-    linkLabel_1 : "EMBL-EBI Search",
-    linkUrl_1 : "http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"
-    ,
-    linkLabel_2 : "Uniprot",
-    linkUrl_2 : "http://www.uniprot.org/uniprot/$SEQUENCE_ID$",
-    permissions : 'sandbox',
-   APPLICATION_URL : "http://www.jalview.org/services/launchApp"
-  };
-  deployJava.runApplet(attributes, parameters, '1.6');
-</script>
+
+
+<applet
+   code="jalview.bin.JalviewLite" width="800" height="300" id="jvapp" mayscript="True" scriptable="True" archive="jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar,java-json.jar,json_simple-1.1.jar">
+<param name="oninit" value="lJvApp"/>
+<param name="automaticScrolling" value="true"/>
+<param name="file" value="plantfdx.fa"/>
+<param name="annotations" value="plantfdx.annotations"/>
+<param name="debug" value="true"/>
+<param name="wrap" value="false"/>
+<param name="showAnnotation" value="true"/>
+<param name="embedded" value="true"/>
+<param name="showFullId" value="false"/>
+<param name="RGB" value="F2F2FF"/>
+<param name="linkLabel_1" value="EMBL-EBI Search"/>
+<param name="linkUrl_1" value="http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"/>
+<param name="linkLabel_2" value="Uniprot"/>
+<param name="linkUrl_2" value="http://www.uniprot.org/uniprot/$SEQUENCE_ID$"/>
+<param name="permissions" value="sandbox"/>
+<param name="APPLICATION_URL" value="http://www.jalview.org/services/launchApp"/>
+</applet>
+
+
+
+
+<applet
+   code="jalview.bin.JalviewLite" width="800" height="300" id="jvfollower" mayscript="True" scriptable="True" archive="jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar,java-json.jar,json_simple-1.1.jar">
+<param name="oninit" value="lJvFollow"/>
+<param name="file" value="plantfdx.fa"/>
+<param name="annotations" value="plantfdx.annotations"/>
+<param name="automaticScrolling" value="true"/>
+<param name="debug" value="true"/>
+<param name="wrap" value="false"/>
+<param name="showAnnotation" value="true"/>
+<param name="embedded" value="true"/>
+<param name="showFullId" value="false"/>
+<param name="RGB" value="F2F2FF"/>
+<param name="linkLabel_1" value="EMBL-EBI Search"/>
+<param name="linkUrl_1" value="http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"/>
+<param name="linkLabel_2" value="Uniprot"/>
+<param name="linkUrl_2" value="http://www.uniprot.org/uniprot/$SEQUENCE_ID$"/>
+<param name="permissions" value="sandbox"/>
+<param name="APPLICATION_URL" value="http://www.jalview.org/services/launchApp"/>
+</applet>
+
+
     <p>
 <!--      <a href="javascript:linkJvJmol()">Click Me If you don't see any messages below</a>
       <br>