Browse Source

Bug 1566358 - Update releases page to include 64-bit Windows and Linux platforms - use common JS between en and de start pages r=me

Ian Neal 5 years ago
parent
commit
58ec10341d
2 changed files with 45 additions and 325 deletions
  1. 23 163
      src/start/index.de.html
  2. 22 162
      src/start/index.en.html

+ 23 - 163
src/start/index.de.html

@@ -11,6 +11,7 @@
 <link rel="up" href="../" title="Home">
 
 <script type="text/javascript" src="/download.js"></script>
+<script type="text/javascript" src="/buildtest.js"></script>
 
 <title>Willkommen bei SeaMonkey</title>
 </head>
@@ -23,122 +24,7 @@
     DuckDuckGo-Suchfeld bereit gestellt. Es durchsucht das ganze Netz.</span>
 </div>
 
-<script type="text/javascript"><!--
-  function buildTest() {
-    var ua = navigator.userAgent;
-    var buildID = navigator.buildID;
-    // Uncomment one of those user agents and/or buildIDs to test this script
-    // ua="Mozilla/5.0 (X11; U; Linux i686; de-AT; rv:1.8b2) Gecko/20050324 SeaMonkey/1.0a"
-    // ua="Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.6) Gecko/20070802 SeaMonkey/1.1.4"
-    // ua="Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a8pre) Gecko/2007082021 SeaMonkey/2.0a1pre"
-    // ua="Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.0rc3) Gecko/20020523"
-    // ua="Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.9a5pre) Gecko/20070515 SeaMonkey/1.5a"
-    // ua="Mozilla/5.0 (Windows NT 6.1; rv:2.0) Gecko/20110101 Firefox/4.0 SeaMonkey/2.1"
-    // ua="Mozilla/5.0 (Windows NT 6.1; WOW64; rv:13.0a1) Gecko/20120201 Firefox/13.0a1 SeaMonkey/2.10a1"
-    // buildID=0
-    // ua="Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/16.0 Firefox/16.0a1 SeaMonkey/2.13a1"
-    // buildID=20120612003002
-
-    var smver = ua.match(/SeaMonkey\/([^ ]+)/);
-    if (smver) {
-      // SM 1.1 was the first to include navigator.buildID
-      // SM 2.11 was the last to include the Gecko build date in the UA
-      buildID = buildID ? buildID : ua.match(/Gecko\/(\d{8,10})/)[1];
-    } else {
-      buildID = 0;
-    }
-
-    if (!buildID) {
-      // not SeaMonkey, display a "get SeaMonkey" box
-      highlightDownload("download", false);
-      displayElement("stable", false);
-      displayElement("getseamonkey", true);
-      return;
-    }
-
-    // stable builds only have digits and dots in their version number!
-    var smver_parts = smver[1].split(".");
-    if (smver[1].match(/^[\d\.]+$/)) {
-      // stable build, leave "friendy" intro box turned on
-
-      // check for version number and display a warning and download box if we have a newer version
-      var curver = "[% releaseversion %]";
-      var curver_parts = curver.split(".");
-      var oldversion = false;
-      for (var i = 0; i < curver_parts.length; i++) {
-        if (i == smver_parts.length || parseInt(curver_parts[i]) > parseInt(smver_parts[i])) {
-          oldversion = true;
-          break;
-        }
-        else if (parseInt(curver_parts[i]) < parseInt(smver_parts[i])) {
-          break;
-        }
-      }
-      if (oldversion) {
-        highlightDownload("dlnew", false);
-        var vertext = document.createTextNode(" (" + smver[1] + ")");
-        document.getElementById("oldvernumber").appendChild(vertext);
-        displayElement("stable", false);
-        displayElement(isSupportedOS(ua) ? "oldstable" : "unsupported", true);
-      }
-    }
-    else {
-      // unstable build or prerelease, test if nagging box should be displayed
-      displayElement("stable", false);
-      displayElement("unstable", true);
-      displayElement("stablenote", false);
-      displayElement("unstablenote", true);
-
-      // prereleases have a version number with a/b in it, possibly digits afterwards
-      // however, with the rapid release train, nightlies end with a1
-      var prerel_parts = smver[1].match(/^[\d\.]+([ab]\d*)$/);
-      if (prerel_parts && prerel_parts[1] && prerel_parts[1][0] != "a") {
-        // check for version number and display a warning and download box if we have a newer version
-        var curbeta = "[% betaversion %]";
-        var curbeta_parts = curbeta.split(".");
-        var oldbeta = false;
-        for (var i = 0; i < curbeta_parts.length; i++) {
-          // don't use parseInt() for beta - this means that parts with numbers
-          // larger than 9 are incorrect but alphas and betas are correct
-          if (curbeta_parts[i] > smver_parts[i]) {
-            oldbeta = true;
-            break;
-          }
-          else if (curbeta_parts[i] < smver_parts[i]) {
-            break;
-          }
-        }
-        if (oldbeta) {
-          displayElement("nagBox-beta", true);
-        }
-      }
-      else {
-        // milliseconds per day
-        var msecsPerDay = 86400000;
-        var nagLimit = 28 * msecsPerDay;
-
-        // construct build date from ID
-        var buildDate = new Date(buildID.substr(0,4),
-                                   buildID.substr(4,2)-1,
-                                   buildID.substr(6,2));
-
-        var today = new Date();
-        if (today - buildDate > nagLimit) {
-          // build is old. Show the nag box
-          displayElement("nagBox", true);
-        }
-      }
-    }
-  }
-
-  if (window.addEventListener) {
-    window.addEventListener("load", buildTest, true);
-  }
-  else if (window.attachEvent) {
-    window.attachEvent("onload", buildTest);
-  }
-  // -->
-</script>
+<h2>SeaMonkey-Projekt</h2>
 
 <div id="nagBox" class="important" style="display: none;">
   <p><span class="shout">Hey!</span> Ihre Kopie von SeaMonkey ist mehr als vier
