You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2014/03/10 16:00:49 UTC

svn commit: r900918 [2/3] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/

Modified: websites/staging/ooo-site/trunk/content/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/index.html (original)
+++ websites/staging/ooo-site/trunk/content/download/index.html Mon Mar 10 15:00:48 2014
@@ -25,7 +25,7 @@
   </style>
   <script>
     if (window.document.referrer.indexOf("shell.windows.com") != -1)
-       location.href = "/why/why_odf.html";
+       location.href = "../why/why_odf.html";
 
     function shareFacebook() {
       _gaq.push(['_trackEvent','social', 'shareDownload', 'facebook']); 
@@ -60,7 +60,7 @@
 
 <!-- The text in the H1 tag is intentionally shown as not displayable, just to please accessibility tools like a
 screen reader. -->
-<h1 style="display: none;">Apache OpenOffice</h1>
+<h1 style="display: none;">Apache OpenOffice Download</h1>
 
 <div class="optionset">
 
@@ -69,43 +69,62 @@ screen reader. -->
   <!--
   // Set a specific language ISO code to force to assemble a certain localized build as download URL
   var NL_LANGUAGE = "";
-  // Get the download URL
-  var LINK        = getLink();
-
+  // Get the download URL for released install files (0 = release mode)
+  var LINK        = getLink( 0 );
+/*
+  document.write ( "Language ISO: " + LANG_ISO + " - has MirrorLink()?: " + hasMirrorLink() + "<br />"
+  + "SourceForge: " + SOURCEFORGE + " - Other: " + OTHER + " - Archive: " + ARCHIVE + "<br />"
+  + "UI_PLATFORM: " + UI_PLATFORM + " - URL_PLATFORM: " + URL_PLATFORM + " - EXTENSION: " + EXTENSION + "<br />"
+  + "LINK: " + LINK );
+*/
   if ( hasMirrorLink() ) {
-    if ( LINK.toLowerCase().indexOf( "sourceforge" ) != -1 ) {
-      // Download directly from a mirror with displayed platform and language.
+    if ( SOURCEFORGE ) {
+      // If download URL contains "sourceforge" (-> normal and correct download link),
+      // then download from Sourceforge with displayed platform and language.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
-      + LINK + "');" + "return false;\">" );
-      document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE
-      + " | Build ID " + BUILD + " | SVN " + SVN_REV + " | Release date " + DATE + "'>"
-      + "Download Apache OpenOffice " + VERSION + "</a></h2>"
-      + "<p><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE + " | Build ID " + BUILD
-      + " | SVN " + SVN_REV + " | Release date " + DATE + "'>Click here for the most recent version for:<br />"
-      + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | ~" + FILESIZE + " MByte | Released: "
-      + DATE + "<br /></a></p>" );
-    } else {
-      // OS and/or package manager was not recognized, therefore use "other.html" as download link.
+        + LINK + "');" + "return false;\">"
+        + "<h2><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE
+        + " | Build ID " + BUILD + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>"
+        + "Download Apache OpenOffice " + VERSION + "</a></h2>"
+        + "<p><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE + " | Build ID " + BUILD
+        + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>Click here to download for:<br />"
+        + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | ~" + FILESIZE + "&nbsp;MByte | Released:&nbsp;"
+        + REL_DATE + "<br /></a></p>"
+      + "</div>" );
+    } else if ( OTHER ) {
+      // If download URL contains "other" (-> platform, OS or package manager was not recognized),
+      // then use "other.html" as download link.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
-      + LINK + "');" + "return false;\">" );
-      document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>"
-      + "Download Apache OpenOffice</a></h2>"
-      + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + VERSION + " for "
-      + "<b>" + UI_PLATFORM + "</b> is not available. Please choose another platform build from the alternative download "
-      + "webpage.</a></p>" );
+        + LINK + "');" + "return false;\">"
+        + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+        + "Download Apache OpenOffice</a></h2>"
+        + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + VERSION + " for "
+        + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. "
+        + "Click here to choose from the alternative download webpage.</a></p>"
+      + "</div>" );
+    } else if ( ARCHIVE ) {
+      // If download URL contains "archive" (-> platform/OS is no longer supported),
+      // then provide a download link to the previous version.
+      document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+        + LINK + "');" + "return false;\">"
+        + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+        + "Download Apache OpenOffice</a></h2>"
+        + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + VERSION + " for "
+        + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. "
+        + "Click here for the previous version " + PRE_VERSION + ".</a></p>"
+      + "</div>" );
     }
   } else {
-    // Download from an alternative webpage if hasMirrorLink() == false.
+    // If browser language do not match with AOO languages, then download from an alternative webpage.
     document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
-    + LANG_ARRAY[ 4 ] + "');" + "return false;\">" );
-    document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>"
-    + "Download Apache OpenOffice</a></h2>"
-    + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>Apache OpenOffice " + VERSION + " for "
-    + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Please choose another build from the "
-    + "alternative " + LANG_ARRAY[ 1 ] + " download webpage.</a></p>" );
+      + LINK + "');" + "return false;\">"
+      + "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>"
+      + "Download Apache OpenOffice</a></h2>"
+      + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>Apache OpenOffice " + VERSION + " for "
+      + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. "
+      + "Click here to choose from the alternative " + LANG_ARRAY[ 1 ] + " download webpage.</a></p>"
+    + "</div>" );
   }
