valid URLs in website menu frame and fixed GA code

diff --git a/examples/appletParameters.html b/examples/appletParameters.html
index 427c8b7..3b10c14 100644 (file)
--- a/examples/appletParameters.html
+++ b/examples/appletParameters.html
@@ -80,7 +80,11 @@ function mcancelclosetime()
 document.onclick = mclose; 
 // -->
 </script>
-
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script> 
 </head>
 
 
@@ -88,10 +92,10 @@ document.onclick = mclose;
 
 
 <div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
 <ul id="buttons">
 <li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
 </ul>
 </div>
 
@@ -100,39 +104,38 @@ document.onclick = mclose;
 <div id="navInner">
 
 <ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
   <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Documentation</a>
-  <a href="#">Publications</a>
-  <a href="#">Credits</a>
-  <a href="#">Screenshots</a>
+  <a href="http://www.jalview.org/about/documentation">Documentation</a>
+  <a href="http://www.jalview.org/about/citation">Publications</a>
+  <a href="http://www.jalview.org/about/credits">Credits</a>
   </div>
  </li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
   <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">News Mailing List</a>
-  <a href="#">Discussion Mailing List</a>
-  <a href="#">Links</a>
-  <a href="#">Community News</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+  <a href="http://www.jalview.org/community/links">Links</a>
+  <a href="http://www.jalview.org/community/community-news">Community News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
   <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Release History</a>
-  <a href="#">Jalview Bug Tracker</a>
-  <a href="#">Jalview Git Web</a>
-  <a href="#">Development News</a>
+  <a href="http://www.jalview.org/development/release-history">Release History</a>
+  <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+  <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+  <a href="http://www.jalview.org/development/development-news">Development News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
   <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Training Courses</a>
-  <a href="#">Training News</a>
+  <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+  <a href="http://www.jalview.org/training/training-news">Training News</a>
   </div>
  </li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
 </ul>
 <div style="clear:both"></div>
 </div>
@@ -546,7 +549,7 @@ document.onclick = mclose;
           </li>
           <li>Note parameter &quot;PDBSeq&quot; is no longer required.<br>
           </li>
-          <li>Jalview 2.3 was updated to work with Jmol 11. See the <a href="../versions.html">versions archive if you want to download the old Jmol applet</a>.</li> 
+          <li>Jalview 2.3 was updated to work with Jmol 11. See the <a href="/development">versions archive if you want to download the old Jmol applet</a>.</li> 
             <p>&nbsp;</p>
           </li>
         </ul>
@@ -599,18 +602,5 @@ Bioinformatics 25 (9) 1189-1191 <a href="http://dx.doi.org/10.1093/bioinformatic
 </div>
 </div>
 </div>
-
-<script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
-    var pageTracker = _gat._getTracker("'UA-9060947-1'");
-    pageTracker._trackPageview();
-} catch(err) {}
-</script>
 </body>
 </html>

diff --git a/examples/applets.html b/examples/applets.html
index e3e1d3c..c53cc7a 100755 (executable)
--- a/examples/applets.html
+++ b/examples/applets.html
@@ -79,7 +79,11 @@ function mcancelclosetime()
 document.onclick = mclose; 
 // -->
 </script>
-
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
 </head>
 
 
@@ -87,10 +91,10 @@ document.onclick = mclose;
 
 
 <div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
 <ul id="buttons">
 <li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
 </ul>
 </div>
 
@@ -99,39 +103,38 @@ document.onclick = mclose;
 <div id="navInner">
 
 <ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
   <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Documentation</a>
-  <a href="#">Publications</a>
-  <a href="#">Credits</a>
-  <a href="#">Screenshots</a>
+  <a href="http://www.jalview.org/about/documentation">Documentation</a>
+  <a href="http://www.jalview.org/about/citation">Publications</a>
+  <a href="http://www.jalview.org/about/credits">Credits</a>
   </div>
  </li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
   <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">News Mailing List</a>
