Author: buildbot
Date: Mon Feb 10 21:44:21 2014
New Revision: 897215
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.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Feb 10 21:44:21 2014
@@ -1 +1 @@
-1566757
+1566759
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Feb 10 21:44:21 2014
@@ -1 +1 @@
-1566757
+1566759
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 Mon Feb
10 21:44:21 2014
@@ -34,16 +34,9 @@
-<!-- No JavaScript enabled -->
-<noscript>
- <div class="notice">
- <h1>Apache OpenOffice Downloads - Analyze errors</h1>
- <br />
-
- <h2>JavaScript not enabled?</h2>
- <p>JavaScript needs to be enabled to show the analysis data on this
webpage.</p>
- </div>
-</noscript>
+<!-- The text in the H1 tag is intentionally shown as not displayable, just to
please accessibility tools like a
+screen reader. -->
+<h1 style="display: none;">Apache OpenOffice Download</h1>
<div class="optionset">
@@ -56,8 +49,9 @@
var LINK = getLink();
if ( hasMirrorLink() ) {
- if ( LINK.toLowerCase().indexOf( "sourceforge" ) != -1 ) {
- // Download directly from Sourceforge with displayed platform and
language.
+ if ( SOURCEFORGE ) {
+ // If download URL contains "sourceforge" (-> normal and correct
download link),
+ // then download from Sourceforge with displayed platform and language.
document.write( "<div class=\"first button green\" id=\"optionitem1\"
onclick=\"openItem('optionitem1','"
+ LINK + "');" + "return false;\">" );
document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION +
" | Milestone " + MILESTONE
@@ -67,8 +61,9 @@
+ " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>Click here for
the most recent version for:<br />"
+ "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | ~" +
FILESIZE + " MByte | Released: "
+ REL_DATE + "<br /></a></p>" );
- } else if ( UI_PLATFORM.toLowerCase().indexOf( "unknown" ) != -1 ) {
- // If platform and/or package manager was not recognized, then use
"other.html" as download link.
+ } else if ( OTHER ) {
+ // If download URL contains "other" (-> platform, OS or package manager
was not recognized),
+ // then use "other.html" as download link.
document.write( "<div class=\"first button green\" id=\"optionitem1\"
onclick=\"openItem('optionitem1','"
+ LINK + "');" + "return false;\">" );
document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>"
@@ -76,8 +71,9 @@
+ "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " +
VERSION + " for "
+ "<b>" + UI_PLATFORM + "</b> is not available. Please choose another
platform build from the alternative download "
+ "webpage.</a></p>" );
- } else if ( OLD_PLATFORM ) {
- // If MacOS X version is <= 10.6, then provide download link form AOO
4.0.1 archive.
+ } else if ( ARCHIVE ) {
+ // If download URL contains "archive" (-> platform/OS is no longer
supported),
+ // then use the ASF archive as download link.
document.write( "<div class=\"first button green\" id=\"optionitem1\"
onclick=\"openItem('optionitem1','"
+ LINK + "');" + "return false;\">" );
document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>"
@@ -110,7 +106,7 @@
+ "<a href='../checksums.html' title='How to verify the download with
checksums?'>How to verify?</a> | " );
}
document.write( "<a
href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes'"
- + "title='What is new, what has been improved in Apache OpenOffice " +
VERSION + "?'>Release Notes</a> | <br />"
+ + "title='What is new, what has been improved in Apache OpenOffice " +
VERSION + "?'><b>Release Notes</b></a> | <br />"
+ "<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#source' title='Get the source code and SDK to
download'>"
@@ -128,6 +124,17 @@
<p> </p>
</div>
+<!-- No JavaScript enabled -->
+<noscript>
+ <div class="notice">
+ <h1>Apache OpenOffice Downloads - Analyze errors</h1>
+ <br />
+
+ <h2>JavaScript not enabled?</h2>
+ <p>JavaScript needs to be enabled to show the analysis data on this
webpage.</p>
+ </div>
+</noscript>
+
<div>
<script type="text/javascript">
document.write( "<table border='1' style='border-collapse:collapse;
border-spacing: 2px; float: left'><tbody>" );
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 Mon Feb
10 21:44:21 2014
@@ -26,19 +26,12 @@ var CHECKSUM_KEYS = ""; // The
KEYS f
var CHECKSUM_ASC = ""; // The ASC file as
download URL
var CHECKSUM_MD5 = ""; // The MD5 file as
download URL
var CHECKSUM_SHA256 = ""; // The SHA256 file as
download URL
+var SOURCEFORGE = false; // The download
URL points to Soureforge
+var DL_OTHER = false; // The download URL
points to 'other.html'
+var ARCHIVE = false; // The download URL
points to the ASF archive
var ERROR = false; // The download URL is
correct (false) or not (true)?
/*
- * Initialize the download script and set all global variables with data
- */
-function initializeDL() {
- getLanguage();
- getPlatform();
- getFilesize();
- getLink();
-}
-
-/*
* Get array and ISO code for language
* Depends on $NL_LANGUAGE
*/
@@ -149,18 +142,20 @@ function getLink() {
// If platform is too old (e.g., Mac OS X 10.6 or older), then
do not provide a download link.
// But instead link to an AOO file in the archive.
if ( OLD_PLATFORM ) {
- LINK = "http://archive.apache.org/dist/openoffice/";;
- ERROR = true;
+ LINK = "http://archive.apache.org/dist/openoffice/";;
+ ARCHIVE = true;
+ ERROR = true;
return LINK;
}
if ( URL_PLATFORM == "" ) {
// If no platform was recognized, set the "other.html"
webpage as alternative download URL
- if ( UI_PLATFORM == "" ) {
- UI_PLATFORM = "an unknown platform/OS";
- }
- LINK = "http://www.openoffice.org/download/other.html";;
- ERROR = true;
+ if ( UI_PLATFORM == "" )
+ UI_PLATFORM = "unknown platform/OS";
+
+ LINK =
"http://www.openoffice.org/download/other.html";;
+ OTHER = true;
+ ERROR = true;
return LINK;
} else {
// If platform was recognized, get the download
filename and checksum filename
@@ -183,6 +178,7 @@ function getLink() {
CHECKSUM_ASC = chk_link + ".asc";
CHECKSUM_MD5 = chk_link + ".md5";
CHECKSUM_SHA256 = chk_link + ".sha256";
+ SOURCEFORGE = true;
}
return LINK;
@@ -192,6 +188,7 @@ function getLink() {
LINK = LINK + "/Apache_OpenOffice_" + "_" +
NL_LANGUAGE + EXTENSION;
chk_link = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE
+ "/Apache_OpenOffice_" + VERSION;
chk_link = chk_link + "_" + URL_PLATFORM + "_" +
NL_LANGUAGE + EXTENSION;
+ SOURCEFORGE = true;
return LINK;
*/
} else {
@@ -207,9 +204,9 @@ function getLink() {
function getPlatform() {
// For more help or data see: "http://www.useragentstring.com";
- var os = navigator.platform.toLowerCase();
- var ua = navigator.userAgent.toLowerCase();
- var av = navigator.appVersion.toLowerCase();
+ var os = navigator.platform.toLowerCase();
+ var ua = navigator.userAgent.toLowerCase();
+ var av = navigator.appVersion.toLowerCase();
// Add ECMA262-5 Array methods if not supported natively
// To workaround that MSIE 8 and older do not support this function
@@ -232,9 +229,6 @@ function getPlatform() {
if ( os ) {
// Recognized but not supported platforms / OS, set $UI_PLATFORM to
show it to the user
- if ( os.indexOf( "sunos" ) != -1 ) { UI_PLATFORM
= "Solaris x86 (PKG)";
- if ( ua.indexOf( "sun4u" ) != -1 ) UI_PLATFORM
= "Solaris SPARC (PKG)";
- }
if ( os.indexOf( "os/2" ) != -1 ) UI_PLATFORM
= "OS/2";
if ( os.indexOf( "freebsd" ) != -1 ) UI_PLATFORM
= "FreeBSD (PKG)";
if ( os.indexOf( "openbsd" ) != -1 ) UI_PLATFORM
= "OpenBSD";
@@ -248,12 +242,16 @@ function getPlatform() {
if ( os.indexOf( "vms" ) != -1 ) UI_PLATFORM
= "OpenVMS";
if ( os.indexOf( "alphaserver" ) != -1 ) UI_PLATFORM
= "AlphaServer";
if ( os.indexOf( "qnx" ) != -1 ) UI_PLATFORM
= "QNX";
- if ( os.indexOf( "x11" ) != -1 ) UI_PLATFORM
= "an unknown OS (X11 support)";
-
+ if ( os.indexOf( "x11" ) != -1 ) UI_PLATFORM
= "unknown OS (X11 support)";
if ( os.indexOf( "arm" ) != -1 ) UI_PLATFORM
= "ARM mobile devices";
-
+ if ( os.indexOf( "sunos" ) != -1 ) UI_PLATFORM
= "Solaris x86 (PKG)";
+ if ( ua.indexOf( "sun4u" ) != -1 ) { UI_PLATFORM
= "Solaris SPARC (PKG)";
+ OLD_PLATFORM
= true;
+ }
if ( ua.indexOf( "ppc" ) != -1 ||
- ua.indexOf( "power_pc" ) != -1 ) UI_PLATFORM
= "Mac OS PPC (DMG)";
+ ua.indexOf( "power_pc" ) != -1 ) { UI_PLATFORM
= "Mac OS PPC (DMG)";
+ OLD_PLATFORM
= true;
+ }
if ( ua.indexOf( "iphone" ) != -1 ||
ua.indexOf( "ipad" ) != -1 ||
ua.indexOf( "ipod" ) != -1 ) UI_PLATFORM
= "Apple iPhone/iPad/iPod";
@@ -272,16 +270,14 @@ function getPlatform() {
if ( ua.indexOf( "widerweb" ) != -1 ) UI_PLATFORM
= "mobile phones (WiderWeb)";
if ( ua.indexOf( "brew" ) != -1 ) UI_PLATFORM
= "smartphones (BREW)";
if ( ua.indexOf( "hiptop" ) != -1 ) UI_PLATFORM
= "smartphones (Hiptop)";
-
if ( ua.indexOf( "playstation" ) != -1 ) UI_PLATFORM
= "Sony Playstation";
if ( ua.indexOf( "psp" ) != -1 ) UI_PLATFORM
= "Sony Playstation Portable";
if ( ua.indexOf( "nintendo" ) != -1 ) UI_PLATFORM
= "Nintendo game console";
if ( ua.indexOf( "wii" ) != -1 ) UI_PLATFORM
= "Nintendo Wii game console";
// If the $UI_PLATFORM variable is already filled, then something was
recognized and no more work is need
- if ( UI_PLATFORM ) {
+ if ( UI_PLATFORM != "" )
return;
- }
// Windows, x86 or mobile?
if ( os.indexOf( "windows" ) != -1 ||
@@ -344,9 +340,9 @@ function getPlatform() {
}
// If nothing was recognized until now, set $UI_PLATFORM to show it to
the user
- if ( ! UI_PLATFORM ) {
- ERROR = true;
- UI_PLATFORM = "an unknown platform/OS";
+ if ( UI_PLATFORM == "" ) {
+ UI_PLATFORM = "unknown platform/OS";
+ ERROR = true;
}
return;
}
@@ -383,13 +379,13 @@ function getFilesize() {
// 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 ) {
// Assign all values from the release matrix of language and
platform
- RELEASE_MATRIX_PLATFORM = release_matrix[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ];
+ RELEASE_MATRIX_PLATFORM = release_matrix[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ];
// Assign the file size (column 2) from the release matrix of
language and platform
- FILESIZE = release_matrix[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ][ 2 ];
+ FILESIZE = release_matrix[ LANG_ISO ][
RELEASE_MATRIX_PLATFORM_POS ][ 2 ];
} else {
- ERROR = true;
- FILESIZE = 0;
+ ERROR = true;
+ FILESIZE = 0;
}
return FILESIZE;