-  document.write( "</div>" );
-
   // Show some helpful links for SDK, source, checksums, release notes, legacy version.
   document.write( "<div class=\"sub-green\">" );
   document.write( "<p>" );
@@ -117,21 +136,22 @@ screen reader. -->
     + "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256 hash'>SHA256</a> , "
     + "<a href='checksums.html' title='How to verify the download with checksums?'>How to verify?</a> | " );
   }
-  document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes'"
-  + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'><b>Release Notes</b></a> | <br />"
-  + "<a href='other.html' title='Get all platforms, languages, language packs to download'>"
-  + "<b>Get all platforms, languages, language packs</b></a> | "
-  + "<a href='other.html#source' title='Get the source code and SDK to download'>"
-  + "Source code and SDK</a> | <br />"
-  + "<a href='../porting/index.html'"
-  + "title='Get Apache OpenOffice software packaged as portable USB versions and third-party ports'>"
-  + "<b>Portable USB versions</b> and third-party ports</a> | "
-  + "Old and legacy version: <a href='other-341.html' title='Get the old version of Apache OpenOffice "
-  + OLDVERSION + "'><b>" + OLDVERSION + "</b></a> + "
-  + "<a href='legacy/index.html' title='Get the legacy version of OpenOffice.org "
-  + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a>" );
-  document.write( "</div>" );
-
+  if ( ARCHIVE ) {
+    VERSION = PRE_VERSION;
+  }
+  document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+" + VERSION + "+Release+Notes'"
+    + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'><b>Release Notes</b></a> | <br />"
+    + "<a href='other.html' title='Get all platforms, languages, language packs to download'>"
+    + "<b>Get all platforms, languages, language packs</b></a> | "
+    + "<a href='other.html#source' title='Get the source code and SDK to download'>Source code and SDK</a> | <br />"
+    + "<a href='../porting/index.html'"
+    + "title='Get Apache OpenOffice software packaged as portable USB versions and third-party ports'>"
+    + "<b>Portable USB versions</b> and third-party ports</a> | "
+    + "Old and legacy version: <a href='other-341.html' title='Get the old version of Apache OpenOffice "
+    + OLDVERSION + "'><b>" + OLDVERSION + "</b></a> + "
+    + "<a href='legacy/index.html' title='Get the legacy version of OpenOffice.org "
+    + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a></p>"
+  + "</div>" );
   entourage.initialize();
   //-->
   </script>
@@ -140,24 +160,141 @@ screen reader. -->
   <noscript>
   <div class="first button green" id="optionitem1">
     <h2><a>Download Apache OpenOffice</a></h2>
