From f6d2bacccd10c9de8e86804847feb74a652e647f Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Tue, 28 Jan 2014 14:36:02 +0000 Subject: [PATCH] JAL-957 neater boilerplate link to signed/unsigned examples and shortcuts for downloading applet jars --- examples-jbake/templates/page.ftl | 12 ++++++++---- examples/appletParameters.html | 24 +++++++++--------------- examples/applets.html | 12 ++++++++---- examples/embedded.html | 12 ++++++++---- examples/embeddedWJmol.html | 12 ++++++++---- examples/formComplete.html | 12 ++++++++---- examples/jalviewLiteJs.html | 2 +- examples/javascriptLaunch.html | 12 ++++++++---- examples/linkedapplets_ng.html | 14 +++++++++----- examples/u_applets.html | 14 +++++++++----- examples/u_embedded.html | 14 +++++++++----- examples/u_embeddedWJmol.html | 14 +++++++++----- examples/u_formComplete.html | 14 +++++++++----- examples/u_javascriptLaunch.html | 14 +++++++++----- examples/u_linkedapplets_ng.html | 16 ++++++++++------ 15 files changed, 122 insertions(+), 76 deletions(-) diff --git a/examples-jbake/templates/page.ftl b/examples-jbake/templates/page.ftl index fb8b88f..0cddb4d 100644 --- a/examples-jbake/templates/page.ftl +++ b/examples-jbake/templates/page.ftl @@ -8,14 +8,18 @@
-
-
+
+
<#if (content.alteg?exists) > - Scary Java warnings ? Try the signed applet demos + Scary Java warnings ?
Try the signed applet demos <#else> - Working on Snow Leopard or Java out of date ? Try the unsigned applet demos + Examples aren't working ?
Try the unsigned applet demos
+
+

Quick Links to jars for example:
jalviewApplet.jar and JmolApplet.jar +

