Author: buildbot Date: Mon Feb 10 20:40:29 2014 New Revision: 897208 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/analyze.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Mon Feb 10 20:40:29 2014 @@ -1 +1 @@ -1566735 +1566736 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Mon Feb 10 20:40:29 2014 @@ -1 +1 @@ -1566735 +1566736 Modified: websites/staging/ooo-site/trunk/content/download/test/analyze.html ============================================================================== --- websites/staging/ooo-site/trunk/content/download/test/analyze.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/analyze.html Mon Feb 10 20:40:29 2014 @@ -57,18 +57,18 @@ if ( hasMirrorLink() ) { if ( LINK.toLowerCase().indexOf( "sourceforge" ) != -1 ) { - // Download directly from a mirror with displayed platform and language. + // Download directly from Sourceforge with displayed platform and language. document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','" + LINK + "');" + "return false;\">" ); document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE - + " | Build ID " + BUILD + " | SVN " + SVN_REV + " | Release date " + DATE + "'>" + + " | Build ID " + BUILD + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>" + "Download Apache OpenOffice " + VERSION + "</a></h2>" + "<p><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE + " | Build ID " + BUILD - + " | SVN " + SVN_REV + " | Release date " + DATE + "'>Click here for the most recent version for:<br />" + + " | 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: " - + DATE + "<br /></a></p>" ); - } else { - // OS and/or package manager was not recognized, therefore use "other.html" as download link. + + REL_DATE + "<br /></a></p>" ); + } else if ( UI_PLATFORM.toLowerCase().indexOf( "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;\">" ); document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>" @@ -76,9 +76,18 @@ + "<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 { - // Download from an alternative webpage if hasMirrorLink() == false. + // If browser language do not match with AOO languages, then download from an alternative webpage. document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','" + LANG_ARRAY[ 4 ] + "');" + "return false;\">" ); document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>"