-  <a href="#">Discussion Mailing List</a>
-  <a href="#">Links</a>
-  <a href="#">Community News</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+  <a href="http://www.jalview.org/community/links">Links</a>
+  <a href="http://www.jalview.org/community/community-news">Community News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
   <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Release History</a>
-  <a href="#">Jalview Bug Tracker</a>
-  <a href="#">Jalview Git Web</a>
-  <a href="#">Development News</a>
+  <a href="http://www.jalview.org/development/release-history">Release History</a>
+  <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+  <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+  <a href="http://www.jalview.org/development/development-news">Development News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
   <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Training Courses</a>
-  <a href="#">Training News</a>
+  <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+  <a href="http://www.jalview.org/training/training-news">Training News</a>
   </div>
  </li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
 </ul>
 <div style="clear:both"></div>
 </div>
@@ -319,4 +322,4 @@ Bioinformatics 25 (9) 1189-1191 <a href="http://dx.doi.org/10.1093/bioinformatic
 </div>
 </body>
 </html>
-          
\ No newline at end of file
+          

diff --git a/examples/embedded.html b/examples/embedded.html
index 2f74116..2384737 100644 (file)
--- a/examples/embedded.html
+++ b/examples/embedded.html
@@ -79,7 +79,11 @@ function mcancelclosetime()
 document.onclick = mclose; 
 // -->
 </script>
-
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
 </head>
 
 
@@ -87,10 +91,10 @@ document.onclick = mclose;
 
 
 <div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
 <ul id="buttons">
 <li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
 </ul>
 </div>
 
@@ -99,39 +103,38 @@ document.onclick = mclose;
 <div id="navInner">
 
 <ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
   <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Documentation</a>
-  <a href="#">Publications</a>
-  <a href="#">Credits</a>
-  <a href="#">Screenshots</a>
+  <a href="http://www.jalview.org/about/documentation">Documentation</a>
+  <a href="http://www.jalview.org/about/citation">Publications</a>
+  <a href="http://www.jalview.org/about/credits">Credits</a>
   </div>
  </li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
   <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">News Mailing List</a>
-  <a href="#">Discussion Mailing List</a>
-  <a href="#">Links</a>
-  <a href="#">Community News</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+  <a href="http://www.jalview.org/community/links">Links</a>
+  <a href="http://www.jalview.org/community/community-news">Community News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
   <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Release History</a>
-  <a href="#">Jalview Bug Tracker</a>
-  <a href="#">Jalview Git Web</a>
-  <a href="#">Development News</a>
+  <a href="http://www.jalview.org/development/release-history">Release History</a>
+  <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+  <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+  <a href="http://www.jalview.org/development/development-news">Development News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
   <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Training Courses</a>
-  <a href="#">Training News</a>
+  <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+  <a href="http://www.jalview.org/training/training-news">Training News</a>
   </div>
  </li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
 </ul>
 <div style="clear:both"></div>
 </div>

diff --git a/examples/embeddedWJmol.html b/examples/embeddedWJmol.html
index 86dceea..5a65953 100644 (file)
--- a/examples/embeddedWJmol.html
+++ b/examples/embeddedWJmol.html
@@ -19,6 +19,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <TITLE>Embedded JalviewLite talking to externally managed Jmol</TITLE>
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
 <script src="javascript/deployJava.js"></script>
 <script src="jmol/Jmol.js"></script>
 <script src="javascript/jquery-1.4.4.min.js"></script>
@@ -177,10 +182,10 @@ document.onclick = mclose;
 
 
 <div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
 <ul id="buttons">
 <li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
 </ul>
 </div>
 
@@ -189,39 +194,38 @@ document.onclick = mclose;
 <div id="navInner">
 
 <ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
   <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Documentation</a>
