Author: buildbot
Date: Tue May 1 21:03:44 2012
New Revision: 815326
Log:
Staging update by buildbot for openofficeorg
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/download_new_mirrorbrain.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue May 1 21:03:44 2012
@@ -1 +1 @@
-1332795
+1332826
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue May 1 21:03:44 2012
@@ -1 +1 @@
-1332795
+1332826
Modified: websites/staging/ooo-site/trunk/content/download/test/download_new_mirrorbrain.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download_new_mirrorbrain.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_new_mirrorbrain.js Tue
May 1 21:03:44 2012
@@ -18,6 +18,8 @@ function mirrorbrain_getLink( version, s
if (schema == "aoo_incubating") {
platform = getPlatform(schema);
}
+ // if we don't support platform, we should send them to other.html, ok, taken care of in
hasMirrorLink()
+ // not the right place really but ???
if ( hasMirrorLink() ) {
// use mirror link
@@ -399,12 +401,12 @@ function mirrorbrain_getPlatformForMirro
} else {
return ( a[3] == 'y' ) ? "LinuxIntel_install_wJRE" : "LinuxIntel_install";
}
- /*} else if ( navigator.platform.indexOf( "SunOS i86pc" ) != -1 ) {
+ } else if ( navigator.platform.indexOf( "SunOS i86pc" ) != -1 ) {
return ( a[3] == 'y' ) ? "Solarisx86_install_wJRE" : "Solarisx86_install";
} else if ( navigator.platform.indexOf( "SunOS sun4u" ) != -1 ) {
return ( a[3] == 'y' ) ? "SolarisSparc_install_wJRE" : "SolarisSparc_install";
} else if ( navigator.platform.indexOf( "SunOS" ) != -1 ) {
- return ( a[3] == 'y' ) ? "SolarisSparc_install_wJRE" : "SolarisSparc_install";*/
+ return ( a[3] == 'y' ) ? "SolarisSparc_install_wJRE" : "SolarisSparc_install";
} else if ( navigator.platform.indexOf( "Mac" ) != -1 && navigator.platform.indexOf(
"Intel" ) != -1 ) {
return "MacOSXIntel_install";
} else if ( navigator.platform.indexOf( "Mac" ) != -1 && navigator.platform.indexOf(
"PPC" ) != -1 ) {
@@ -515,16 +517,16 @@ function mirrorbrain_getPlatformForMirro
} else {
return "Linux_x86_install-rpm";
}
- } else if ( navigator.platform.indexOf( "SunOS i86pc" ) != -1 ) {
+ /*} else if ( navigator.platform.indexOf( "SunOS i86pc" ) != -1 ) {
return "Solaris_x86_install";
} else if ( navigator.platform.indexOf( "SunOS sun4u" ) != -1 ) {
return "Solaris_Sparc_install";
} else if ( navigator.platform.indexOf( "SunOS" ) != -1 ) {
- return "Solaris_Sparc_install";
+ return "Solaris_Sparc_install";*/
} else if ( navigator.platform.indexOf( "Mac" ) != -1 && navigator.platform.indexOf(
"Intel" ) != -1 ) {
return "MacOS_x86_install";
- } else if ( navigator.platform.indexOf( "Mac" ) != -1 && navigator.platform.indexOf(
"PPC" ) != -1 ) {
- return "MacOS_PPC_install";
+ /*} else if ( navigator.platform.indexOf( "Mac" ) != -1 && navigator.platform.indexOf(
"PPC" ) != -1 ) {
+ return "MacOS_PPC_install";*/
} else if ( navigator.platform.indexOf( "Mac" ) != -1 ) {
return "MacOS_x86_install";
// testing if this code will help to redirect the iPad, iPhone, iPod entries
|