Author: buildbot
Date: Mon Jul 29 18:33:50 2013
New Revision: 871753
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 Mon Jul 29 18:33:50 2013
@@ -1 +1 @@
-1508114
+1508167
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jul 29 18:33:50 2013
@@ -1 +1 @@
-1508114
+1508167
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 Jul
29 18:33:50 2013
@@ -56,40 +56,44 @@
// OS and/or package manager was not recognized, therefore 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 + "'>Apache
OpenOffice " + VERSION
- + " is not available for:<br />" + UI_PLATFORM + "</a></h2>"
- + "<p><a href='" + LINK + "' title='" + LINK + "'>Please choose another
platform from the alternative download "
- + "webpage.</a></p>");
+ document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+ + "Download Apache OpenOffice</a></h2>"
+ + "<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 {
// Download from an alternative webpage if hasMirrorLink() == false.
document.write( "<div class=\"first button green\" id=\"optionitem1\"
onclick=\"openItem('optionitem1','"
+ LANG_ARRAY[ 3 ] + "');" + "return false;\">" );
document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" +
LANG_ARRAY[ 4 ] + "'>"
- + "Download Apache OpenOffice " + VERSION + "</a></h2>"
- + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>A
release for "
- + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not
available. Please choose another language from the "
- + "alternative download webpage.</a></p>" );
+ + "Download Apache OpenOffice</a></h2>"
+ + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] +
"'>Apache OpenOffice " + VERSION + " for "
+ + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not
available. Please choose another build from the "
+ + "alternative " + LANG_ARRAY[ 1 ] + " download webpage.</a></p>" );
}
document.write( "</div>" );
// Show some helpful links for SDK, source, checksums, release notes, legacy
version.
document.write( "<div class=\"sub-green\">"
- + "<p><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 all source code tarballs and SDK
to download'>"
- + "<b>Source Code tarballs and SDK</b></a> | <br />");
- if ( CHECKSUM_ASC ) {
- document.write( "Signatures and Hashes: "
- + "<a href='" + CHECKSUM_KEYS + "' + title='KEYS signature'>KEYS</a> ,
"
- + "<a href='" + CHECKSUM_ASC + "' + title='ASC signature'>ASC</a> , "
- + "<a href='" + CHECKSUM_MD5 + "' + title='MD5 hash'>MD5</a> , "
- + "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256 hash'>SHA256</a> |
");
- }
- document.write( "<a
href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes'"
- + "title='What is new, what has been improved in Apache OpenOffice " +
VERSION + "?'>Release Notes</a> | "
- + "<a href='legacy/index.html' title='Get the legacy version
OpenOffice.org 3.3.0'>Legacy Version</a></p>"
- + "</div>" );
+ + "<p><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 all source code tarballs and SDK
to download'>"
+ + "<b>Source Code tarballs and SDK</b></a> | <br />"
+ + "<a href='../../porting/index.html'"
+ + "title='Get Apache OpenOffice software packaged as portable USB versions
and third-party ports'>"
+ + "<b>Portable USB versions</b> and third-party ports</a> | "
+ + "<a
href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes'"
+ + "title='What is new, what has been improved in Apache OpenOffice " +
VERSION + "?'>Release Notes</a> | "
+ + "<a href='legacy/index.html' title='Get the legacy version OpenOffice.org
3.3.0'>Legacy Version</a>" );
+ if ( CHECKSUM_ASC ) {
+ document.write( " | <br />Signatures and Hashes: "
+ + "<a href='" + CHECKSUM_KEYS + "' + title='KEYS signature'>KEYS</a> , "
+ + "<a href='" + CHECKSUM_ASC + "' + title='ASC signature'>ASC</a> , "
+ + "<a href='" + CHECKSUM_MD5 + "' + title='MD5 hash'>MD5</a> , "
+ + "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256
hash'>SHA256</a></p>");
+ }
+ document.write( "</p></div>" );
//-->
</script>
@@ -105,6 +109,7 @@
document.write( "<tr><td>navigator.appVersion
</td><td>" + navigator.appVersion + "</td></tr>" );
document.write( "<tr><td>navigator.platform
</td><td>" + navigator.platform + "</td></tr>" );
document.write( "<tr><td>navigator.oscpu
</td><td>" + navigator.oscpu + "</td></tr>" );
+ document.write( "<tr><td>navigator.cpuClass
</td><td>" + navigator.cpuClass + "</td></tr>" );
document.write( "<tr><td>navigator.product
</td><td>" + navigator.product + "</td></tr>" );
document.write( "<tr><td>navigator.productSub
</td><td>" + navigator.productSub + "</td></tr>" );
document.write( "<tr><td>navigator.vendor
</td><td>" + navigator.vendor + "</td></tr>" );
