Author: buildbot
Date: Sun Nov 18 11:33:18 2018
New Revision: 1037021
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/download.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Nov 18 11:33:18 2018
@@ -1 +1 @@
-1846831
+1846832
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Nov 18 11:33:18 2018
@@ -1 +1 @@
-1846831
+1846832
Modified: websites/staging/ooo-site/trunk/content/download/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/download.js Sun Nov 18
11:33:18 2018
@@ -591,7 +591,12 @@ DL.showErrorMessage = function( error_te
document.getElementById( "sub_box" ).className =
"sub-green-sel_error";
document.getElementById( "sub_box" ).style.display = "block";
- // Delete previously set string to get the possibility back to choose a
different platform
+ // Delete previously set strings to avoid to show them.
+ document.getElementById( "dl_rpm_vs_deb" ).style.cursor = "default";
+ document.getElementById( "dl_rpm_vs_deb" ).title = "";
+ document.getElementById( "dl_rpm_vs_deb" ).text = "";
+
+ // Delete previously set strings to get the possibility back to choose
a different platform
// and then to assemble a new download link.
DL.UI_PLATFORM_NO_SUP = "";
DL.SHOW_SUB_BOX = true;
@@ -690,7 +695,7 @@ DL.checkForLinkExceptions = function() {
}
// If version is '4.1.0' (or newer) and platform is 'Mac OS X <= 10.6',
show the none-availability to the user.
- if( ( DL.VERSION_SEL === "4.1.5" || DL.VERSION_SEL === "4.1.4" ||
DL.VERSION_SEL === "4.1.3" || DL.VERSION_SEL === "4.1.2" || DL.VERSION_SEL ===
"4.1.1" || DL.VERSION_SEL === "4.1.0" ) && DL.PLATFORM === "mac32" ) {
+ if( ( DL.VERSION_SEL === "4.1.6" || DL.VERSION_SEL === "4.1.5" ||
DL.VERSION_SEL === "4.1.4" || DL.VERSION_SEL === "4.1.3" || DL.VERSION_SEL ===
"4.1.2" || DL.VERSION_SEL === "4.1.1" || DL.VERSION_SEL === "4.1.0" ) &&
DL.PLATFORM === "mac32" ) {
// Show an error message that the chosen items do not lead to a
download.
// If a customized string is not available in the
"msg_prop_l10n_XX.js" file.
@@ -823,13 +828,11 @@ DL.getLinkSelection = function() {
DL.LINK_CHK_KEYS = DL.ASF_DIST + "KEYS";
DL.LINK_CHK_ASC_FULL = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_FULL + ".asc";
DL.LINK_CHK_SHA256_FULL = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_FULL + ".sha256";
-// DL.LINK_CHK_SHA512_FULL = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_FULL + ".sha512";
-// DL.LINK_CHK_MD5_FULL = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_FULL + ".md5";
+ DL.LINK_CHK_SHA512_FULL = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_FULL + ".sha512";
DL.LINK_CHK_ASC_LP = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_LP + ".asc";
DL.LINK_CHK_SHA256_LP = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_LP + ".sha256";
-// DL.LINK_CHK_SHA512_LP = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_LP + ".sha512";
-// DL.LINK_CHK_MD5_LP = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_LP + ".md5";
+ DL.LINK_CHK_SHA512_LP = DL.ASF_ARC_BASE_URL + "/binaries/" +
DL.LANG_SEL + "/" + DL.FILENAME_LP + ".sha512";
// Indicate that a download will successfull.
DL.SHOW_SUB_BOX = true;
@@ -879,14 +882,10 @@ DL.getLinkSelection = function() {
document.getElementById( "dl_f_chk_sha256" ).href =
DL.LINK_CHK_SHA256_FULL;
document.getElementById( "dl_f_chk_sha256" ).innerHTML =
l10n.dl_checksum_sha256_text;
document.getElementById( "dl_f_chk_sha256" ).title =
l10n.dl_checksum_sha256_title + DL.FILENAME_FULL;
-// document.getElementById( "space3" ).innerHTML = " , ";
-// document.getElementById( "dl_f_chk_sha512" ).href =
DL.LINK_CHK_SHA512_FULL;
-// document.getElementById( "dl_f_chk_sha512" ).innerHTML =
l10n.dl_checksum_sha512_text;
-// document.getElementById( "dl_f_chk_sha512" ).title =
l10n.dl_checksum_sha512_title + DL.FILENAME_FULL;
-// document.getElementById( "space4" ).innerHTML = " , ";
-// document.getElementById( "dl_f_chk_md5" ).href =
DL.LINK_CHK_MD5_FULL;
-// document.getElementById( "dl_f_chk_md5" ).innerHTML =
l10n.dl_checksum_md5_text;
-// document.getElementById( "dl_f_chk_md5" ).title =
l10n.dl_checksum_md5_title + DL.FILENAME_FULL;
+ document.getElementById( "space3" ).innerHTML = " , ";
+ document.getElementById( "dl_f_chk_sha512" ).href =
DL.LINK_CHK_SHA512_FULL;
+ document.getElementById( "dl_f_chk_sha512" ).innerHTML =
l10n.dl_checksum_sha512_text;
+ document.getElementById( "dl_f_chk_sha512" ).title =
l10n.dl_checksum_sha512_title + DL.FILENAME_FULL;
// #3 Langpack: Data and links
document.getElementById( "dl_lp_info" ).innerHTML = "<b>"
+ l10n.dl_headline_langpack_text
@@ -904,14 +903,10 @@ DL.getLinkSelection = function() {
document.getElementById( "dl_lp_chk_sha256" ).href =
DL.LINK_CHK_SHA256_LP;
document.getElementById( "dl_lp_chk_sha256" ).innerHTML =
l10n.dl_checksum_sha256_text;
document.getElementById( "dl_lp_chk_sha256" ).title =
l10n.dl_checksum_sha256_title + DL.FILENAME_LP;
-// document.getElementById( "space7" ).innerHTML = " , ";
-// document.getElementById( "dl_lp_chk_sha512" ).href =
DL.LINK_CHK_SHA512_LP;
-// document.getElementById( "dl_lp_chk_sha512" ).innerHTML =
l10n.dl_checksum_sha512_text;
-// document.getElementById( "dl_lp_chk_sha512" ).title =
l10n.dl_checksum_sha512_title + DL.FILENAME_LP;
-// document.getElementById( "space8" ).innerHTML = " , ";
-// document.getElementById( "dl_lp_chk_md5" ).href =
DL.LINK_CHK_MD5_LP;
-// document.getElementById( "dl_lp_chk_md5" ).innerHTML =
l10n.dl_checksum_md5_text;
-// document.getElementById( "dl_lp_chk_md5" ).title =
l10n.dl_checksum_md5_title + DL.FILENAME_LP;
+ document.getElementById( "space7" ).innerHTML = " , ";
+ document.getElementById( "dl_lp_chk_sha512" ).href =
DL.LINK_CHK_SHA512_LP;
+ document.getElementById( "dl_lp_chk_sha512" ).innerHTML =
l10n.dl_checksum_sha512_text;
+ document.getElementById( "dl_lp_chk_sha512" ).title =
l10n.dl_checksum_sha512_title + DL.FILENAME_LP;
// #4 Links: Full vs. lp + verify checksums + report broken
link.
document.getElementById( "dl_hlp_img" ).src =
l10n.dl_help_img_src;
@@ -934,45 +929,37 @@ DL.getLinkSelection = function() {
document.getElementById( "dl_rpt" ).title =
l10n.dl_report_title;
// New Apache release policy since March 2018: Do not provide
any MD5 checksums anymore as it is understood as too insecure.
- if( ( DL.VERSION_SEL === "4.1.6" || DL.VERSION_SEL === "4.2.0"
) ) {
+ if( ( DL.VERSION_SEL === "4.1.6" ) ) {
// If version is '4.1.6' (or newer), do not show any
MD5 checksum file links.
- document.getElementById( "space3" ).innerHTML
= " , ";
- document.getElementById( "dl_f_chk_sha512" ).href
= DL.LINK_CHK_SHA512_FULL;
- document.getElementById( "dl_f_chk_sha512" ).innerHTML
= l10n.dl_checksum_sha512_text;
- document.getElementById( "dl_f_chk_sha512" ).title
= l10n.dl_checksum_sha512_title + DL.FILENAME_FULL;
document.getElementById( "space4" ).innerHTML
= "";
document.getElementById( "dl_f_chk_md5" ).href
= "";
document.getElementById( "dl_f_chk_md5" ).innerHTML
= "";
document.getElementById( "dl_f_chk_md5" ).title
= "";
- document.getElementById( "space7" ).innerHTML
= " , ";
- document.getElementById( "dl_lp_chk_sha512" ).href
= DL.LINK_CHK_SHA512_LP;
- document.getElementById( "dl_lp_chk_sha512" ).innerHTML
= l10n.dl_checksum_sha512_text;
- document.getElementById( "dl_lp_chk_sha512" ).title
= l10n.dl_checksum_sha512_title + DL.FILENAME_LP;
document.getElementById( "space8" ).innerHTML
= "";
document.getElementById( "dl_lp_chk_md5" ).href
= "";
document.getElementById( "dl_lp_chk_md5" ).innerHTML
= "";
document.getElementById( "dl_lp_chk_md5" ).title
= "";
} else {
// If version is '4.1.5' (or older), it's OK to show
the MD5 checksum file links.
- DL.LINK_CHK_SHA512_FULL = DL.ASF_ARC_BASE_URL +
"/binaries/" + DL.LANG_SEL + "/" + DL.FILENAME_FULL + ".sha512";
- DL.LINK_CHK_SHA512_LP = DL.ASF_ARC_BASE_URL +
"/binaries/" + DL.LANG_SEL + "/" + DL.FILENAME_LP + ".sha512";
- DL.LINK_CHK_MD5_FULL = DL.ASF_ARC_BASE_URL +
"/binaries/" + DL.LANG_SEL + "/" + DL.FILENAME_FULL + ".md5";
- DL.LINK_CHK_MD5_LP = DL.ASF_ARC_BASE_URL +
"/binaries/" + DL.LANG_SEL + "/" + DL.FILENAME_LP + ".md5";
+ DL.LINK_CHK_MD5_FULL = DL.ASF_ARC_BASE_URL +
"/binaries/" + DL.LANG_SEL + "/" + DL.FILENAME_FULL + ".md5";
+ DL.LINK_CHK_MD5_LP = DL.ASF_ARC_BASE_URL +
"/binaries/" + DL.LANG_SEL + "/" + DL.FILENAME_LP + ".md5";
document.getElementById( "space3" ).innerHTML
= "";
- document.getElementById( "dl_f_chk_sha512" ).href
= "";
- document.getElementById( "dl_f_chk_sha512" ).innerHTML
= "";
- document.getElementById( "dl_f_chk_sha512" ).title
= "";
- document.getElementById( "space4" ).innerHTML
= " , ";
- document.getElementById( "dl_f_chk_md5" ).href
= DL.LINK_CHK_MD5_FULL;
- document.getElementById( "dl_f_chk_md5" ).innerHTML
= l10n.dl_checksum_md5_text;
- document.getElementById( "dl_f_chk_md5" ).title
= l10n.dl_checksum_md5_title + DL.FILENAME_FULL;
+ document.getElementById( "dl_f_chk_sha256" ).href
= "";
+ document.getElementById( "dl_f_chk_sha256" ).innerHTML
= "";
+ document.getElementById( "dl_f_chk_sha256" ).title
= "";
document.getElementById( "space7" ).innerHTML
= "";
document.getElementById( "dl_lp_chk_sha512" ).href
= "";
document.getElementById( "dl_lp_chk_sha512" ).innerHTML
= "";
document.getElementById( "dl_lp_chk_sha512" ).title
= "";
+
+ document.getElementById( "space4" ).innerHTML
= " , ";
+ document.getElementById( "dl_f_chk_md5" ).href
= DL.LINK_CHK_MD5_FULL;
+ document.getElementById( "dl_f_chk_md5" ).innerHTML
= l10n.dl_checksum_md5_text;
+ document.getElementById( "dl_f_chk_md5" ).title
= l10n.dl_checksum_md5_title + DL.FILENAME_FULL;
+
document.getElementById( "space8" ).innerHTML
= " , ";
document.getElementById( "dl_lp_chk_md5" ).href
= DL.LINK_CHK_MD5_LP;
document.getElementById( "dl_lp_chk_md5" ).innerHTML
= l10n.dl_checksum_md5_text;