-  <a href="#">Publications</a>
-  <a href="#">Credits</a>
-  <a href="#">Screenshots</a>
+  <a href="http://www.jalview.org/about/documentation">Documentation</a>
+  <a href="http://www.jalview.org/about/citation">Publications</a>
+  <a href="http://www.jalview.org/about/credits">Credits</a>
   </div>
  </li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
   <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">News Mailing List</a>
-  <a href="#">Discussion Mailing List</a>
-  <a href="#">Links</a>
-  <a href="#">Community News</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+  <a href="http://www.jalview.org/community/links">Links</a>
+  <a href="http://www.jalview.org/community/community-news">Community News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
   <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Release History</a>
-  <a href="#">Jalview Bug Tracker</a>
-  <a href="#">Jalview Git Web</a>
-  <a href="#">Development News</a>
+  <a href="http://www.jalview.org/development/release-history">Release History</a>
+  <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+  <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+  <a href="http://www.jalview.org/development/development-news">Development News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
   <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Training Courses</a>
-  <a href="#">Training News</a>
+  <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+  <a href="http://www.jalview.org/training/training-news">Training News</a>
   </div>
  </li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
 </ul>
 <div style="clear:both"></div>
 </div>
@@ -269,18 +273,5 @@ Bioinformatics 25 (9) 1189-1191 <a href="http://dx.doi.org/10.1093/bioinformatic
 </div>
 </div>
 </div>
-
-<script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
-    var pageTracker = _gat._getTracker("'UA-9060947-1'");
-    pageTracker._trackPageview();
-} catch(err) {}
-</script>
 </body>
 </html>

diff --git a/examples/formComplete.html b/examples/formComplete.html
index 71a904a..91b0670 100644 (file)
--- a/examples/formComplete.html
+++ b/examples/formComplete.html
@@ -79,7 +79,11 @@ function mcancelclosetime()
 document.onclick = mclose; 
 // -->
 </script>
-
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
 </head>
 
 
@@ -87,10 +91,10 @@ document.onclick = mclose;
 
 
 <div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
 <ul id="buttons">
 <li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
 </ul>
 </div>
 
@@ -99,39 +103,38 @@ document.onclick = mclose;
 <div id="navInner">
 
 <ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
   <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Documentation</a>
-  <a href="#">Publications</a>
-  <a href="#">Credits</a>
-  <a href="#">Screenshots</a>
+  <a href="http://www.jalview.org/about/documentation">Documentation</a>
+  <a href="http://www.jalview.org/about/citation">Publications</a>
+  <a href="http://www.jalview.org/about/credits">Credits</a>
   </div>
  </li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
   <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">News Mailing List</a>
-  <a href="#">Discussion Mailing List</a>
-  <a href="#">Links</a>
-  <a href="#">Community News</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+  <a href="http://www.jalview.org/community/links">Links</a>
+  <a href="http://www.jalview.org/community/community-news">Community News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
   <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Release History</a>
-  <a href="#">Jalview Bug Tracker</a>
-  <a href="#">Jalview Git Web</a>
-  <a href="#">Development News</a>
+  <a href="http://www.jalview.org/development/release-history">Release History</a>
+  <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+  <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+  <a href="http://www.jalview.org/development/development-news">Development News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
   <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Training Courses</a>
-  <a href="#">Training News</a>
+  <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+  <a href="http://www.jalview.org/training/training-news">Training News</a>
   </div>
  </li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
 </ul>
 <div style="clear:both"></div>
 </div>
@@ -218,18 +221,6 @@ Bioinformatics 25 (9) 1189-1191 <a href="http://dx.doi.org/10.1093/bioinformatic
 </div>
 </div>
 </div>
-
-<script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
-    var pageTracker = _gat._getTracker("'UA-9060947-1'");
-    pageTracker._trackPageview();
-} catch(err) {}
-</script></body>
+</body>
 </html>
-  
\ No newline at end of file
+  

