Author: buildbot
Date: Tue Jul 7 22:00:47 2015
New Revision: 957414
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
websites/staging/ooo-site/trunk/content/download/globalvars.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jul 7 22:00:47 2015
@@ -1 +1 @@
-1689373
+1689750
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jul 7 22:00:47 2015
@@ -1 +1 @@
-1689373
+1689750
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 Tue Jul 7
22:00:47 2015
@@ -1101,7 +1101,7 @@ DL.getPlatform = function() {
}
// Mac OS X?
- if( os.indexOf( "mac" ) !== -1 ) {
DL.UI_PLATFORM = "OS X 64-bit (x86-64) (DMG)";
+ if( os.indexOf( "mac" ) !== -1 ) {
DL.UI_PLATFORM = "OS X (version >= 10.7) (DMG)";
DL.PLATFORM = "mac64";
DL.EXTENSION = ".dmg";
@@ -1113,7 +1113,7 @@ DL.getPlatform = function() {
ua.indexOf( " 10.4" ) !== -1 ||
ua.indexOf( " 10_4" ) !== -1 ||
ua.indexOf( " 10.3" ) !== -1 ||
- ua.indexOf( " 10_3" ) !== -1 ) {
DL.UI_PLATFORM = "Mac OS X (Version <= 10.6)";
+ ua.indexOf( " 10_3" ) !== -1 ) {
DL.UI_PLATFORM = "OS X (version <= 10.6) (DMG)";
DL.PLATFORM = "mac32";
}
@@ -1127,7 +1127,7 @@ DL.getPlatform = function() {
ua.indexOf( " 10.8" ) !== -1 ||
ua.indexOf( " 10_8" ) !== -1 ||
ua.indexOf( " 10.7" ) !== -1 ||
- ua.indexOf( " 10_7" ) !== -1 ) {
DL.UI_PLATFORM = "OS X 64-bit (x86-64) (DMG)";
+ ua.indexOf( " 10_7" ) !== -1 ) {
DL.UI_PLATFORM = "OS X (version >= 10.7) (DMG)";
DL.PLATFORM = "mac64";
}
}
Modified: websites/staging/ooo-site/trunk/content/download/globalvars.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/globalvars.js (original)
+++ websites/staging/ooo-site/trunk/content/download/globalvars.js Tue Jul 7
22:00:47 2015
@@ -35,8 +35,8 @@ DL.SEL_OS = [ "win32", "Windows (EXE)
"lnx64r", "Linux 64-bit (x86-64) (RPM)",
".tar.gz",
"lnx32d", "Linux 32-bit (x86) (DEB)",
".tar.gz",
"lnx32r", "Linux 32-bit (x86) (RPM)",
".tar.gz",
- "mac64", "OS X 64-bit (x86-64) (DMG)",
".dmg",
- "mac32", "OS X 32-bit (x86) (DMG)",
".dmg",
+ "mac64", "OS X (version >= 10.7) (DMG)",
".dmg",
+ "mac32", "OS X (version <= 10.6) (DMG)",
".dmg",
"other", "More platforms / operating
systems", "" ];
// Data for the <select> element "lang".