@@ -177,7 +63,7 @@
 </div>
 
 <div id="stable" class="key-point">
-  <div class="key-info-desc">
+  <div class="key-info-stable">
     <strong class="very-strong">Gratulation!</strong> Sie haben eine stabile
     Version von SeaMonkey heruntergeladen (oder selbst kompiliert).
 
@@ -188,7 +74,7 @@
     Kenntnisse und hilft mit, SeaMonkey zu verbessern.
     </p>
   </div>
-  <div class="key-info-side" style="text-align: center;">
+  <div class="key-info-donate">
    <a href="https://www.seamonkey-project.org/donate/"
       title="Spendet f&ouml;r SeaMonkey"><img src="/images/seamonkey_logo.png"
                                         alt="SeaMonkey Internet Applikationspaket"></a>
@@ -200,8 +86,8 @@
 
 </div>
 
-<div id="oldstable" style="display: none;" class="key-point">
-  <div class="key-info-desc">
+<div id="old_get" style="display: none;" class="key-point">
+  <div id="oldstable" style="display: none;" class="key-info-desc">
     <strong class="very-strong shout">Achtung!</strong> Sie verwenden eine alte
     stabile Version von SeaMonkey<span id="oldvernumber"></span>, w&auml;hrend
     wir eine neue Version anbieten, die
@@ -218,24 +104,31 @@
     <a href="http://kb.mozillazine.org/Resetting_your_useragent_string_to_its_compiled-in_default"
        class="exref">den User-Agent-String auf den Standard zurückzusetzen</a>.</p>
   </div>
+  <div id="getseamonkey" style="display: none;" class="key-info-desc">
+    <p>Danke für den Besuch auf dieser SeaMonkey-Startseite, auch wenn es
+    aussieht, als ob Sie noch nicht SeaMonkey verwenden.</p>
+    <p>Sie k&ouml;nnen das SeaMonkey-Paket, inklusive Browser, Mail und mehr,
+    als kostenlosen Download &uuml;ber den rechts angezeigten Links
+    beziehen.</p>
+  </div>
   <div class="key-info-side">
     <div class="download">
       <h3>Jetzt herunterladen</h3>
       <b>[% releasename %]</b>
       <ul>
-       <li id="dlnew-win" class=""><a href="[% download_win %]"
-             id="dlnew-win-link">Windows,
-           <span id="dlnew-win-lang">Englisch</span>
+       <li id="download-win" class=""><a href="[% download_win %]"
+             id="download-win-link">Windows,
+           <span id="download-win-lang">Englisch</span>
            ([% download_win_mb %] MB)</a></li>
-       <li id="dlnew-linux" class=""><a href="[% download_linux %]"
-             id="dlnew-linux-link">Linux GTK3,
-           <span id="dlnew-linux-lang">Englisch</span>
+       <li id="download-linux" class=""><a href="[% download_linux %]"
+             id="download-linux-link">Linux GTK2,
+           <span id="download-linux-lang">Englisch</span>
            ([% download_linux_mb %] MB)</a></li>