+
diff --git a/examples/appletParameters.html b/examples/appletParameters.html index 7479729..167df36 100644 --- a/examples/appletParameters.html +++ b/examples/appletParameters.html @@ -151,7 +151,7 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
  • Jalview and Jmol
  • Access from Javascript
  • Javascript Launch
    • -
  • Linked JalviewLite applets
    • +
  • Linked JalviewLites
    • @@ -159,17 +159,14 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr -

    - Quick Links:

    -

    -

    Additional applet deployment notes are below.

    +

    +

    +

    +

    Additional applet deployment notes are below.

    Applet Parameters


    The applet takes the following initialisation parameters.

    @@ -487,9 +484,6 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr <param name="embedded" value="true"> -

    **APPLET SECURITY WARNINGS**

    **NEW FEATURES** in Jalview 2.8

    @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Working on Snow Leopard or Java out of date ? Try the unsigned applet demos +
    +
    + Examples aren't working ?
    Try the unsigned applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/embedded.html b/examples/embedded.html index e1029e0..ccecdfc 100644 --- a/examples/embedded.html +++ b/examples/embedded.html @@ -151,7 +151,7 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
  • Jalview and Jmol
  • Access from Javascript
  • Javascript Launch
    • -
  • Linked JalviewLite applets
    • +
  • Linked JalviewLites
    • @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Working on Snow Leopard or Java out of date ? Try the unsigned applet demos +
    +
    + Examples aren't working ?
    Try the unsigned applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/embeddedWJmol.html b/examples/embeddedWJmol.html index f5b6ce5..ec17568 100644 --- a/examples/embeddedWJmol.html +++ b/examples/embeddedWJmol.html @@ -242,7 +242,7 @@ function genHref()
  • Jalview and Jmol
  • Access from Javascript
  • Javascript Launch
    • -
  • Linked JalviewLite applets
    • +
  • Linked JalviewLites
    • @@ -252,9 +252,13 @@ function genHref()
    -
    -
    - Working on Snow Leopard or Java out of date ? Try the unsigned applet demos +
    +
    + Examples aren't working ?
    Try the unsigned applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/formComplete.html b/examples/formComplete.html index ea0aefa..4f270c9 100644 --- a/examples/formComplete.html +++ b/examples/formComplete.html @@ -151,7 +151,7 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
  • Jalview and Jmol
  • Access from Javascript
  • Javascript Launch
    • -
  • Linked JalviewLite applets
    • +
  • Linked JalviewLites
    • @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Working on Snow Leopard or Java out of date ? Try the unsigned applet demos +
    +
    + Examples aren't working ?
    Try the unsigned applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/jalviewLiteJs.html b/examples/jalviewLiteJs.html index 681d578..8b483b6 100644 --- a/examples/jalviewLiteJs.html +++ b/examples/jalviewLiteJs.html @@ -151,7 +151,7 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
  • Jalview and Jmol
  • Access from Javascript
  • Javascript Launch
    • -
  • Linked JalviewLite applets
    • +
  • Linked JalviewLites
    • diff --git a/examples/javascriptLaunch.html b/examples/javascriptLaunch.html index 7ba275a..be92133 100644 --- a/examples/javascriptLaunch.html +++ b/examples/javascriptLaunch.html @@ -151,7 +151,7 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
  • Jalview and Jmol
  • Access from Javascript
  • Javascript Launch
    • -
  • Linked JalviewLite applets
    • +
  • Linked JalviewLites
    • @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Working on Snow Leopard or Java out of date ? Try the unsigned applet demos +
    +
    + Examples aren't working ?
    Try the unsigned applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/linkedapplets_ng.html b/examples/linkedapplets_ng.html index 3a647ee..1c3fd41 100644 --- a/examples/linkedapplets_ng.html +++ b/examples/linkedapplets_ng.html @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License along with Jalview. If not, see . --> - Linked JalviewLite applets + Linked JalviewLites @@ -151,7 +151,7 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
  • Jalview and Jmol
  • Access from Javascript
  • Javascript Launch
    • -
  • Linked JalviewLite applets
    • +
  • Linked JalviewLites
    • @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Working on Snow Leopard or Java out of date ? Try the unsigned applet demos +
    +
    + Examples aren't working ?
    Try the unsigned applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/u_applets.html b/examples/u_applets.html index c07b035..76e41d8 100644 --- a/examples/u_applets.html +++ b/examples/u_applets.html @@ -146,12 +146,12 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Scary Java warnings ? Try the signed applet demos +
    +
    + Scary Java warnings ?
    Try the signed applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/u_embedded.html b/examples/u_embedded.html index 7e5a5ee..09e8772 100644 --- a/examples/u_embedded.html +++ b/examples/u_embedded.html @@ -146,12 +146,12 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Scary Java warnings ? Try the signed applet demos +
    +
    + Scary Java warnings ?
    Try the signed applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/u_embeddedWJmol.html b/examples/u_embeddedWJmol.html index b2976e1..011d303 100644 --- a/examples/u_embeddedWJmol.html +++ b/examples/u_embeddedWJmol.html @@ -237,12 +237,12 @@ function genHref()
    @@ -252,9 +252,13 @@ function genHref()
    -
    -
    - Scary Java warnings ? Try the signed applet demos +
    +
    + Scary Java warnings ?
    Try the signed applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/u_formComplete.html b/examples/u_formComplete.html index 9f0d1fd..b75e628 100644 --- a/examples/u_formComplete.html +++ b/examples/u_formComplete.html @@ -146,12 +146,12 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Scary Java warnings ? Try the signed applet demos +
    +
    + Scary Java warnings ?
    Try the signed applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/u_javascriptLaunch.html b/examples/u_javascriptLaunch.html index c8a53d1..9ea3a5a 100644 --- a/examples/u_javascriptLaunch.html +++ b/examples/u_javascriptLaunch.html @@ -146,12 +146,12 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Scary Java warnings ? Try the signed applet demos +
    +
    + Scary Java warnings ?
    Try the signed applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    diff --git a/examples/u_linkedapplets_ng.html b/examples/u_linkedapplets_ng.html index 57f05dd..56b7581 100644 --- a/examples/u_linkedapplets_ng.html +++ b/examples/u_linkedapplets_ng.html @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License along with Jalview. If not, see . --> - Linked JalviewLite applets + Linked JalviewLites @@ -146,12 +146,12 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    @@ -161,9 +161,13 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
    -
    -
    - Scary Java warnings ? Try the signed applet demos +
    +
    + Scary Java warnings ?
    Try the signed applet demos +
    +
    +

    Quick Links to jars for example:
    jalviewApplet.jar and JmolApplet.jar +

    -- 1.7.10.2