Author: buildbot
Date: Sat Jul 13 16:25:01 2013
New Revision: 869352
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/globalvars.js
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 Sat Jul 13 16:25:01 2013
@@ -1 +1 @@
-1502819
+1502821
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul 13 16:25:01 2013
@@ -1 +1 @@
-1502819
+1502821
Modified: websites/staging/ooo-site/trunk/content/download/test/globalvars.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/globalvars.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/globalvars.js Sat Jul 13 16:25:01
2013
@@ -23,10 +23,14 @@ var LP_LANG = new Array( "ar","cs","de
var SDK_LANG = new Array( "en-US" );
// Base URLs to the Sourceforge and Apache mirror server
-var SOURCEFORGE_BASE_URL = "http://sourceforge.net/projects/openofficeorg.mirror/" + VERSION
+ "/binaries/";
-var PEOPLE_BASE_URL = "http://people.apache.org/~marcus/aoo/" + VERSION;
-var APACHE_BASE_URL = "http://www.apache.org/dyn/aoo-closer.cgi/aoo/" + VERSION;
-var APACHE_DIST_BASE_URL = "http://www.apache.org/dist/aoo/" + VERSION;
+var SOURCEFORGE_BASE_URL = "http://sourceforge.net/projects/openofficeorg.mirror/files/"
+ VERSION + "/binaries/";
+var APACHE_BASE_URL = "http://www.apache.org/dyn/aoo-closer.cgi/openoffice/" + VERSION;
+var APACHE_DIST_BASE_URL = "http://www.apache.org/dist/openoffice/" + VERSION + "/binaries/";
+// var SOURCEFORGE_BASE_URL = "http://sourceforge.net/projects/openofficeorg.mirror/" + VERSION
+ "/binaries/";
+// var SOURCEFORGE_BASE_URL = "http://sourceforge.net/projects/openoffice/" + VERSION + "/binaries/";
+// var PEOPLE_BASE_URL = "http://people.apache.org/~marcus/aoo/" + VERSION;
+// var APACHE_BASE_URL = "http://www.apache.org/dyn/aoo-closer.cgi/aoo/" + VERSION;
+// var APACHE_DIST_BASE_URL = "http://www.apache.org/dist/aoo/" + VERSION;
// Deprecated mirror server
// var MIRROR_BOUNCER_URL = "http://openoffice.bouncer.osuosl.org/";
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 Sat Jul 13 16:25:01 2013
@@ -64,10 +64,9 @@
<!--
// Set a specific language ISO code to force to assemble a certain localized build as download
URL
var NL_LANGUAGE = "";
- // var LINK = getLink( VERSION, NL_LANGUAGE, MIRROR, SCHEMA );
var LINK = getLink();
- if ( hasMirrorLink( NL_LANGUAGE ) ) {
+ if ( hasMirrorLink() ) {
// if ( LINK.toLowerCase().indexOf( "other" ) ) {
// // OS and/or package manager was not recognized, therefore use "other.html" as
download link.
// document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
@@ -84,11 +83,11 @@
+ UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.<br /></a></p>");
// }
} else {
- // Download from an alternative webpage if hasMirrorLink( NL_LANGUAGE ) == false.
+ // Download from an alternative webpage if hasMirrorLink() == false.
document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+ LANG_ARRAY[ 3 ] + "');" + "return false;\">" );
- document.write( "<h2><a href='" + LANG_ARRAY[ 3 ] + "' title='" + LANG_ARRAY[
3 ] + "'>Download Apache OpenOffice "
- + VERSION + "</a></h2><p><a href='" + LANG_ARRAY[ 3 ] + "' title='"
+ LANG_ARRAY[ 3 ] + "'>A release for <b>"
+ document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[
4 ] + "'>Download Apache OpenOffice "
+ + VERSION + "</a></h2><p><a href='" + LANG_ARRAY[ 4 ] + "' title='"
+ LANG_ARRAY[ 4 ] + "'>A release for <b>"
+ LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Please choose
another language from the alternative "
+ "download webpage.</a></p>" );
}
@@ -98,13 +97,16 @@
+ "<p><a href='other.html' title='Get all platforms, languages, language packs
to download'>"
+ "<b>Get all platforms, languages, language packs</b></a> | "
+ "<a href='other.html#tested-sdk' title='Get all source code tarballs and SDK to
download'>"
- + "<b>Source Code tarballs and SDK</b></a> | <br />"
- + "Signatures and Hashes: "
- + "<a href='" + CHECKSUM_ASC + "' + title='ASC signature'>ASC</a> , "
- + "<a href='" + CHECKSUM_MD5 + "' + title='MD5 hash'>MD5</a> , "
- + "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256 hash'>SHA256</a> | "
- + "<a href='../development/releases/" + VERSION + ".html'"
- + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'>Release
Notes</a> | "
+ + "<b>Source Code tarballs and SDK</b></a> | <br />");
+ if ( CHECKSUM_ASC ) {
+ document.write( "Signatures and Hashes: "
+ + "<a href='" + CHECKSUM_ASC + "' + title='ASC signature'>ASC</a> ,
"
+ + "<a href='" + CHECKSUM_MD5 + "' + title='MD5 hash'>MD5</a> , "
+ + "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256 hash'>SHA256</a> |
");
+ }
+ document.write( "<a href='../development/releases/" + VERSION + ".html'"
+ + "title='What is new, what has been improved in Apache OpenOffice " + VERSION
+ + "?'>Release Notes</a> | "
+ "<a href='legacy/index.html' title='Get the legacy version OpenOffice.org 3.3.0'>Legacy
Version</a></p>"
+ "</div>" );
@@ -393,6 +395,7 @@
</ul>
<div id="SupportedAndSupporters">
+ <p> </p>
<a href="http://validator.w3.org/check?uri=http://www.openoffice.org/download/index.html"
title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents">
<img src="../../images/valid-xhtml10-blue.png"
|