diff --git a/examples/jalviewLiteJs.html b/examples/jalviewLiteJs.html
index 5d0af5d..0e8b78a 100644 (file)
--- a/examples/jalviewLiteJs.html
+++ b/examples/jalviewLiteJs.html
@@ -80,7 +80,9 @@ function mcancelclosetime()
 document.onclick = mclose; 
 // -->
 </script>
-
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
 </head>
 
 
@@ -88,10 +90,10 @@ document.onclick = mclose;
 
 
 <div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
 <ul id="buttons">
 <li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
 </ul>
 </div>
 
@@ -100,39 +102,38 @@ document.onclick = mclose;
 <div id="navInner">
 
 <ul id="sddm">
-       <li><a href="#">Home</a></li>
-       <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
-               <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-               <a href="#">Documentation</a>
-               <a href="#">Publications</a>
-               <a href="#">Credits</a>
-               <a href="#">Screenshots</a>
-               </div>
-       </li>
-       <li><a href="#">FAQ</a></li>
-       <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
-               <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-               <a href="#">News Mailing List</a>
-               <a href="#">Discussion Mailing List</a>
-               <a href="#">Links</a>
-               <a href="#">Community News</a>
-               </div>
-       </li>
-       <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
-               <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-               <a href="#">Release History</a>
-               <a href="#">Jalview Bug Tracker</a>
-               <a href="#">Jalview Git Web</a>
-               <a href="#">Development News</a>
-               </div>
-       </li>
-       <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
-               <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-               <a href="#">Training Courses</a>
-               <a href="#">Training News</a>
-               </div>
-       </li>
-       <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+  <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
+  <a href="http://www.jalview.org/about/documentation">Documentation</a>
+  <a href="http://www.jalview.org/about/citation">Publications</a>
+  <a href="http://www.jalview.org/about/credits">Credits</a>
+  </div>
+ </li>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+  <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+  <a href="http://www.jalview.org/community/links">Links</a>
+  <a href="http://www.jalview.org/community/community-news">Community News</a>
+  </div>
+ </li>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+  <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
+  <a href="http://www.jalview.org/development/release-history">Release History</a>
+  <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+  <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+  <a href="http://www.jalview.org/development/development-news">Development News</a>
+  </div>
+ </li>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+  <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
+  <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+  <a href="http://www.jalview.org/training/training-news">Training News</a>
+  </div>
+ </li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
 </ul>
 <div style="clear:both"></div>
 </div>
@@ -422,17 +423,5 @@ Bioinformatics 25 (9) 1189-1191 <a href="http://dx.doi.org/10.1093/bioinformatic
 </div>
 </div>
 </div>
-
-<script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
-    var pageTracker = _gat._getTracker("'UA-9060947-1'");
-    pageTracker._trackPageview();
-} catch(err) {}
-</script></body>
+</body>
 </html>

diff --git a/examples/javascriptLaunch.html b/examples/javascriptLaunch.html
index 7dbf8e0..f555265 100644 (file)
--- a/examples/javascriptLaunch.html
+++ b/examples/javascriptLaunch.html
@@ -79,7 +79,9 @@ function mcancelclosetime()
 document.onclick = mclose; 
 // -->
 </script>
-
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
 </head>
 
 
@@ -87,10 +89,10 @@ document.onclick = mclose;
 
 
 <div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
 <ul id="buttons">
 <li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
 </ul>
 </div>
 
@@ -99,39 +101,38 @@ document.onclick = mclose;
 <div id="navInner">
 
 <ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
   <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Documentation</a>
-  <a href="#">Publications</a>
-  <a href="#">Credits</a>
-  <a href="#">Screenshots</a>
+  <a href="http://www.jalview.org/about/documentation">Documentation</a>
+  <a href="http://www.jalview.org/about/citation">Publications</a>
+  <a href="http://www.jalview.org/about/credits">Credits</a>
   </div>
  </li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
   <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">News Mailing List</a>
