Author: buildbot
Date: Fri May 30 19:34:21 2014
New Revision: 910614
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
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 30 19:34:21 2014
@@ -1 +1 @@
-1598710
+1598711
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 30 19:34:21 2014
@@ -1 +1 @@
-1598710
+1598711
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 Fri May
30 19:34:21 2014
@@ -5,10 +5,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Apache OpenOffice Downloads - Analyze errors of stable release</title>
- <script type="text/javascript" src="globalvars_droplist.js"></script>
+ <script type="text/javascript" src="globalvars.js"></script>
<script type="text/javascript" src="languages.js"></script>
- <script type="text/javascript" src="release_matrix_droplist.js"></script>
- <script type="text/javascript" src="download_droplist.js"></script>
+ <script type="text/javascript" src="release_matrix.js"></script>
+ <script type="text/javascript" src="download.js"></script>
<style type="text/css">
/* <![CDATA[ */
/*-------------------- Exceptions on standard css -----------------------*/
@@ -44,12 +44,12 @@ screen reader. -->
<script type="text/javascript">
<!--
// Set a specific language ISO code to force to assemble a certain localized
build as download link.
- NL_LANG = "";
+ NL_LANGUAGE = "";
// Get the download link (1 = Stable Release).
var dl_link = getLink( 1 );
// Does the browser language match with AOO languages?
- if ( isLangSupported() ) {
- if ( SF ) {
+ if ( hasMirrorLink() ) {
+ if ( SOURCEFORGE ) {
// If download link contains "sourceforge" (-> normal and correct
download link),
// offer download link from Sourceforge with displayed platform and
language.
/*
@@ -60,17 +60,17 @@ screen reader. -->
+ "<p><a href='" + dl_link + "' title='Click to download: " +
FILENAME_FULL + "'>"
+ "Click here to download (hosted by Sourceforge.net) for:"
+ "<br /><b>" + UI_PLATFORM + "</b> and <b>" + RELEASE_MATRIX_LANG[ 1
] + " (" + RELEASE_MATRIX_LANG[ 2 ] + ")</b>"
- + "<br />Filesize ~" + FILESIZE_FULL + " MByte | Milestone " +
MILESTONE + " | Build ID " + BUILD
+ + "<br />Filesize ~" + FILESIZE + " MByte | Milestone " +
MILESTONE + " | Build ID " + BUILD
+ " | SVN " + SVN_REV + " | Released: " + REL_DATE + "</a></p>"
+ "</div>" );
*/
document.write( "<div class=\"first button green\" id=\"optionitem1\"
onclick=\"openItem('optionitem1','"
+ dl_link + "'); return false;\">"
- + "<h2><a href='" + dl_link + "' title='Click to download: " +
FILENAME_FULL + "'>"
+ + "<h2><a href='" + dl_link + "' title='Click to download: " +
FILENAME + "'>"
+ "Download Apache OpenOffice " + VERSION + "</a></h2>"
- + "<p><a href='" + dl_link + "' title='Click to download: " +
FILENAME_FULL + "'>"
- + "<a href='" + dl_link + "' title='Click to download: " +
FILENAME_FULL + "'>"
- + "<b>" + UI_PLATFORM + "</b> and <b>" + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ")</b> "
+ + "<p><a href='" + dl_link + "' title='Click to download: " + FILENAME
+ "'>"
+ + "<a href='" + dl_link + "' title='Click to download: " + FILENAME +
"'>"
+ + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 1 ] + " (" +
LANG_ARRAY[ 2 ] + ")</b> "
+ " (Hosted by Sourceforge.net - A trusted
website)</a></p>"
+ "</div>" );
} else if ( OTHER ) {
@@ -78,11 +78,11 @@ screen reader. -->
// use "other.html" as download link.
document.write( "<div class=\"first button green\" id=\"optionitem1\"
onclick=\"openItem('optionitem1','"
+ dl_link + "'); return false;\">"
- + "<h2><a href='" + dl_link + "' title='Click to download: " +
FILENAME_FULL + "'>"
+ + "<h2><a href='" + dl_link + "' title='Click to download: " +
FILENAME + "'>"
+ "Download Apache OpenOffice</a></h2>"
- + "<p><a href='" + dl_link + "' title='Click to download: " +
FILENAME_FULL + "'>"
+ + "<p><a href='" + dl_link + "' title='Click to download: " + FILENAME
+ "'>"
+ "Apache OpenOffice " + VERSION + " for "
- + "<b>" + UI_PLATFORM + "</b> and <b>" + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ")</b> "
+ + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 1 ] + " (" +
LANG_ARRAY[ 2 ] + ")</b> "
+ "is not available. Click here to choose from the alternative
download webpage.</a></p>"
+ "</div>" );
} else if ( ARCHIVE ) {
@@ -90,11 +90,11 @@ screen reader. -->
// offer download link from archive to the previous version.
document.write( "<div class=\"first button green\" id=\"optionitem1\"
onclick=\"openItem('optionitem1','"
+ dl_link + "'); return false;\">"
- + "<h2><a href='" + dl_link + "' title='Click to download: " +
FILENAME_FULL + "'>"
+ + "<h2><a href='" + dl_link + "' title='Click to download: " +
FILENAME + "'>"
+ "Download Apache OpenOffice</a></h2>"
- + "<p><a href='" + dl_link + "' title='Click to download: " +
FILENAME_FULL + "'>"
+ + "<p><a href='" + dl_link + "' title='Click to download: " + FILENAME
+ "'>"
+ "Apache OpenOffice " + VERSION + " for "
- + "<b>" + UI_PLATFORM + "</b> and <b>" + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ")</b> "
+ + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 1 ] + " (" +
LANG_ARRAY[ 2 ] + ")</b> "
+ "is not available. Click here for the previous version " +
PRE_VERSION + ".</a></p>"
+ "</div>" );
}
@@ -106,8 +106,8 @@ screen reader. -->
+ "<h2><a href='" + dl_link + "' title='Click to download from: " +
dl_link + "'>"
+ "Download Apache OpenOffice</a></h2>"
+ "<p><a href='" + dl_link + "' title='Click to download from: " +
dl_link + "'>"
- + "Apache OpenOffice " + VERSION + " for <b>" + RELEASE_LANG[ 1 ] + " ("
+ RELEASE_LANG[ 2 ] + ")</b> "
- + "is not available. Click here to choose from the alternative " +
RELEASE_LANG[ 1 ] + " download webpage."
+ + "Apache OpenOffice " + VERSION + " for <b>" + LANG_ARRAY[ 1 ] + " (" +
LANG_ARRAY[ 2 ] + ")</b> "
+ + "is not available. Click here to choose from the alternative " +
LANG_ARRAY[ 1 ] + " download webpage."
+ "</a></p>"
+ "</div>" );
}
@@ -140,7 +140,7 @@ screen reader. -->
*/
document.write( "<div class='sub-green'>"
+ "<p></p>"
- + "<p><a style='text-decoration: none;'>Filesize ~" + FILESIZE_FULL +
" MByte | Milestone " + MILESTONE + " | "
+ + "<p><a style='text-decoration: none;'>Filesize ~" + FILESIZE +
" MByte | Milestone " + MILESTONE + " | "
+ "Build ID " + BUILD + " | SVN " + SVN_REV + " | Released: " + REL_DATE +
"</a></p>"
+ "<p></p>"
+ "</div>" );
@@ -192,26 +192,22 @@ screen reader. -->
document.write( "<tr><td>Language name
</td><td>" + LANG_ARRAY[ 2 ] + "</td></tr>" );
document.write( "<tr><td>Language ISO code
</td><td>" + LANG_ISO + "</td></tr>" );
document.write( "<tr><td>Language array data
</td><td>" + LANG_ARRAY + "</td></tr>" );
- document.write( "<tr><td>Release matrix platform position (full)
</td><td>" + RELEASE_PLATFORM_POS_FULL + "</td></tr>" );
- document.write( "<tr><td>Release matrix platform position (lp)
</td><td>" + RELEASE_PLATFORM_POS_LP + "</td></tr>" );
- document.write( "<tr><td>Release matrix platform array data
</td><td>" + RELEASE_PLATFORM + "</td></tr>" );
- document.write( "<tr><td>Release matrix language array data
</td><td>" + RELEASE_LANG + "</td></tr>" );
+// document.write( "<tr><td>Release matrix platform position (full)
</td><td>" + RELEASE_MATRIX_PLATFORM_POS_FULL + "</td></tr>" );
+// document.write( "<tr><td>Release matrix platform position (lp)
</td><td>" + RELEASE_MATRIX_PLATFORM_POS_LP + "</td></tr>" );
+// document.write( "<tr><td>Release matrix platform array data
</td><td>" + RELEASE_MATRIX_PLATFORM + "</td></tr>" );
+// document.write( "<tr><td>Release matrix language array data
</td><td>" + RELEASE_MATRIX_LANG + "</td></tr>" );
document.write( "<tr><td>UI platform name
</td><td>" + UI_PLATFORM + "</td></tr>" );
- document.write( "<tr><td>UI platform name (not supported)
</td><td>" + UI_PLATFORM_NO_SUP + "</td></tr>" );
+// document.write( "<tr><td>UI platform name (not supported)
</td><td>" + UI_PLATFORM_NO_SUP + "</td></tr>" );
document.write( "<tr><td>URL platform name
</td><td>" + URL_PLATFORM + "</td></tr>" );
- document.write( "<tr><td>File name (full)
</td><td>" + FILENAME_FULL + "</td></tr>" );
- document.write( "<tr><td>File name (lp)
</td><td>" + FILENAME_LP + "</td></tr>" );
+ document.write( "<tr><td>File name
</td><td>" + FILENAME + "</td></tr>" );
document.write( "<tr><td>File extension
</td><td>" + EXTENSION + "</td></tr>" );
- document.write( "<tr><td>File size (full) (MByte)
</td><td>" + FILESIZE_FULL + "</td></tr>" );
- document.write( "<tr><td>File size (lp) (MByte)
</td><td>" + FILESIZE_LP + "</td></tr>" );
- document.write( "<tr><td>Download file link (full)
</td><td>" + LINK_FULL + "</td></tr>" );
- document.write( "<tr><td>Download file link (lp)
</td><td>" + LINK_LP + "</td></tr>" );
- document.write( "<tr><td>Checksum file link (full) (here for MD5)
</td><td>" + LINK_CHK_MD5_FULL + "</td></tr>" );
- document.write( "<tr><td>Checksum file link (lp) (here for MD5)
</td><td>" + LINK_CHK_MD5_LP + "</td></tr>" );
+ document.write( "<tr><td>File size (MByte)
</td><td>" + FILESIZE + "</td></tr>" );
+ document.write( "<tr><td>Download file link
</td><td>" + LINK + "</td></tr>" );
+ document.write( "<tr><td>Checksum file link (here for MD5)
</td><td>" + CHECKSUM_MD5 + "</td></tr>" );
document.write( "<tr><td>getLink()
</td><td>" + getLink( 1 ) + "</td></tr>" );
- document.write( "<tr><td>isLangSupported() ?
</td><td>" + isLangSupported() + "</td></tr>" );
+ document.write( "<tr><td>hasMirrorLink() ?
</td><td>" + hasMirrorLink() + "</td></tr>" );
document.write( "<tr><td>Old platform ?
</td><td>" + OLD_PLATFORM + "</td></tr>" );
- document.write( "<tr><td>Contains link to Sourgeforge ?
</td><td>" + SF + "</td></tr>" );
+ document.write( "<tr><td>Contains link to Sourgeforge ?
</td><td>" + SOURCEFORGE + "</td></tr>" );
document.write( "<tr><td>Contains link to 'other.html' ?
</td><td>" + OTHER + "</td></tr>" );
document.write( "<tr><td>Contains link to archived build ?
</td><td>" + ARCHIVE + "</td></tr>" );
document.write( "<tr><td>General error ?
</td><td>" + ERROR + "</td></tr>" );
