Author: buildbot
Date: Fri May 2 17:25:31 2014
New Revision: 907788
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/download.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 2 17:25:31 2014
@@ -1 +1 @@
-1591969
+1591975
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 2 17:25:31 2014
@@ -1 +1 @@
-1591969
+1591975
Modified: websites/staging/ooo-site/trunk/content/download/test/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download.js Fri May
2 17:25:31 2014
@@ -21,27 +21,19 @@ function initVars() {
UI_PLATFORM = ""; // The platform as
readable string
URL_PLATFORM = ""; // The platform as
part of the download URL
OLD_PLATFORM = false; // The browser
platform is old (true) or not (false)
- RELEASE_MATRIX_PLATFORM_POS_FULL = 0; // The position of the
platform in the release matrix array
- RELEASE_MATRIX_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array
+ RELEASE_MATRIX_PLATFORM_POS = -1; // The position of the
platform in the release matrix array
RELEASE_MATRIX_PLATFORM = ""; // The platform in the
release matrix array
RELEASE_MATRIX_LANG = ""; // The language
specific data depending on LANG_ISO
VERSION_ALT = ""; // The selected
version from drop-down-box
- FILENAME_FULL = ""; // The complete
filename of the download URL (for full installation)
- FILENAME_LP = ""; // The complete
filename of the download URL (for language pack)
- FILESIZE_FULL = 0; // The filesize of the
download file (for full installation)
- FILESIZE_LP = 0; // The filesize of the
download file (for language pack)
+ FILENAME = ""; // The complete
filename of the download URL
+ FILESIZE = 0; // The filesize of the
download file
EXTENSION = ""; // The file extension
of the download URL
// TYPE = ""; // The installation
type
LINK = ""; // The complete
download URL
- LINK_FULL = ""; // The complete
download URL (for full installation)
- LINK_LP = ""; // The complete
download URL (for language pack)
CHECKSUM_KEYS = ""; // The KEYS file as
download URL
- CHECKSUM_ASC_FULL = ""; // The ASC file as
download URL (for full installation)
- CHECKSUM_MD5_FULL = ""; // The MD5 file as
download URL (for full installation)
- CHECKSUM_SHA256_FULL = ""; // The SHA256 file as
download URL (for full installation)
- CHECKSUM_ASC_LP = ""; // The ASC file as
download URL (for language pack)
- CHECKSUM_MD5_LP = ""; // The MD5 file as
download URL (for language pack)
- CHECKSUM_SHA256_LP = ""; // The SHA256 file as
download URL (for language pack)
+ CHECKSUM_ASC = ""; // The ASC file as
download URL
+ CHECKSUM_MD5 = ""; // The MD5 file as
download URL
+ CHECKSUM_SHA256 = ""; // The SHA256 file as
download URL
SOURCEFORGE = false; // The download URL
points to Soureforge
OTHER = false; // The download URL
points to 'other.html'
ARCHIVE = false; // The download URL
points to the ASF archive
@@ -464,10 +456,10 @@ function getPlatform() {
*/
function getFilename( ver ) {
// Assemble the filename for download.
- FILENAME = "Apache_OpenOffice_" + ver + "_" + URL_PLATFORM + "_"
+ LANG_ISO + EXTENSION;
+ FILENAME = "Apache_OpenOffice_" + ver + "_" + URL_PLATFORM + "_" +
LANG_ISO + EXTENSION;
// Assign the file name (column 3) from the release matrix of language
and platform.
- // FILENAME = release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
+ // FILENAME = release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
return FILENAME;
}