-       <li id="dlnew-mac" class=""><a href="[% download_mac %]"
-             id="dlnew-mac-link">Mac OS X,
-           <span id="dlnew-mac-lang">Englisch</span>
+       <li id="download-mac" class=""><a href="[% download_mac %]"
+             id="download-mac-link">Mac OS X,
+           <span id="download-mac-lang">Englisch</span>
            ([% download_mac_mb %] MB)</a></li>
-       <li id="dlnew-other" class="other"><a href="[% download_more %]">Andere
+       <li id="download-other" class="other"><a href="[% download_more %]">Andere
            Systeme &amp; Sprachen</a></li>
        <!-- 2.44 min/MB @ 56 k/s -->
       </ul>
@@ -264,39 +157,6 @@ ben&ouml;tigt keine speziellen Kenntnisse und hilft mit, SeaMonkey zu
 verbessern.</p>
 </div>
 
-<div id="getseamonkey" style="display: none;" class="key-point">
-  <div class="key-info-desc">
-    <p>Danke für den Besuch auf dieser SeaMonkey-Startseite, auch wenn es
-    aussieht, als ob Sie noch nicht SeaMonkey verwenden.</p>
-    <p>Sie k&ouml;nnen das SeaMonkey-Paket, inklusive Browser, Mail und mehr,
-    als kostenlosen Download &uuml;ber den rechts angezeigten Links
-    beziehen.</p>
-  </div>
-  <div class="key-info-side">
-    <div class="download">
-      <h3>Jetzt herunterladen</h3>
-      <b>[% releasename %]</b>
-      <ul>
-       <li id="download-win" class=""><a href="[% download_win %]"
-             id="download-win-link">Windows,
-           <span id="download-win-lang">Englisch</span>
-           ([% download_win_mb %] MB)</a></li>
-       <li id="download-linux" class=""><a href="[% download_linux %]"
-             id="download-linux-link">Linux GTK2,
-           <span id="download-linux-lang">Englisch</span>
-           ([% download_linux_mb %] MB)</a></li>
-       <li id="download-mac" class=""><a href="[% download_mac %]"
-             id="download-mac-link">Mac OS X,
-           <span id="download-mac-lang">Englisch</span>
-           ([% download_mac_mb %] MB)</a></li>
-       <li id="download-other" class="other"><a href="[% download_more %]">Andere
-           Systeme &amp; Sprachen</a></li>
-       <!-- 2.44 min/MB @ 56 k/s -->
-      </ul>
-    </div>
-  </div>
-</div>
-
 <div style="width: 49%; float: right;">
   <h3 style="margin-top:0">Ressourcen</h3>
 

+ 22 - 162
src/start/index.en.html

@@ -11,6 +11,7 @@
 <link rel="up" href="../" title="Home">
 
 <script type="text/javascript" src="/download.js"></script>
+<script type="text/javascript" src="/buildtest.js"></script>
 
 <title>Welcome to SeaMonkey</title>
 </head>
@@ -24,122 +25,6 @@
 </div>
 
 <h2>SeaMonkey Project</h2>
