From: jprocter <jprocter@dundee.ac.uk>
Date: Tue, 21 Jan 2014 16:14:13 +0000 (+0000)
Subject: Merge branch 'JAL-1400_sandboxapp' into Release_2_8_Branch
X-Git-Tag: Release_2_8_0b1~1^2~16
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=72587efae7a053ec7ef909f8454c2cdb6be60c0e;hp=c9a0bad2deba88c000b71565be443554c5093e87;p=jalview.git

Merge branch 'JAL-1400_sandboxapp' into Release_2_8_Branch
working examples for signed sandboxed applet
---

diff --git a/examples/applets.html b/examples/applets.html
index 0629af0..92b64bf 100755
--- a/examples/applets.html
+++ b/examples/applets.html
@@ -228,7 +228,7 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
       <td width="10%" valign="center"><applet
         code="jalview.bin.JalviewLite" width="140" height="35"
         archive="jalviewApplet.jar,JmolApplet-12.2.4.jar">
-<param name="permissions" value="sandbox">
+       <param name="permissions" value="sandbox">
        <param name="file" value="uniref50.fa">
         <!-- <param name="debug" value="true">
                         -->
diff --git a/examples/linkedapplets_ng.html b/examples/linkedapplets_ng.html
index 1d6b447..0a5ff58 100644
--- a/examples/linkedapplets_ng.html
+++ b/examples/linkedapplets_ng.html
@@ -210,7 +210,7 @@ document.onclick = mclose;
     APPLICATION_URL : "http://www.jalview.org/services/launchApp"
   };
  
-  deployJava.runApplet(attributes, parameters, '1.6+');
+  deployJava.runApplet(attributes, parameters, '1.6');
 </script>
 <script> 
   var attributes = {
@@ -242,7 +242,7 @@ document.onclick = mclose;
     permissions : 'sandbox',
    APPLICATION_URL : "http://www.jalview.org/services/launchApp"
   };
-  deployJava.runApplet(attributes, parameters, '1.6+');
+  deployJava.runApplet(attributes, parameters, '1.6');
 </script>
     <p>
 <!--      <a href="javascript:linkJvJmol()">Click Me If you don't see any messages below</a>