-    <p><a href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/">Your browser does not seem to allow JavaScript
-    on websites. This technique is used on this webpage for presenting the actual download links. If you want to
-    download Apache OpenOffice, go to the alternative download page, and you will skip this page. Our apologies for
-    the inconvenience.</a></p>
+    <p><a href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
+    title="Select from all platforms, languages, language packs to download">Your browser does not seem to allow JavaScript
+    on websites. This technique is used on this webpage for presenting the actual download link. If you want to download
+    Apache OpenOffice, click here to go to the alternative download page, and you will skip this page.
+    Our apologies for the inconvenience.</a></p>
   </div>
   <div class="sub-green">
     <p><a href="../porting/index.html"
     title="Get Apache OpenOffice software packaged as portable USB versions and third-party ports">
     <b>Portable USB versions</b> and third-party ports</a> |
     <a href="../development/releases/index.html"
-    title="What is new, what has been improved in Apache OpenOffice?">Release Notes</a> | <br />
+    title="What is new, what has been improved in Apache OpenOffice?"><b>Release Notes</b></a> | <br />
     <a href="other-341.html" title="Get the old version of Apache OpenOffice">Old Apache OpenOffice</a> |
     <a href="legacy/index.html" title="Get the legacy version of OpenOffice.org">Legacy OpenOffice.org</a></p>
   </div>
   </noscript>
 