-<script type="text/javascript"><!--
-  function buildTest() {
-    var ua = navigator.userAgent;
-    var buildID = navigator.buildID;
-    // Uncomment one of those user agents and/or buildIDs to test this script
-    // ua="Mozilla/5.0 (X11; U; Linux i686; de-AT; rv:1.8b2) Gecko/20050324 SeaMonkey/1.0a"
-    // ua="Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.6) Gecko/20070802 SeaMonkey/1.1.4"
-    // ua="Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a8pre) Gecko/2007082021 SeaMonkey/2.0a1pre"
-    // ua="Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.0rc3) Gecko/20020523"
-    // ua="Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.9a5pre) Gecko/20070515 SeaMonkey/1.5a"
-    // ua="Mozilla/5.0 (Windows NT 6.1; rv:2.0) Gecko/20110101 Firefox/4.0 SeaMonkey/2.1"
-    // ua="Mozilla/5.0 (Windows NT 6.1; WOW64; rv:13.0a1) Gecko/20120201 Firefox/13.0a1 SeaMonkey/2.10a1"
-    // buildID=0
-    // ua="Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/16.0 Firefox/16.0a1 SeaMonkey/2.13a1"
-    // buildID=20120612003002
-
-    var smver = ua.match(/SeaMonkey\/([^ ]+)/);
-    if (smver) {
-      // SM 1.1 was the first to include navigator.buildID
-      // SM 2.11 was the last to include the Gecko build date in the UA
-      buildID = buildID ? buildID : ua.match(/Gecko\/(\d{8,10})/)[1];
-    } else {
-      buildID = 0;
-    }
-
-    if (!buildID) {
-      // not SeaMonkey, display a "get SeaMonkey" box
-      highlightDownload("download", false);
-      displayElement("stable", false);
-      displayElement("getseamonkey", true);
-      return;
-    }
-
-    // stable builds only have digits and dots in their version number!
-    var smver_parts = smver[1].split(".");
-    if (smver[1].match(/^[\d\.]+$/)) {
-      // stable build, leave "friendy" intro box turned on
-
-      // check for version number and display a warning and download box if we have a newer version
-      var curver = "[% releaseversion %]";
-      var curver_parts = curver.split(".");
-      var oldversion = false;
-      for (var i = 0; i < curver_parts.length; i++) {
-        if (i == smver_parts.length || parseInt(curver_parts[i]) > parseInt(smver_parts[i])) {
-          oldversion = true;
-          break;
-        }
-        else if (parseInt(curver_parts[i]) < parseInt(smver_parts[i])) {
-          break;
-        }
-      }
-      if (oldversion) {
-        highlightDownload("dlnew", false);
-        var vertext = document.createTextNode(" (" + smver[1] + ")");
-        document.getElementById("oldvernumber").appendChild(vertext);
-        displayElement("stable", false);
-        displayElement(isSupportedOS(ua) ? "oldstable" : "unsupported", true);
-      }
-    }
-    else {
-      // unstable build or prerelease, test if nagging box should be displayed
-      displayElement("stable", false);
-      displayElement("unstable", true);
-      displayElement("stablenote", false);
-      displayElement("unstablenote", true);
-
-      // prereleases have a version number with a/b in it, possibly digits afterwards
-      // however, with the rapid release train, nightlies end with a1
-      var prerel_parts = smver[1].match(/^[\d\.]+([ab]\d*)$/);
-      if (prerel_parts && prerel_parts[1] && prerel_parts[1][0] != "a") {
-        // check for version number and display a warning and download box if we have a newer version
-        var curbeta = "[% betaversion %]";
-        var curbeta_parts = curbeta.split(".");
-        var oldbeta = false;
-        for (var i = 0; i < curbeta_parts.length; i++) {
-          // don't use parseInt() for beta - this means that parts with numbers
-          // larger than 9 are incorrect but alphas and betas are correct
-          if (curbeta_parts[i] > smver_parts[i]) {
-            oldbeta = true;
-            break;
-          }
-          else if (curbeta_parts[i] < smver_parts[i]) {
-            break;
-          }
-        }
-        if (oldbeta) {
-          displayElement("nagBox-beta", true);
-        }
-      }
-      else {
-        // milliseconds per day
-        var msecsPerDay = 86400000;
-        var nagLimit = 28 * msecsPerDay;
-
-        // construct build date from ID
-        var buildDate = new Date(buildID.substr(0,4),
-                                   buildID.substr(4,2)-1,
-                                   buildID.substr(6,2));
-
-        var today = new Date();
-        if (today - buildDate > nagLimit) {
-          // build is old. Show the nag box
-          displayElement("nagBox", true);
-        }
-      }
-    }
-  }
-
-  if (window.addEventListener) {
-    window.addEventListener("load", buildTest, true);
-  }
-  else if (window.attachEvent) {
-    window.attachEvent("onload", buildTest);
-  }
-  // -->
-</script>
 
 <div id="nagBox" class="important" style="display: none;">
   <p><span class="shout">Hey!</span> Your copy of SeaMonkey is more than four
@@ -173,7 +58,7 @@
 </div>
 
 <div id="stable" class="key-point">
-  <div class="key-info-desc">
+  <div class="key-info-stable">
     <strong class="very-strong">Congratulations!</strong> You've downloaded
     (or compiled) a stable version of SeaMonkey.
 
@@ -184,7 +69,7 @@
     and will help improve SeaMonkey.
     </p>
   </div>
-  <div class="key-info-side" style="text-align: center;">
+  <div class="key-info-donate">
     <a href="https://www.seamonkey-project.org/donate/"
        title="Donate for SeaMonkey"><img src="/images/seamonkey_logo.png"
                                          alt="SeaMonkey Internet Application Suite"></a>
