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/02/20 23:28:55 UTC

svn commit: r898682 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index.html

Author: buildbot
Date: Thu Feb 20 22:28:54 2014
New Revision: 898682

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/download/test/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Feb 20 22:28:54 2014
@@ -1 +1 @@
-1570019
+1570367

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Feb 20 22:28:54 2014
@@ -1 +1 @@
-1570019
+1570367

Modified: websites/staging/ooo-site/trunk/content/download/test/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/index.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/index.html Thu Feb 20 22:28:54 2014
@@ -69,46 +69,42 @@ 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( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+  + LINK + "');" + "return false;\">" );
 
   if ( hasMirrorLink() ) {
     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 + " | 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 for the most recent version for:<br />"
-      + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | ~" + FILESIZE + " MByte | Released: "
+      + " | 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>" );
     } 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>" );
+      + "<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>" );
     } 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;\">" );
       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. Click here for the previous version " + PRE_VERSION + "." );
+      + "<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>" );
     }
   } else {
     // 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 "
@@ -132,18 +128,17 @@ screen reader. -->
     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>" );
+  + "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>" );
   document.write( "</div>" );
 
   entourage.initialize();
@@ -175,18 +170,47 @@ screen reader. -->
   <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);
+
     // 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;\">" );
-      document.write( "<h2><a href='" + LINK + "' title='Version " + BETA_VERSION + " | Milestone " + BETA_MILESTONE
-      + " | Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE + "'>"
-      + "Download Apache OpenOffice " + BETA_VERSION + "</a></h2>"
-      + "<p><a href='" + LINK + "' title='Version " + BETA_VERSION + " | 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 is not yet fully tested and can contain issues. "
-      + "It is not recommended to use in production.</b></a></p>" );
+    + LINK + "') return false;\">" );
+
+    if ( hasMirrorLink() ) {
+      if ( SOURCEFORGE ) {
+        document.write( "<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 is not yet fully tested and can contain issues. "
+        + "It is not recommended to use in production.</b></a></p>" );
+      } else if ( OTHER ) {
+        // If download URL contains "other" (-> platform, OS or package manager was not recognized),
+        // then use "all_beta.html" as download link.
+        LINK = "http://www.openoffice.org/download/test/all_beta.html";
+
+        document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+        + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>"
+        + "<p><a href='" + LINK + "' title='" + LINK + "'>The Beta release is not available for:<br />"
+        + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b><br />"
+        + "Click here to choose from the alternative download webpage.</a></p>" );
+      }
+    } else {
+      // If browser language do not match with AOO languages, then download from an alternative webpage.
+      LINK = "http://www.openoffice.org/download/test/all_beta.html";
+
+      document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+      + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>"
+      + "<p><a href='" + LINK + "' title='" + LINK + "'>The Beta release is not available for:<br />"
+      + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b><br />"
+      + "Click here to choose from the alternative download webpage.</a></p>" );
+    }
     document.write( "</div>" );
 
     // Show some helpful links for SDK, source, checksums, release notes.
@@ -200,24 +224,26 @@ 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+" + BETA_NAME + "+Release+Notes'"
-      + "title='What is new, what has been improved in Apache OpenOffice " + BETA_VERSION + "?'><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>" );
+    document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+" + BETA_VERSION + "+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>" );
     document.write( "</div>" );
 
+//  } else {
+
     // Yellow: Beta Release coming soon
-    ANN_LINK  = "https://blogs.apache.org/OOo/";
-    ANN_TITLE = "Official blog of Apache OpenOffice";
+    var ANN_LINK  = "https://blogs.apache.org/OOo/";
+    var ANN_TITLE = "Official blog of Apache OpenOffice";
+
     document.write( "<div class=\"button yellow_wo_icon\" id=\"optionitem2\" onclick=\"openItem('optionitem2','"
-      + ANN_LINK + "') return false;\">" );
-      document.write( "<h2><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'>"
-      + "Get Apache OpenOffice " + BETA_VERSION + "<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>" );
+    + ANN_LINK + "') return false;\">" );
+    document.write( "<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>" );
     document.write( "</div>" );
   }
   //-->