+  <!-- Yellow: Beta Release online -->
+  <script type="text/javascript">
+  <!--
+  if ( BETA_ACTIVE ) {
+    // Set a specific language ISO code to force to assemble a certain localized build as download URL
+    var NL_LANGUAGE = "";
+    // Get the download URL for Beta releases (>0 = beta mode)
+    var LINK        = getLink( 1 );
+/*
+    document.write ( "Language ISO: " + LANG_ISO + " - has MirrorLink()?: " + hasMirrorLink() + "<br />"
+    + "SourceForge: " + SOURCEFORGE + " - Other: " + OTHER + " - Archive: " + ARCHIVE + "<br />"
+    + "UI_PLATFORM: " + UI_PLATFORM + " - URL_PLATFORM: " + URL_PLATFORM + " - EXTENSION: " + EXTENSION + "<br />"
+    + "LINK: " + LINK );
+*/
+    if ( hasMirrorLink() ) {
+      if ( SOURCEFORGE ) {
+        // If a Beta Release is available for download, then download from Sourceforge with displayed platform and language.
+        document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','"
+          + LINK + "') return false;\">"
+          + "<h2><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone " + BETA_MILESTONE
+          + " | Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE + "'>"
+          + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>"
+          + "<p><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone " + BETA_MILESTONE + " | "
+          + "Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE + "'>"
+          + "Click here to download for:<br /><b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | "
+          + "~" + FILESIZE + " MByte | Released: " + BETA_REL_DATE + "<br />"
+          + "<br /><b>The Beta release is feature complete but not yet fully tested and can contain issues. "
+          + "It is strongly not recommended to use in production!</b></a></p>"
+        + "</div>" );
+      } else if ( OTHER ) {
+        // If download URL contains "other" (-> platform, OS or package manager was not recognized),
+        // then use "other.html" as download link.
+        document.write( "<div class=\"button yellow\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+          + LINK + "');" + "return false;\">"
+          + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+          + "Download Apache OpenOffice</a></h2>"
+          + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + BETA_NAME + " for "
+          + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. "
+          + "Click here to choose from the alternative download webpage.</a></p>"
+        + "</div>" );
+      } else if ( ARCHIVE ) {
+        // If download URL contains "archive" (-> platform/OS is no longer supported),
+        // then provide a download link to the previous version.
+        document.write( "<div class=\"button yellow\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+          + LINK + "');" + "return false;\">"
+          + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+          + "Download Apache OpenOffice</a></h2>"
+          + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + BETA_NAME + " for "
+          + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. "
+          + "Click here for the previous version " + PRE_VERSION + ".</a></p>"
+        + "</div>" );
+      }
+    } else {
+      // If browser language do not match with AOO languages, then use "all_beta.html" as download link.
+      // LINK = "http://www.openoffice.org/download/test/all_beta.html";
+      document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','"
+        + LINK + "') return false;\">"
+        + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+        + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>"
+        + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + BETA_NAME + " for "
+        + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. "
+        + "Click here to choose from the alternative download webpage.</a></p>"
+      + "</div>" );
+    }
+    // Show some helpful links for SDK, source, checksums, release notes.
+    document.write( "<div class=\"sub-yellow\">" );
+    document.write( "<p>" );
+    if ( CHECKSUM_ASC ) {
+      document.write( "Signatures and hashes: "
+      + "<a href='" + CHECKSUM_KEYS   + "' + title='KEYS signature'>KEYS</a> , "
+      + "<a href='" + CHECKSUM_ASC    + "' + title='ASC signature'>ASC</a> , "
+      + "<a href='" + CHECKSUM_MD5    + "' + title='MD5 hash'>MD5</a> , "
+      + "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256 hash'>SHA256</a> , "
+      + "<a href='checksums.html' title='How to verify the download with checksums?'>How to verify?</a> | " );
+    }
+    document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes'"
+      + "title='What is new, what has been improved in Apache OpenOffice " + BETA_NAME + "?'><b>Release Notes</b></a> | "
+      + "<br /><a href='all_beta.html' title='Get all platforms, languages, language packs to download'>"
+      + "<b>Get all platforms, languages, language packs</b></a> | "
+      + "<a href='all_beta.html#source' title='Get the source code and SDK to download'>Source code and SDK</a></p>"
+    + "</div>" );
+  } else {
+    // Yellow: Beta Release coming soon
+    var ANN_LINK  = "https://blogs.apache.org/OOo/";
+    var ANN_TITLE = "Official blog of Apache OpenOffice";
+    document.write( "<div class=\"button yellow\" id=\"optionitem2_1\" onclick=\"openItem('optionitem2_1','"
+      + ANN_LINK + "') return false;\">"
+      + "<h2><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'>"
+      + "Get Apache OpenOffice " + BETA_NAME + "<br /><small>(planned for: " + BETA_REL_DATE + ")</small></a></h2>"
+      + "<p><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'><br />"
+      + "The Beta release is not yet available. Please make sure to come back on the release date to download and test the "
+      + "new version.</a></p>"
+    + "</div>" );
+  }
+  //-->
+  </script>
+
+  <!-- Yellow: Beta: No JavaScript enabled -->
+  <noscript>
+  <div class="button yellow" id="optionitem2" onclick="openItem('optionitem2','all_beta.html'); return false;">
+    <h2><a href="all_beta.html" title="Select from all platforms, languages, language packs to download">
+    Download Apache OpenOffice Beta</a></h2>
+    <p><a href="http://sourceforge.net/projects/openofficeorg.mirror/files/"
+    title="Select from all platforms, languages, language packs to download">Your browser does not seem to allow JavaScript
+    on websites. This technique is used on this webpage for presenting the actual download link. If you want to download
+    Apache OpenOffice, click here to go to the alternative download page, and you will skip this page.
+    Our apologies for the inconvenience.</a></p>
+  </div>
+  <div class="sub-yellow">
+    <p><a href="all_beta.html" title="Get all platforms, languages, language packs to download">
+    <b>Get all platforms, languages, language packs</b></a> |
+    <a href="../development/releases/dev_index.html"
+    title="What is new, what has been improved in Apache OpenOffice?"><b>Release Notes</b></a></p>
+  </div>
+  </noscript>
+
   <!-- Light Blue: Share download with social networks -->
-  <div class="button lightblue" id="optionitem2">
+  <div class="button lightblue" id="optionitem3">
     <h2><a style="cursor: default;" title="Help spread the word and tell your friends about Apache OpenOffice">
     Help Spread the Word</a></h2>
     <p style="cursor: default;" id="ShareDownloadLinks">
@@ -176,20 +313,26 @@ screen reader. -->
   </div>
 
   <!-- Blue: Extensions -->
-  <div class="button blue" id="optionitem3" onclick="openItem('optionitem3','http://extensions.openoffice.org');
+  <div class="button blue" id="optionitem4" onclick="openItem('optionitem4','http://extensions.openoffice.org');
     return false;">
