Author: buildbot Date: Mon Feb 24 21:10:19 2014 New Revision: 899066 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 24 21:10:19 2014 @@ -1 +1 @@ -1571439 +1571440 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Mon Feb 24 21:10:19 2014 @@ -1 +1 @@ -1571439 +1571440 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 24 21:10:19 2014 @@ -71,7 +71,6 @@ screen reader. --> var NL_LANGUAGE = ""; // Get the download URL for released install files (0 = release mode) var LINK = getLink(0); - if ( hasMirrorLink() ) { if ( SOURCEFORGE ) { // If download URL contains "sourceforge" (-> normal and correct download link), @@ -120,7 +119,6 @@ screen reader. --> + "alternative " + LANG_ARRAY[ 1 ] + " download webpage.</a></p>" + "</div>" ); } - // Show some helpful links for SDK, source, checksums, release notes, legacy version. document.write( "<div class=\"sub-green\">" ); document.write( "<p>" ); @@ -148,7 +146,6 @@ screen reader. --> + "<a href='../legacy/index.html' title='Get the legacy version of OpenOffice.org " + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a></p>" + "</div>" ); - entourage.initialize(); //--> </script> @@ -182,7 +179,6 @@ screen reader. --> var NL_LANGUAGE = ""; // Get the download URL for Beta releases (>0 = beta mode) var LINK = getLink(1); - if ( hasMirrorLink() ) { if ( SOURCEFORGE ) { // If a Beta Release is available for download, then download from Sourceforge with displayed platform and language. @@ -202,7 +198,6 @@ screen reader. --> // If download URL contains "other" (-> platform, OS or package manager was not recognized), // then use "all_beta.html" as download link. LINK = "http://www.openoffice.org/download/test/all_beta.html"; - document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','" + LINK + "') return false;\">" + "<h2><a href='" + LINK + "' title='" + LINK + "'>" @@ -215,7 +210,6 @@ screen reader. --> } else { // If browser language do not match with AOO languages, then download from an alternative webpage. LINK = "http://www.openoffice.org/download/test/all_beta.html"; - document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','" + LINK + "') return false;\">" + "<h2><a href='" + LINK + "' title='" + LINK + "'>" @@ -225,7 +219,6 @@ screen reader. --> + "Click here to choose from the alternative download webpage.</a></p>" + "</div>" ); } - // Show some helpful links for SDK, source, checksums, release notes. document.write( "<div class=\"sub-yellow\">" ); document.write( "<p>" ); @@ -243,21 +236,18 @@ screen reader. --> + "<b>Get all platforms, languages, language packs</b></a> | " + "<a href='all_beta.html#source' title='Get the source code and SDK to download'>Source code and SDK</a></p>" + "</div>" ); - // } else { - // Yellow: Beta Release coming soon var ANN_LINK = "https://blogs.apache.org/OOo/"; var ANN_TITLE = "Official blog of Apache OpenOffice"; - document.write( "<div class=\"button yellow_wo_icon\" id=\"optionitem2\" onclick=\"openItem('optionitem2','" - + ANN_LINK + "') return false;\">" ); - document.write( "<h2><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'>" - + "Get Apache OpenOffice " + BETA_NAME + "<br /><small>(planned for: " + BETA_REL_DATE + ")</small></a></h2>" - + "<p><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'><br />" - + "The Beta release is not yet available. Please make sure to come back on the release date to download and test the " - + "new version.</a></p>" ); - document.write( "</div>" ); + + ANN_LINK + "') return false;\">" + + "<h2><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'>" + + "Get Apache OpenOffice " + BETA_NAME + "<br /><small>(planned for: " + BETA_REL_DATE + ")</small></a></h2>" + + "<p><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'><br />" + + "The Beta release is not yet available. Please make sure to come back on the release date to download and test the " + + "new version.</a></p>" + + "</div>" ); } //--> </script>