Author: buildbot
Date: Thu May 29 00:23:04 2014
New Revision: 910350
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
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
websites/staging/ooo-site/trunk/content/download/test/index_droplist.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 00:23:04 2014
@@ -1 +1 @@
-1598179
+1598182
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 00:23:04 2014
@@ -1 +1 @@
-1598179
+1598182
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 Thu May
29 00:23:04 2014
@@ -48,9 +48,6 @@ screen reader. -->
// Get the download link (1 = Stable Release).
var dl_link = getLink( 1 );
// Does the browser language match with AOO languages?
-
-// alertDbg( "index.html" );
-
if ( isLangSupported() ) {
if ( SF ) {
// If download link contains "sourceforge" (-> normal and correct
download link),
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Thu May 29 00:23:04 2014
@@ -1600,12 +1600,12 @@ function getFilename( ver ) {
// Assemble filename for download from release matrix
of language and platform (column 0).
// Product name + version + platform as URL part +
language ISO + file extension.
- FILENAME_FULL = "Apache_OpenOffice_" + ver + "_";
- FILENAME_FULL = FILENAME_FULL +
release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ];
- FILENAME_FULL = FILENAME_FULL + "_" + LANG_ISO +
EXTENSION;
- FILENAME_LP = "Apache_OpenOffice_" + ver + "_";
- FILENAME_LP = FILENAME_LP +
release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ];
- FILENAME_LP = FILENAME_LP + "_" + LANG_ISO +
EXTENSION;
+ FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"
+ + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ] + "_"
+ + LANG_ISO + EXTENSION;
+ FILENAME_LP = "Apache_OpenOffice_" + ver + "_"
+ + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ] + "_"
+ + LANG_ISO + EXTENSION;
break;
case "4.0.1":
// Assign all values from the release matrix of
language and platform.
@@ -1613,12 +1613,12 @@ function getFilename( ver ) {
// Assemble filename for download from release matrix
of language and platform (column 0).
// Product name + version + platform as URL part +
language ISO + file extension.
- FILENAME_FULL = "Apache_OpenOffice_" + ver + "_";
- FILENAME_FULL = FILENAME_FULL +
release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ];
- FILENAME_FULL = FILENAME_FULL + "_" + LANG_ISO +
EXTENSION;
- FILENAME_LP = "Apache_OpenOffice_" + ver + "_";
- FILENAME_LP = FILENAME_LP +
release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ];
- FILENAME_LP = FILENAME_LP + "_" + LANG_ISO +
EXTENSION;
+ FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"
+ + release_matrix_401[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ] + "_"
+ + LANG_ISO + EXTENSION;
+ FILENAME_LP = "Apache_OpenOffice_" + ver + "_"
+ + release_matrix_401[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ] + "_"
+ + LANG_ISO + EXTENSION;
break;
case "4.0.0":
// Assign all values from the release matrix of
language and platform.
@@ -1643,12 +1643,12 @@ function getFilename( ver ) {
/*
// Assemble the filename for download from the release matrix of
language and platform (column 0).
// Product name + version + platform as URL part + language ISO + file
extension.
- FILENAME_FULL = "Apache_OpenOffice_" + ver + "_";
- FILENAME_FULL = FILENAME_FULL + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ];
- FILENAME_FULL = FILENAME_FULL + "_" + LANG_ISO + EXTENSION;
- FILENAME_LP = "Apache_OpenOffice_" + ver + "_";
- FILENAME_LP = FILENAME_LP + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ];
- FILENAME_LP = FILENAME_LP + "_" + LANG_ISO + EXTENSION;
+ FILENAME_FULL = "Apache_OpenOffice_" + ver + "_"
+ + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ] + "_"
+ + LANG_ISO + EXTENSION;
+ FILENAME_LP = "Apache_OpenOffice_" + ver + "_"
+ + release_matrix_410[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ] + "_"
+ + LANG_ISO + EXTENSION;
*/
// alert( ver + "\n\n" + FILENAME_FULL + "\n\n" + FILENAME_LP );
Modified:
websites/staging/ooo-site/trunk/content/download/test/index_droplist.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html
Thu May 29 00:23:04 2014
@@ -84,9 +84,6 @@ screen reader. -->
// Get the download link (1 = Stable Release).
var dl_link = getLink( 1 );
// Does the browser language match with AOO languages?
-
-// alertDbg( "index.html" );
-
if ( isLangSupported() ) {
if ( SF ) {
// If download link contains "sourceforge" (-> normal and correct
download link),
@@ -219,7 +216,7 @@ screen reader. -->
+ "</h2>"
+ "<p style='padding-bottom: 0px;'>"
- + "<a title='Apache OpenOffice binary files are hosted trustworthy by
Sourceforge.net'>"
+ + "<a title='Apache OpenOffice binary files are hosted by
Sourceforge.net - A trusted website'>"
+ "(Hosted by Sourceforge.net - A trusted website)</a>"
+ "<a title='Select your favorite operating system, language and
version'>"
+ "<b>Select your favorite operating system, language and
version:</b></a>"