@@ -195,8 +80,8 @@
   </div>
 </div>
 
-<div id="oldstable" style="display: none;" class="key-point">
-  <div class="key-info-desc">
+<div id="old_get" style="display: none;" class="key-point">
+  <div id="oldstable" style="display: none;" class="key-info-desc">
     <strong class="very-strong shout">Warning!</strong> You're using an old
     stable version of SeaMonkey<span id="oldvernumber"></span>, while we offer
     a newer version which contains
@@ -212,24 +97,31 @@
     <a href="http://kb.mozillazine.org/Resetting_your_useragent_string_to_its_compiled-in_default"
        class="exref">resetting your user agent string to the default</a>.</p>
   </div>
+  <div id="getseamonkey" style="display: none;" class="key-info-desc">
+    <p>Thanks for visiting this SeaMonkey start page, even though it appears to
+    us that you are not using SeaMonkey yet.</p>
+    <p>You can get the SeaMonkey Internet Application Suite, including browser,
+    mail and more, for free download from the links shown on the right.</p>
+  </div>
   <div class="key-info-side">
     <div class="download">
       <h3>Download Now</h3>
       <b>[% releasename %]</b>
       <ul>
-       <li id="dlnew-win" class=""><a href="[% download_win %]"
-             id="dlnew-win-link">Windows,
-           <span id="dlnew-win-lang">English</span>
+       <li id="download-win" class=""><a href="[% download_win %]"
+             id="download-win-link">Windows,
+           <span id="download-win-lang">English</span>
            ([% download_win_mb %] MB)</a></li>
-       <li id="dlnew-linux" class=""><a href="[% download_linux %]"
-             id="dlnew-linux-link">Linux GTK3,
-           <span id="dlnew-linux-lang">English</span>
+       <li id="download-linux" class=""><a href="[% download_linux %]"
+             id="download-linux-link">Linux GTK2,
+           <span id="download-linux-lang">English</span>
            ([% download_linux_mb %] MB)</a></li>
-       <li id="dlnew-mac" class=""><a href="[% download_mac %]"
-             id="dlnew-mac-link">Mac OS X,
-           <span id="dlnew-mac-lang">English</span>
+       <li id="download-mac" class=""><a href="[% download_mac %]"
+             id="download-mac-link">Mac OS X,
+           <span id="download-mac-lang">English</span>
            ([% download_mac_mb %] MB)</a></li>
-       <li id="dlnew-other" class="other"><a href="[% download_more %]">Other
+       <li id="download-other" class="other"><a href="[% download_more %]">Other
+           Systems &amp; Languages</a></li>
            Systems &amp; Languages</a></li>
        <!-- 2.44 min/MB @ 56 k/s -->
       </ul>
@@ -254,38 +146,6 @@ Otherwise, welcome aboard! Helping out won't take much of your time, doesn't
 require special skills, and will help improve SeaMonkey.</p>
 </div>
 
-<div id="getseamonkey" style="display: none;" class="key-point">
-  <div class="key-info-desc">
-    <p>Thanks for visiting this SeaMonkey start page, even though it appears to
-    us that you are not using SeaMonkey yet.</p>
-    <p>You can get the SeaMonkey Internet Application Suite, including browser,
-    mail and more, for free download from the links shown on the right.</p>
-  </div>
-  <div class="key-info-side">
-    <div class="download">
-      <h3>Download Now</h3>
-      <b>[% releasename %]</b>
-      <ul>
-       <li id="download-win" class=""><a href="[% download_win %]"
-             id="download-win-link">Windows,
-           <span id="download-win-lang">English</span>
-           ([% download_win_mb %] MB)</a></li>
-       <li id="download-linux" class=""><a href="[% download_linux %]"
-             id="download-linux-link">Linux GTK2,
-           <span id="download-linux-lang">English</span>
-           ([% download_linux_mb %] MB)</a></li>
-       <li id="download-mac" class=""><a href="[% download_mac %]"
-             id="download-mac-link">Mac OS X,
-           <span id="download-mac-lang">English</span>
-           ([% download_mac_mb %] MB)</a></li>
-       <li id="download-other" class="other"><a href="[% download_more %]">Other
-           Systems &amp; Languages</a></li>
-       <!-- 2.44 min/MB @ 56 k/s -->
-      </ul>
-    </div>
-  </div>
-</div>
-
 <div style="width: 49%; float: right;">
   <h3 style="margin-top:0">Resources</h3>