Author: buildbot
Date: Wed Apr 30 22:32:19 2014
New Revision: 907525
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/download.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 30 22:32:19 2014
@@ -1 +1 @@
-1591504
+1591505
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 30 22:32:19 2014
@@ -1 +1 @@
-1591504
+1591505
Modified: websites/staging/ooo-site/trunk/content/download/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/download.js Wed Apr 30
22:32:19 2014
@@ -179,7 +179,7 @@ function getLink( rel_mode ) {
// If platform is too old, then provide a general
download link to the archive.
if ( OLD_PLATFORM ) {
// If platform is Mac OS X <=10.6, then provide
a download link with previous AOO version.
-/*
+
if ( UI_PLATFORM == "Mac OS X (10.6 or older)"
) {
FILENAME = "Apache_OpenOffice_"
+ PRE_VERSION + "_" + URL_PLATFORM + "_";
@@ -201,7 +201,7 @@ function getLink( rel_mode ) {
ERROR = true;
return LINK;
}
-*/
+
// If platform is Solaris, FreeBSD or OS/2,
// then provide a download link to the porting
webpage.
if ( UI_PLATFORM == "Solaris x86 (PKG)" ||
@@ -489,7 +489,7 @@ function getPlatform( rel_mode ) {
// Mac OS X?
if ( os.indexOf( "mac" ) != -1 ) { UI_PLATFORM
= "OS X 64-bit Intel (DMG)";
- URL_PLATFORM
= "MacOS_x86_install";
+ URL_PLATFORM
= "MacOS_x86-64_install";
EXTENSION
= ".dmg";
// OS X is 10.6 or older?
if ( ua.indexOf( "10.6" ) != -1 ||
@@ -500,6 +500,7 @@ function getPlatform( rel_mode ) {
ua.indexOf( "10_4" ) != -1 ||
ua.indexOf( "10.3" ) != -1 ||
ua.indexOf( "10_3" ) != -1 ) { UI_PLATFORM
= "Mac OS X (10.6 or older)";
+ URL_PLATFORM
= "MacOS_x86_install";
if ( rel_mode >
0 )
OLD_PLATFORM = true;
}