-  <a href="#">Discussion Mailing List</a>
-  <a href="#">Links</a>
-  <a href="#">Community News</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+  <a href="http://www.jalview.org/community/links">Links</a>
+  <a href="http://www.jalview.org/community/community-news">Community News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
   <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Release History</a>
-  <a href="#">Jalview Bug Tracker</a>
-  <a href="#">Jalview Git Web</a>
-  <a href="#">Development News</a>
+  <a href="http://www.jalview.org/development/release-history">Release History</a>
+  <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+  <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+  <a href="http://www.jalview.org/development/development-news">Development News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
   <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Training Courses</a>
-  <a href="#">Training News</a>
+  <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+  <a href="http://www.jalview.org/training/training-news">Training News</a>
   </div>
  </li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
 </ul>
 <div style="clear:both"></div>
 </div>
@@ -267,19 +268,6 @@ Bioinformatics 25 (9) 1189-1191 <a href="http://dx.doi.org/10.1093/bioinformatic
 </div>
 </div>
 </div>
-
-<script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
-    var pageTracker = _gat._getTracker("'UA-9060947-1'");
-    pageTracker._trackPageview();
-} catch(err) {}
-</script>
 </body>
 </head>
-</html>
\ No newline at end of file
+</html>

diff --git a/examples/linkedapplets_ng.html b/examples/linkedapplets_ng.html
index 4296146..86f4bc0 100644 (file)
--- a/examples/linkedapplets_ng.html
+++ b/examples/linkedapplets_ng.html
@@ -23,6 +23,11 @@
   
  <link href="css/reset.css" rel="stylesheet" type="text/css" />
  <link href="css/style.css" rel="stylesheet" type="text/css" />
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
 <script src="http://www.java.com/js/deployJava.js"></script>
 <script src="javascript/jalview.js" language="javascript"></script>
 <script>  //deployJava.debug="true";
@@ -106,10 +111,10 @@ document.onclick = mclose;
 
 
 <div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
 <ul id="buttons">
 <li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
 </ul>
 </div>
 
@@ -118,39 +123,38 @@ document.onclick = mclose;
 <div id="navInner">
 
 <ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
   <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Documentation</a>
-  <a href="#">Publications</a>
-  <a href="#">Credits</a>
-  <a href="#">Screenshots</a>
+  <a href="http://www.jalview.org/about/documentation">Documentation</a>
+  <a href="http://www.jalview.org/about/citation">Publications</a>
+  <a href="http://www.jalview.org/about/credits">Credits</a>
   </div>
  </li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
   <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">News Mailing List</a>
-  <a href="#">Discussion Mailing List</a>
-  <a href="#">Links</a>
-  <a href="#">Community News</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+  <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+  <a href="http://www.jalview.org/community/links">Links</a>
+  <a href="http://www.jalview.org/community/community-news">Community News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
   <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Release History</a>
-  <a href="#">Jalview Bug Tracker</a>
-  <a href="#">Jalview Git Web</a>
-  <a href="#">Development News</a>
+  <a href="http://www.jalview.org/development/release-history">Release History</a>
+  <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+  <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+  <a href="http://www.jalview.org/development/development-news">Development News</a>
   </div>
  </li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
   <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
-  <a href="#">Training Courses</a>
-  <a href="#">Training News</a>
+  <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+  <a href="http://www.jalview.org/training/training-news">Training News</a>
   </div>
  </li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
 </ul>
 <div style="clear:both"></div>
 </div>
@@ -267,18 +271,5 @@ Bioinformatics 25 (9) 1189-1191 <a href="http://dx.doi.org/10.1093/bioinformatic
 </div>
 </div>
 </div>
-
-<script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
-    var pageTracker = _gat._getTracker("'UA-9060947-1'");
-    pageTracker._trackPageview();
-} catch(err) {}
-</script>
 </body>
 </html>