-    <a href="http://extensions.openoffice.org" title="Choose from a wide range of additional and individual functionality">
-    <h2>Get Apache OpenOffice Extensions and Dictionaries</h2>
-    <p>Extend your Apache OpenOffice functionality with a large and growing library of extensions and dictionaries from
-    other users.</p></a>
+    <h2><a href="http://extensions.openoffice.org"
+    title="Choose from a wide range of additional and individual functionality">
+    Get Apache OpenOffice Extensions and Dictionaries</a></h2>
+    <p><a href="http://extensions.openoffice.org"
+    title="Choose from a wide range of additional and individual functionality">
+    Extend your Apache OpenOffice functionality with a large and growing library of extensions and dictionaries from
+    other users.</a></p>
   </div>
 
   <!-- Blue: Templates -->
-  <div class="button blue" id="optionitem3_1" onclick="openItem('optionitem3_1','http://templates.openoffice.org');
+  <div class="button blue" id="optionitem5" onclick="openItem('optionitem5','http://templates.openoffice.org');
     return false;">
-    <a href="http://templates.openoffice.org" title="Choose from a wide range of additional and individual documents">
-    <h2>Get Apache OpenOffice Templates</h2>
-    <p>Extend your Apache OpenOffice creativity with a large and growing library of templates from other users.</p></a>
+    <h2><a href="http://templates.openoffice.org"
+    title="Choose from a wide range of additional and individual documents">
+    Get Apache OpenOffice Templates</a></h2>
+    <p><a href="http://templates.openoffice.org"
+    title="Choose from a wide range of additional and individual documents">
+    Extend your Apache OpenOffice creativity with a large and growing library of templates from other users.</a></p>
   </div>
 
   <!-- Yellow: Release Candidate online -->
@@ -246,59 +389,6 @@ screen reader. -->
   </noscript>
   //-->
 
