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

[bu...@apache.org]

Author: buildbot
Date: Mon Feb 10 20:23:42 2014
New Revision: 897205

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 Mon Feb 10 20:23:42 2014
@@ -1 +1 @@
-1566712
+1566729

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Feb 10 20:23:42 2014
@@ -1 +1 @@
-1566712
+1566729

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 Mon Feb 10 20:23:42 2014
@@ -73,17 +73,7 @@ screen reader. -->
   var LINK        = getLink();
 
   if ( hasMirrorLink() ) {
-    if ( OLD_PLATFORM ) {
-      // If MacOS X version is <= 10.6, then provide download link form AOO 4.0.1 archive.
-      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 the previous version " + PREVIOUSVERSION + " from the "
-      + "archive.</a></p>" );
-    }
-    else if ( LINK.toLowerCase().indexOf( "sourceforge" ) != -1 ) {
+    if ( LINK.toLowerCase().indexOf( "sourceforge" ) != -1 ) {
       // Download directly from Sourceforge with displayed platform and language.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
       + LINK + "');" + "return false;\">" );
@@ -94,7 +84,7 @@ screen reader. -->
       + " | 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: "
       + REL_DATE + "<br /></a></p>" );
-    } else {
+    } else if ( UI_PLATFORM.toLowerCase().ondexOf( "unknown" ) != -1 ) {
       // If platform and/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;\">" );
@@ -103,6 +93,15 @@ screen reader. -->
       + "<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>" );
+    } else if ( OLD_PLATFORM ) {
+      // If MacOS X version is <= 10.6, then provide download link form AOO 4.0.1 archive.
+      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 the previous version " + PREVIOUSVERSION + " from the "
+      + "archive.</a></p>" );
     }
   } else {
     // If browser language do not match with AOO languages, then download from an alternative webpage.