Author: buildbot
Date: Sun Mar  2 22:55:17 2014
New Revision: 899781

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 Sun Mar  2 22:55:17 2014
@@ -1 +1 @@
-1573367
+1573394

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Mar  2 22:55:17 2014
@@ -1 +1 @@
-1573367
+1573394

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 Sun Mar  2 22:55:17 2014
@@ -70,7 +70,13 @@ 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 for released install files (0 = release mode)
-  var LINK        = getLink(0);
+  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 ( SOURCEFORGE ) {
       // If download URL contains "sourceforge" (-> normal and correct download link),
@@ -93,8 +99,8 @@ screen reader. -->
         + "<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>"
+        + "<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),
@@ -104,8 +110,8 @@ screen reader. -->
         + "<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>"
+        + "<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 {
@@ -115,8 +121,8 @@ screen reader. -->
       + "<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>"
+      + "<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>" );
   }
   // Show some helpful links for SDK, source, checksums, release notes, legacy version.
@@ -178,7 +184,13 @@ 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 for Beta releases (>0 = beta mode)
-    var LINK        = getLink(1);
+    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.
@@ -196,26 +208,36 @@ screen reader. -->
         + "</div>" );
       } 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( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','"
-          + LINK + "') return false;\">"
+        // then use "other.html" as download link.
+        document.write( "<div class=\"first button yellow\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+          + LINK + "');" + "return false;\">"
           + "<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 />"
+          + "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 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 download from an alternative webpage.
-      LINK = "http://www.openoffice.org/download/test/all_beta.html";
+      // 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 + "'>The Beta release is not available for:<br />"
-        + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b><br />"
+        + "<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>" );
     }