-  <!-- Yellow: Beta Release online -->
-  <script type="text/javascript">
-  /*
-  <!--
-  if ( BETA_ACTIVE == 1 ) {
-    document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','all_beta.html');"
-      + "return false;\">"
-      + "<h2><a href='all_beta.html' title='Select from all platforms, languages, language packs to download'\">"
-      + "Get OpenOffice.org Beta Release</a></h2>"
-      + "<p><a href='all_beta.html' title='Select from all platforms, languages, language packs to download'\">"
-      + "<b>Most recent: OOo-Dev " + BETA_NAME + " " + BETA_NUMBER + "</b></a></p>"
-    + "</div>" );
-    document.write( "<div class=\"sub-yellow\">"
-      + "<p><a href='all_beta.html' title='Get all platforms, languages, language packs to download'>"
-      + "Get all platforms, languages, language packs</a> | "
-      + "<a href='http://www.openoffice.org/development/releases/" + BETA_BUILD + ".html'"
-      + "title='What is new, what has been improved in OpenOffice.org " + BETA_NAME + BETA_NUMBER + "?'>Release Notes</a> | "
-      + "<a href='next/md5sums/index.html" + BETA_BUILD + "_md5sums.txt' title='MD5 checksums for OpenOffice.org "
-      + BETA_NAME + BETA_NUMBER + "'>MD5 checksums</a></p>"
-    + "</div>" );
-  } else if ( BETA_ACTIVE == 0 ) {
-  // Yellow: Beta Release coming soon
-    document.write( "<div class=\"button yellow\" id=\"optionitem2\">"
-      + "<h2><a>Get OpenOffice.org Beta Release <small>(" + BETA_NAME + BETA_NUMBER + " coming soon)</small></a></h2>"
-      + "<p><a>A wide range of platforms and languages will be available."
-      + "<br /><b>Important:</b> The Beta is feature complete but can contain issues and detailed tests needs to be done."
-      + "</a></p>"
-    + "</div>" );
-  }
-  //-->
-  */
-  </script>
-
-  <!-- Yellow: Beta: No JavaScript enabled -->
-  <!--
-  <noscript>
-  <div class="button yellow" id="optionitem2" onclick="openItem('optionitem2','all_beta.html#untested-full'); return false;">
-    <h2><a href="all_beta.html" title="Select from all platforms, languages, language packs to download">
-    Get OpenOffice.org Beta Release</a></h2>
-    <p><a href="all_beta.html" title="Select from all platforms, languages, language packs to download">
-    JavaScript needs to be enabled to take full advantage of this download section. Currently it does not seem to be enabled.
-    Please click on this text to use the alternative webpage to select the favorite platform and language.</a></p>
-  </div>
-  <div class="sub-yellow">
-    <p><a href="all_beta.html" title="Get all platforms, languages, language packs to download">
-    Get all platforms, languages, language packs</a> |
-    <a href="http://www.openoffice.org/development/releases/dev_index.html"
-    title="What is new, what has been improved in OpenOffice.org?">Release Notes</a> |
-    <a href="next/md5sums/index.html" title="MD5 checksums for OpenOffice.org">MD5 checksums</a></p>
-  </div>
-  </noscript>
-  //-->
-
   <!-- Red: Developer Snapshots online -->
   <script type="text/javascript">
   /*
@@ -373,7 +463,7 @@ screen reader. -->
     <li><a href="../development/releases/index.html"
     title="What is new, what has been improved in Apache OpenOffice?">Release Notes</a></li>
     <li><a href="checksums.html"
-    title="How to verify the downloaded file with signatures and hashes?">Verify the downloaded file</a></li>
+    title="How to verify the downloaded file with signatures and hashes?"><b>Verify the downloaded file</b></a></li>
     <li><a href="../product/index.html"
     title="A tour through all Apache OpenOffice applications">Product Information</a></li>
     <li><a href="../dev_docs/source/sys_reqs_aoo40.html"

Modified: websites/staging/ooo-site/trunk/content/download/languages.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/languages.js (original)
+++ websites/staging/ooo-site/trunk/content/download/languages.js Mon Mar 10 15:00:48 2014
@@ -14,10 +14,12 @@ a      b     0	      1				2				        3
 var languages = {
 "ast":{"-": ['ast',   'Asturian',               'Asturianu',				'y', 'http://www.openoffice.org/ast/']},
 "eu": {"-": ['eu',    'Basque',                 'Euskara',				'y', 'http://www.openoffice.org/eu/']},
+"bg": {"-": ['bg',    'Bulgarian',              'български език',			'y', 'http://www.openoffice.org/bg/']},
 "zh": {"-": ['zh',    'Chinese',		'Chinese',				'y', 'http://www.openoffice.org/download/other.html'],
       "cn": ['zh-CN', 'Chinese (simplified)',	'简体中文',				'y', 'http://www.openoffice.org/download/other.html'],
       "tw": ['zh-TW', 'Chinese (traditional)',	'正體中文',				'y', 'http://www.openoffice.org/download/other.html']},
 "cs": {"-": ['cs',    'Czech',			'Čeština',				'y', 'http://www.openoffice.org/cs/']},
+"da": {"-": ['da',    'Danish',                 'Dansk',				'y', 'http://www.openoffice.org/da/']},
 "nl": {"-": ['nl',    'Dutch',			'Nederlands',				'y', 'http://www.openoffice.org/nl/downloaden.html']},
 "en": {"-": ['en',    'English',		'English',				'y', 'http://www.openoffice.org/download/other.html'],
       "en": ['en-EN', 'English',		'English',				'y', 'http://www.openoffice.org/download/other.html'],
@@ -28,12 +30,14 @@ var languages = {
 "gl": {"-": ['gl',    'Galician',		'Galego',				'y', 'http://www.openoffice.org/gl/']},
 "de": {"-": ['de',    'German',			'Deutsch',				'y', 'http://www.openoffice.org/de/']},
 "el": {"-": ['el',    'Greek',                  '&Epsilon;&lambda;&lambda;&eta;&nu;&iota;&kappa;ά', 'y', 'http://www.openoffice.org/el/']},
+"hi": {"-": ['hi',    'Hindi',                  'हिन्दी',					'y', 'http://www.openoffice.org/hi/']},
 "hu": {"-": ['hu',    'Hungarian',		'Magyar',				'y', 'http://www.openoffice.org/hu/about-downloads.html']},
 "it": {"-": ['it',    'Italian',		'Italiano',				'y', 'http://www.openoffice.org/it/download/']},
 "ja": {"-": ['ja',    'Japanese',		'日本語',				'y', 'http://www.openoffice.org/ja/']},
 "km": {"-": ['km',    'Khmer',			'ភាសាខ្មែរ',			'y', 'http://www.openoffice.org/download/other.html']},
 "ko": {"-": ['ko',    'Korean',                 '한국어',					'y', 'http://www.openoffice.org/ko/']},
 "lt": {"-": ['lt',    'Lithuanian',             'Lietuvių',				'y', 'http://www.openoffice.org/lt/']},
+"nb": {"-": ['nb',    'Norwegian (Bokmal)',     'Norsk (Bokmål)',			'y', 'http://www.openoffice.org/no/']},
 "pl": {"-": ['pl',    'Polish',                 'Polski',				'y', 'http://www.openoffice.org/pl/product.download.html']},
 "pt": {"-": ['pt',    'Portuguese (European)',	'Portugu&ecirc;s (Europeu)',		'y', 'http://www.openoffice.org/pt/download/download.htm'],
       "br": ['pt-BR', 'Portuguese (Brazilian)',	'Portugu&ecirc;s (do Brasil)',		'y', 'http://www.openoffice.org/pt-br/'],
@@ -46,29 +50,28 @@ var languages = {
 "es": {"-": ['es',    'Spanish',		'Espa&ntilde;ol',			'y', 'http://www.openoffice.org/es/']},
 "sv": {"-": ['sv',    'Swedish',                'Svenska',				'y', 'http://www.openoffice.org/sv/get/']},
 "ta": {"-": ['ta',    'Tamil',                  'தமிழ்',					'y', 'http://www.openoffice.org/ta/']},
+"th": {"-": ['th',    'Thai',                   'ภาษาไทย',				'y', 'http://www.openoffice.org/download/other.html']},
 "tr": {"-": ['tr',    'Turkish',                'T&uuml;rk&ccedil;e',			'y', 'http://www.openoffice.org/tr/']},
 "vi": {"-": ['vi',    'Vietnamese',             'Tiếng Việt',				'y', 'http://www.openoffice.org/vi/']},
 
+
 "ar": {"-": ['ar',    'Arabic',			'عربي',					'n', 'http://www.openoffice.org/ar/']},
 "as": {"-": ['as',    'Assamese',               'অসমীয়া',					 'n', 'http://www.openoffice.org/download/other.html']},
 "be": {"-": ['be',    'Belarusian',             'Беларуская мова',			'n', 'http://www.openoffice.org/download/other.html'],
       "be": ['be-BE', 'Belarusian',             'Беларуская мова',			'n', 'http://www.openoffice.org/download/other.html'],
       "by": ['be-BY', 'Belarusian',             'Беларуская мова',			'n', 'http://www.openoffice.org/download/other.html']},
 "bn": {"-": ['bn',    'Bengali',                'বাংলা',					 'n', 'http://www.openoffice.org/bn/']},
-"bg": {"-": ['bg',    'Bulgarian',              'български език',			'n', 'http://www.openoffice.org/bg/']},
 "my": {"-": ['my',    'Burmese',                'မြန်မာဘာသာ',			'n', 'http://www.openoffice.org/my/']},
 "ca": {"-": ['ca',    'Catalan',                'Català',				'n', 'http://www.softcatala.org/projectes/openoffice/'],
       "ca": ['ca-CA', 'Catalan',                'Català',				'n', 'http://www.softcatala.org/projectes/openoffice/'],
       "xv": ['ca-XV', 'Catalan (Valencian)',    'Català (Valencià)',			'n', 'http://www.openoffice.org/download/other.html']},
 "hr": {"-": ['hr',    'Croatian',               'hrvatski',				'n', 'http://www.openoffice.org/hr/']},
-"da": {"-": ['da',    'Danish',                 'Dansk',				'n', 'http://www.openoffice.org/da/']},
 "dz": {"-": ['dz',    'Dzongkha',               'རྫོང་ཁ',					 'n', 'http://www.openoffice.org/download/other.html']},
 "eo": {"-": ['eo',    'Esperanto',              'Esperanto',				'n', 'http://www.openoffice.org/eo/']},
 "et": {"-": ['et',    'Estonian',               'Eesti keel',				'n', 'http://www.openoffice.org/download/other.html']},
 "ka": {"-": ['ka',    'Georgian',               'ქართული ენა',				'n', 'http://www.openoffice.org/ka/']},
 "gu": {"-": ['gu',    'Gujarati',               'ગુજરાતી',					'n', 'http://www.openoffice.org/gu/']},
 "he": {"-": ['he',    'Hebrew',                 'עִבְרִית',					'n', 'http://www.openoffice.org/download/other.html']},
-"hi": {"-": ['hi',    'Hindi',                  'हिन्दी',					'n', 'http://www.openoffice.org/hi/']},
 "is": {"-": ['is',    'Icelandic',              'Íslenska',				'n', 'http://www.openoffice.org/download/other.html']},
 "id": {"-": ['id',    'Indonesian',             'Bahasa Indonesia',			'n', 'http://www.openoffice.org/id/']},
 "ga": {"-": ['ga',    'Irish',                  'Gaeilge',				'n', 'http://www.openoffice.org/ga/']},
@@ -81,7 +84,6 @@ var languages = {
 "ms": {"-": ['ms',    'Malaysian',              'بهاس ملايو',				'n', 'http://www.openoffice.org/ms/']},
 "mr": {"-": ['mr',    'Marathi',                'मराठी',					'n', 'http://www.openoffice.org/download/other.html']},
 "mn": {"-": ['mn',    'Mongolian',              'Монгол хэл',				'n', 'http://www.openoffice.org/mn/']},
-"nb": {"-": ['nb',    'Norwegian (Bokmal)',     'Norsk (Bokmål)',			'n', 'http://www.openoffice.org/no/']},
 "nn": {"-": ['nn',    'Norwegian (Nynorsk)',    'Norsk (Nynorsk)',			'n', 'http://www.openoffice.org/no/']},
 "no": {"-": ['no',    'Norwegian',              'Norsk',				'n', 'http://www.openoffice.org/no/']},
 "oc": {"-": ['oc',    'Occitan',                'Occitan',				'n', 'http://www.openoffice.org/download/other.html']},
@@ -94,7 +96,6 @@ var languages = {
 "sh": {"-": ['sh',    'Serbian (Latin)',        'Srpski (latinicom)',			'n', 'http://www.openoffice.org/sr/lat/preuzmi.html']},
 "si": {"-": ['si',    'Sinhala',                'සිංහල',					'n', 'http://www.openoffice.org/si/']},
 "te": {"-": ['te',    'Telugu',                 'తెలుగు',				'n', 'http://www.openoffice.org/download/other.html']},
-"th": {"-": ['th',    'Thai',                   'ภาษาไทย',				'n', 'http://www.openoffice.org/download/other.html']},
 "uk": {"-": ['uk',    'Ukrainian',              'Yкраї́нська мо́ва',			'n', 'http://www.openoffice.org/uk/']},
 "ug": {"-": ['ug',    'Uyghur',                 'ئۇيغۇرچە‎',				'n', 'http://www.openoffice.org/download/other.html']},
 "uz": {"-": ['uz',    'Uzbek',                  'Ўзбек',				'n', 'http://www.openoffice.org/uz/']},

Modified: websites/staging/ooo-site/trunk/content/download/other.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/other.html (original)
+++ websites/staging/ooo-site/trunk/content/download/other.html Mon Mar 10 15:00:48 2014
@@ -109,7 +109,7 @@
   + "How to verify the download with signatures and hash values?</a></p>" );
   document.write( "<br />" );
 
-  write_table();
+  write_table( 0 );
 
   document.write( "</div>" );
   -->