Author: buildbot
Date: Wed Apr 30 19:19:52 2014
New Revision: 907500
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/download_other.js
websites/staging/ooo-site/trunk/content/download/index.html
websites/staging/ooo-site/trunk/content/download/other.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 30 19:19:52 2014
@@ -1 +1 @@
-1591452
+1591457
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 30 19:19:52 2014
@@ -1 +1 @@
-1591452
+1591457
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 Wed Apr 30
19:19:52 2014
@@ -110,7 +110,7 @@ function getLanguage() {
*/
function hasMirrorLink( rel_mode ) {
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
// First check if the Beta release languages (not available as
current stable release !) are set in browser
if ( LANG_ISO == "bg" || LANG_ISO == "da" || LANG_ISO == "hi"
|| LANG_ISO == "nb" || LANG_ISO == "th" ) {
@@ -155,7 +155,7 @@ function getLink( rel_mode ) {
// If no release mode was given, assume it's about the stable release
if ( rel_mode == undefined )
- rel_mode = 0;
+ rel_mode = 1;
getLanguage();
getPlatform( rel_mode );
@@ -175,7 +175,7 @@ function getLink( rel_mode ) {
// If language is supported, then provide a download link.
if ( hasMirrorLink( rel_mode ) ) {
// Release mode
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// If platform is too old, then provide a general
download link to the archive.
if ( OLD_PLATFORM ) {
// If platform is Mac OS X <=10.6, then provide
a download link with previous AOO version.
@@ -337,7 +337,7 @@ function getLink( rel_mode ) {
return LINK;
} else {
// Release mode
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// If language is not supported, then provide the link
from the Native Language (NL) group.
LINK = LANG_ARRAY[ 4 ];
} else {
@@ -549,7 +549,7 @@ function getFilesize( rel_mode ) {
// If a platform was found and no error occurred, assign the array data
and filesize from the release matrix
if ( RELEASE_MATRIX_PLATFORM_POS > -1 && !ERROR ) {
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
// Assign all values from the release matrix of
language and platform
RELEASE_MATRIX_PLATFORM = release_matrix[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ];
Modified: websites/staging/ooo-site/trunk/content/download/download_other.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download_other.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/download_other.js Wed Apr
30 19:19:52 2014
@@ -23,7 +23,7 @@ var LANG_MAX = 133; // The maximal avai
* The main entry for writting the table into the webpage
*/
function write_table( rel_mode ) {
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
var AOO = "Apache_OpenOffice_";
var AOO_SDK = "Apache_OpenOffice-SDK_";
@@ -39,7 +39,7 @@ function write_table( rel_mode ) {
var URL_SDK = PEOPLE_BASE_URL + "/binaries/SDK/" + AOO_SDK
+ VERSION;
var URL_SRC = PEOPLE_BASE_URL + "/source/" + AOO_SRC +
VERSION + "-beta-" + SVN_REV + "-src";
*/
- } else {
+ } else if ( rel_mode == 2 ) {
// Beta release mode
BETA_VERSION = "4.1.0";
VERSION = BETA_VERSION;
@@ -147,11 +147,11 @@ function write_header( rel_mode, FIRST_H
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "Linux <br />x86-64<br />RPM" + SMALL2 +
"</span></th>" );
if ( PLATFORM.indexOf( "Linux_x86-64_deb" ) > -1 )
document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "Linux <br />x86-64<br />DEB" + SMALL2 +
"</span></th>" );
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
- document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "OS X <br />Intel <br />DMG" + SMALL2 +
"</span></th>" );
- } else {
+ document.write( "<th><span style='text-align: center'
class='builds'>" + SMALL1 + "OS X <br />x86-64<br />DMG" + SMALL2 +
"</span></th>" );
+ } else if ( rel_mode == 2 ) {
// Beta release mode
PLATFORM = BETA_PLATFORM;
if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
@@ -219,7 +219,7 @@ function write_build( rel_mode, URL_AOO,
document.write( " <a " +
SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO +
VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] +
".tar.gz.md5'>MD5</a><br />" );
document.write( " <a " +
SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO +
VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] +
".tar.gz.sha256'>SHA256</a></td>" );
}
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 ) {
document.write( "<td style='text-align:
center'><a href='" + URL_AOO + INSTALL_LANG[ k ] +
"/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg/download'><b>dmg</b></a><br /><br />" );
@@ -227,7 +227,7 @@ function write_build( rel_mode, URL_AOO,
document.write( "
<a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" +
AOO + VERSION + "_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg.md5'>MD5</a><br />" );
document.write( "
<a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" +
AOO + VERSION + "_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg.sha256'>SHA256</a></td>" );
}
- } else {
+ } else if ( rel_mode == 2 ) {
// Beta release mode
if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 ) {
document.write( "<td style='text-align:
center'><a href='" + URL_AOO + INSTALL_LANG[ k ] +
"/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg/download'><b>dmg</b></a><br /><br />" );
@@ -268,7 +268,7 @@ function write_build( rel_mode, URL_AOO,
document.write( " <a " +
SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION +
"_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] +
".tar.gz.md5'>MD5</a><br />" );
document.write( " <a " +
SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION +
"_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] +
".tar.gz.sha256'>SHA256</a></td>" );
}
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 ) {
document.write( "<td style='text-align:
center'><a href='" + URL_AOO +
"_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg/download'><b>dmg</b></a><br /><br />" );
@@ -276,7 +276,7 @@ function write_build( rel_mode, URL_AOO,
document.write( "
<a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION +
"_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] + ".dmg.md5'>MD5</a><br />"
);
document.write( "
<a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION +
"_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg.sha256'>SHA256</a></td>" );
}
- } else {
+ } else if ( rel_mode == 2 ) {
// Beta release mode
if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 ) {
document.write( "<td style='text-align:
center'><a href='" + URL_AOO +
"_MacOS_x86-64_" + TYPE + "_" + INSTALL_LANG[ k ] +
".dmg/download'><b>dmg</b></a><br /><br />" );
@@ -379,7 +379,7 @@ function write_sdk( rel_mode, URL_SDK, U
else
document.write( "<tr
class='b'><td>-</td><td>-</td><td><small><a href='#notes'" + "title='What are
source tarballs?'>Source<br />tarballs</a></small></td>" );
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
document.write( "<td style='text-align: center'><a href='"
+ URL_SRC + ".tar.bz2'><b>tar.bz2</b></a><br /><br />" );
document.write( " <a " + SMALL +
"href='" + URL_HASH + AOO_SRC + ".tar.bz2.asc'>ASC</a>" );
@@ -396,7 +396,7 @@ function write_sdk( rel_mode, URL_SDK, U
document.write( " <a " + SMALL +
"href='" + URL_HASH + AOO_SRC + ".zip.md5'>MD5</a><br />" );
document.write( " <a " + SMALL +
"href='" + URL_HASH + AOO_SRC + ".zip.sha256'>SHA256</a></td>" );
document.write( "<td> </td>" );
- } else {
+ } else if ( rel_mode == 2 ) {
// Beta release mode
document.write( "<td style='text-align: center'><a href='"
+ URL_SRC + ".tar.bz2'><b>tar.bz2</b></a><br /><br />" );
document.write( " <a " + SMALL +
"href='" + URL_HASH + AOO_SRC + ".tar.bz2.asc'>ASC</a>" );
@@ -419,10 +419,10 @@ function write_sdk( rel_mode, URL_SDK, U
// At last write the row with the other files (release notes)
document.write( "<tr
class='a'><td>-</td><td>-</td><td><small>Other files</small></td>" );
- if ( rel_mode == 0 ) {
+ if ( rel_mode == 1 ) {
// Release mode
document.write( "<td style='text-align: center'><a
href='../development/releases/" + VERSION + ".html' title='Apache OpenOffice
Release Notes'>AOO<br />Release<br />Notes</a></td>" );
- } else {
+ } else if ( rel_mode == 2 ) {
// Beta release mode
// document.write( "<td style='text-align: center'><a
href='../development/releases/" + BETA_VERSION + "_Beta.html' title='Apache
OpenOffice Release Notes'>AOO<br />Release<br />Notes</a></td>" );
document.write( "<td style='text-align: center'><a
href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes'>AOO<br
/>Release<br />Notes</a></td>" );
Modified: websites/staging/ooo-site/trunk/content/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/index.html (original)
+++ websites/staging/ooo-site/trunk/content/download/index.html Wed Apr 30
19:19:52 2014
@@ -70,7 +70,7 @@ screen reader. -->
// Set a specific language ISO code to force to assemble a certain localized
build as download URL
var NL_LANGUAGE = "";
// Get the download URL for released install files (0 = release mode)
- var LINK = getLink( 0 );
+ var LINK = getLink( 1 );
if ( hasMirrorLink() ) {
if ( SOURCEFORGE ) {
// If download URL contains "sourceforge" (-> normal and correct
download link),
@@ -178,7 +178,7 @@ screen reader. -->
// Set a specific language ISO code to force to assemble a certain
localized build as download URL
var NL_LANGUAGE = "";
// Get the download URL for Beta releases (>0 = beta mode)
- var LINK = getLink( 1 );
+ var LINK = getLink( 2 );
if ( hasMirrorLink() ) {
if ( SOURCEFORGE ) {
// If a Beta Release is available for download, then download
from Sourceforge with displayed platform and language.
Modified: websites/staging/ooo-site/trunk/content/download/other.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/other.html (original)
+++ websites/staging/ooo-site/trunk/content/download/other.html Wed Apr 30
19:19:52 2014
@@ -109,7 +109,7 @@
+ "How to verify the download with signatures and hash values?</a></p>" );
document.write( "<br />" );
- write_table( 0 );
+ write_table( 1 );
document.write( "</div>"
+ "<br />"
