JAL-957 JAL-1400 use signed/unsigned applet as needed

diff --git a/examples-jbake/templates/jvl_embeddedWJmol_hdr.ftl b/examples-jbake/templates/jvl_embeddedWJmol_hdr.ftl
index d41f599..20504d8 100644 (file)
--- a/examples-jbake/templates/jvl_embeddedWJmol_hdr.ftl
+++ b/examples-jbake/templates/jvl_embeddedWJmol_hdr.ftl
@@ -10,7 +10,7 @@
 <script language="JavaScript">
 // instead of this, we use a custom JmolApplet spec
 // jmolInitialize('jmol');
-jmolInitialize("","JmolApplet-12.2.4.jar");
+jmolInitialize("","${content.jmol}");
 function genHref()
 {
  var s1 = "ml:i@midd..", s2 = "atelcpoueau", s3 = "iomyob.neck", href="";
@@ -52,7 +52,7 @@ function genHref()
  var _jvA=new Object();
  _jvA.attributes = {
   code : 'jalview.bin.JalviewLite',
-  archive : 'jalviewApplet.jar',
+  archive : '${content.jvl}',
   width : '500',
   height : '350',
   mayscript : 'True',
@@ -83,7 +83,7 @@ function genHref()
   linkUrl_2 : "http://www.uniprot.org/uniprot/$SEQUENCE_ID$",
   APPLICATION_URL : "http://www.jalview.org/services/launchApp",
   PDBfile : "1gaq.txt FER1_MAIZE",
-  permissions : "all-permissions"
+  permissions : "sandbox"
  };
  jmolSetCallback("hoverCallback","_jmolhover");
   jmolSetCallback("pickCallback","_jmolpick");

diff --git a/examples-jbake/templates/jvl_linkedapplets_ng.ftl b/examples-jbake/templates/jvl_linkedapplets_ng.ftl
index a3c0b3e..96abf47 100644 (file)
--- a/examples-jbake/templates/jvl_linkedapplets_ng.ftl
+++ b/examples-jbake/templates/jvl_linkedapplets_ng.ftl
@@ -18,12 +18,12 @@
   };
 </script>
     <strong>JalviewLite Linked Applets Demo<br></strong>
-    <p>The two applets below use <a href="JalviewLiteJs.html">JalviewLite's javascript API</a> to exchange events about the currently selected region and mouse position in the alignment.
+    <p>The two applets below use <a href="jalviewLiteJs.html">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',
+    archive : '${content.jvl}',
     width : 800,
     height : 300,
     mayscript : 'True', scriptable: 'True',
@@ -47,7 +47,7 @@
     linkLabel_2 : "Uniprot"
     ,
     linkUrl_2 : "http://www.uniprot.org/uniprot/$SEQUENCE_ID$",
-    permissions : 'all-permissions',
+    permissions : 'sandbox',
     APPLICATION_URL : "http://www.jalview.org/services/launchApp"
   };
  
@@ -56,7 +56,7 @@
 <script> 
   var attributes = {
     code : 'jalview.bin.JalviewLite',
-    archive : 'jalviewApplet.jar',
+    archive : '${content.jvl}',
     width : 800,
     height : 300,
     mayscript : 'True', scriptable: 'True',
@@ -80,7 +80,7 @@
     linkLabel_2 : "Uniprot"
     ,
     linkUrl_2 : "http://www.uniprot.org/uniprot/$SEQUENCE_ID$",
-    permissions : 'all-permissions',
+    permissions : 'sandbox',
    APPLICATION_URL : "http://www.jalview.org/services/launchApp"
   };
   deployJava.runApplet(attributes, parameters, '1.6');