This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 582b7cb git-site-role commit from build_staging.sh
582b7cb is described below
commit 582b7cb1f6a77418810c64fce27ae5702c27dbcd
Author: jenkins <[email protected]>
AuthorDate: Sun Jan 3 18:57:09 2021 +0000
git-site-role commit from build_staging.sh
---
content/download/boxed_download.js | 6 ++---
content/download/download.js | 43 ++++++++++++++++++++++++++----------
content/download/msg_prop_l10n_en.js | 9 +++++---
content/feed.xml | 4 ++--
4 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/content/download/boxed_download.js
b/content/download/boxed_download.js
index 2153b1c..bade2d3 100644
--- a/content/download/boxed_download.js
+++ b/content/download/boxed_download.js
@@ -37,9 +37,9 @@ DL.createDownloadBox = function() {
+ "title='" + l10n.dl_green_box_selectbox_ver_title + "'>"
+ "</select>"
- // Linux packages text.
- + "<a id='dl_rpm_vs_deb' title='" + l10n.dl_rpm_vs_deb_title + "'>"
- + l10n.dl_rpm_vs_deb_text
+ // Platform info text.
+ + "<a id='dl_rpm_vs_deb'>"
+ + ""
+ "</a>"
+ "</form>"
diff --git a/content/download/download.js b/content/download/download.js
index 53bb19d..664bb48 100644
--- a/content/download/download.js
+++ b/content/download/download.js
@@ -593,10 +593,10 @@ DL.showErrorMessage = function( error_text ) {
document.getElementById( "sub_box" ).style.display = "block";
// 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 = "";
-
+ document.getElementById( "platform_info" ).style.cursor = "default";
+ document.getElementById( "platform_info" ).title = "";
+ document.getElementById( "platform_info" ).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 = "";
@@ -790,6 +790,11 @@ DL.checkForLinkExceptions = function() {
DL.SHOW_SUB_BOX = false;
}
+ // Show no platform info text.
+ document.getElementById( "platform_info" ).style.cursor =
"default";
+ document.getElementById( "platform_info" ).title = "";
+ document.getElementById( "platform_info" ).text = "";
+
return;
}
@@ -848,15 +853,29 @@ DL.getLinkSelection = function() {
DL.SHOW_SUB_BOX = true;
DL.ERROR = false;
- // If a Linux file is selected, then set the values for the RPM
vs. DEB text link. Otherwise no text.
- if( DL.INSTALL_EXTENSION === "RPM" || DL.INSTALL_EXTENSION ===
"DEB" ) {
- document.getElementById( "dl_rpm_vs_deb" ).style.cursor
= "help";
- document.getElementById( "dl_rpm_vs_deb" ).title
= l10n.dl_rpm_vs_deb_title;
- document.getElementById( "dl_rpm_vs_deb" ).text
= l10n.dl_rpm_vs_deb_text;
+ // If a Windows file is selected and a respective text is
existing, then set the values for the Windows info link.
+ if( DL.INSTALL_EXTENSION === "EXE" & l10n.dl_win_info_title !=
null ) {
+ document.getElementById( "platform_info" ).style.cursor
= "help";
+ document.getElementById( "platform_info" ).title
= l10n.dl_win_info_title;
+ document.getElementById( "platform_info" ).text
= l10n.dl_win_info_text;
+
+ // If a Mac file is selected and a respective text is existing,
then set the values for the Mac info link.
+ } else if( DL.INSTALL_EXTENSION === "DMG" &
l10n.dl_mac_info_title != null ) {
+ document.getElementById( "platform_info" ).style.cursor
= "help";
+ document.getElementById( "platform_info" ).title
= l10n.dl_mac_info_title;
+ document.getElementById( "platform_info" ).text
= l10n.dl_mac_info_text;
+
+ // If a Linux file is selected and a respective text is
existing, then set the values for the Linux info link.
+ } else if( DL.INSTALL_EXTENSION === "RPM" ||
DL.INSTALL_EXTENSION === "DEB" & l10n.dl_linux_info_title != null ) {
+ document.getElementById( "platform_info" ).style.cursor
= "help";
+ document.getElementById( "platform_info" ).title
= l10n.dl_linux_info_title;
+ document.getElementById( "platform_info" ).text
= l10n.dl_linux_info_text;
+
+ // Otherwise no text.
} else {
- document.getElementById( "dl_rpm_vs_deb" ).style.cursor
= "default";
- document.getElementById( "dl_rpm_vs_deb" ).title
= "";
- document.getElementById( "dl_rpm_vs_deb" ).text
= "";
+ document.getElementById( "platform_info" ).style.cursor
= "default";
+ document.getElementById( "platform_info" ).title
= "";
+ document.getElementById( "platform_info" ).text
= "";
}
// Set the values for both download text buttons and set the
focus to the "full install".
diff --git a/content/download/msg_prop_l10n_en.js
b/content/download/msg_prop_l10n_en.js
index 7fd6324..2664660 100644
--- a/content/download/msg_prop_l10n_en.js
+++ b/content/download/msg_prop_l10n_en.js
@@ -228,9 +228,12 @@ l10n.dl_full_link_text =
"Download full installation";
l10n.dl_full_link_title = "Click to download: ";
l10n.dl_langpack_link_text = "Download language pack";
l10n.dl_langpack_link_title = "Click to download: ";
-l10n.dl_rpm_vs_deb_title = "RPM is used in:\nCentOS,
Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux, PCLinuxOS, Red Hat
Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux Enterprise
Server\n\nDEB is used in:\nDebian, Kanotix, Knoppix, Kubuntu, Linux Mint,
Lubuntu, Ubuntu, Xubuntu";
-l10n.dl_rpm_vs_deb_text = "RPM vs. DEB = What
to choose?";
-
+l10n.dl_win_info_text = "Windows : Title";
+l10n.dl_win_info_title = "Windows : Text";
+l10n.dl_linux_info_text = "RPM vs. DEB = What
to choose?";
+l10n.dl_linux_info_title = "RPM is used in:\nCentOS,
Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux, PCLinuxOS, Red Hat
Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux Enterprise
Server\n\nDEB is used in:\nDebian, Kanotix, Knoppix, Kubuntu, Linux Mint,
Lubuntu, Ubuntu, Xubuntu";
+l10n.dl_mac_info_text = "macOS : Title";
+l10n.dl_mac_info_title = "macOS : Text";
l10n.dl_full_link_porting_text = "Porting: Click to choose
from 3rd party vendors";
l10n.dl_full_link_porting_title = "Click to browse to
the porting webpage and download from 3rd party vendors";
diff --git a/content/feed.xml b/content/feed.xml
index f8eba22..90aa617 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -6,8 +6,8 @@
<atom:link href="http://localhost:8820/feed.xml"; rel="self"
type="application/rss+xml" />
<description>OpenOffice.org Feed</description>
<language>en-us</language>
- <pubDate>Fri, 1 Jan 2021 20:51:02 +0000</pubDate>
- <lastBuildDate>Fri, 1 Jan 2021 20:51:02 +0000</lastBuildDate>
+ <pubDate>Sun, 3 Jan 2021 18:55:53 +0000</pubDate>
+ <lastBuildDate>Sun, 3 Jan 2021 18:55:53 +0000</lastBuildDate>
</channel>
