From b9117af25fa6c759fd626717557cc04a68400185 Mon Sep 17 00:00:00 2001
From: jprocter <jprocter@dundee.ac.uk>
Date: Tue, 21 Jan 2014 11:57:04 +0000
Subject: [PATCH] JAL-957 fix layout of pages

---
 examples-jbake/content/linkedapplets_ng.html      |    3 ++-
 examples-jbake/jbake.properties                   |    2 +-
 examples-jbake/templates/header.ftl               |    1 +
 examples-jbake/templates/jvl_embedded.ftl         |    6 ++++--
 examples-jbake/templates/jvl_examples.ftl         |    1 -
 examples-jbake/templates/jvl_linkedapplets_ng.ftl |    8 +++++---
 examples-jbake/templates/macros.ftl               |    2 +-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/examples-jbake/content/linkedapplets_ng.html b/examples-jbake/content/linkedapplets_ng.html
index 99ac0d3..ceb7897 100644
--- a/examples-jbake/content/linkedapplets_ng.html
+++ b/examples-jbake/content/linkedapplets_ng.html
@@ -4,5 +4,6 @@ jvl=jalviewApplet.jar
 jmol=JmolApplet-12.2.4.jar
 class=jvl_linkedapplets_ng.ftl
 status=published
-level=2
+level=1
 ~~~~~~
+
diff --git a/examples-jbake/jbake.properties b/examples-jbake/jbake.properties
index c2f41c4..2de5a32 100644
--- a/examples-jbake/jbake.properties
+++ b/examples-jbake/jbake.properties
@@ -1,2 +1,2 @@
 site.host=http://www.jalview.org/examples/
-render.tags=true
\ No newline at end of file
+render.tags=false
\ No newline at end of file
diff --git a/examples-jbake/templates/header.ftl b/examples-jbake/templates/header.ftl
index dc086e1..bc47a73 100644
--- a/examples-jbake/templates/header.ftl
+++ b/examples-jbake/templates/header.ftl
@@ -143,3 +143,4 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
     </div>
 
   </div>
+<div id="pageWrap">
diff --git a/examples-jbake/templates/jvl_embedded.ftl b/examples-jbake/templates/jvl_embedded.ftl
index 572fccb..016df8d 100644
--- a/examples-jbake/templates/jvl_embedded.ftl
+++ b/examples-jbake/templates/jvl_embedded.ftl
@@ -16,5 +16,7 @@
 		 "features":"plantfdx.features",
 		 "embedded":"true",
 		 "userDefinedColour":"C=yellow; R,K,H=FF5555; D,E=5555FF",
-		 "showFullId":"false"}></@jvlitebutton>
-  </p>
+		 "showFullId":"false"}
+  >
+  </@jvlitebutton>
+</p>
diff --git a/examples-jbake/templates/jvl_examples.ftl b/examples-jbake/templates/jvl_examples.ftl
index 09a74a1..9468ab4 100644
--- a/examples-jbake/templates/jvl_examples.ftl
+++ b/examples-jbake/templates/jvl_examples.ftl
@@ -84,4 +84,3 @@
 	secondary structure annotation</td>
     </tr>
   </table>
-</div>
\ No newline at end of file
diff --git a/examples-jbake/templates/jvl_linkedapplets_ng.ftl b/examples-jbake/templates/jvl_linkedapplets_ng.ftl
index 292c4a2..a3c0b3e 100644
--- a/examples-jbake/templates/jvl_linkedapplets_ng.ftl
+++ b/examples-jbake/templates/jvl_linkedapplets_ng.ftl
@@ -51,7 +51,7 @@
     APPLICATION_URL : "http://www.jalview.org/services/launchApp"
   };
  
-  deployJava.runApplet(attributes, parameters, '1.6+');
+  deployJava.runApplet(attributes, parameters, '1.6');
 </script>
 <script> 
   var attributes = {
@@ -83,12 +83,14 @@
     permissions : 'all-permissions',
    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>
       <br>
-       --><form name="console" id="console"><textarea name="output"
+       -->
+<form name="console" id="console">
+<textarea name="output"
         id="stdout" rows="20" cols="80">Messages  will appear here.</textarea></form>
       <br>
 </p>
diff --git a/examples-jbake/templates/macros.ftl b/examples-jbake/templates/macros.ftl
index 0673d76..04a4498 100644
--- a/examples-jbake/templates/macros.ftl
+++ b/examples-jbake/templates/macros.ftl
@@ -3,7 +3,7 @@
 
 <#macro jvlitebutton appjar params prots=true width=140 height=35>
 <applet
-   code="jalview.bin.JalviewLite" width="${width}" height="${width}"
+   code="jalview.bin.JalviewLite" width="${width}" height="${height}"
    archive="${appjar}">
 <#list appparams as p><#if (params[p])?has_content><param name="${p}" value="${params[p]}"/></#if></#list>
 <#if (prots)>
-- 
1.7.10.2