This is an automated email from the ASF dual-hosted git repository.
marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/main by this push:
new 417d03f Moved the platform hint text from the side into a separate
button for better visibility
417d03f is described below
commit 417d03ff5d04219039d40c6f10edd3ebdcdee918
Author: Marcus <[email protected]>
AuthorDate: Sun Jan 10 19:36:28 2021 +0100
Moved the platform hint text from the side into a separate button for
better visibility
---
assets/download/boxed_download.js | 27 +++++++++++++++++++--------
assets/download/exceptions.css | 8 +++++++-
assets/download/msg_prop_l10n_en.js | 4 ++--
3 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/assets/download/boxed_download.js
b/assets/download/boxed_download.js
index 129a18a..bf35ba6 100644
--- a/assets/download/boxed_download.js
+++ b/assets/download/boxed_download.js
@@ -36,13 +36,13 @@ DL.createDownloadBox = function() {
+ "<select class='sel-version' id='version' name='version'
onchange='DL.getLinkSelection()'"
+ "title='" + l10n.dl_green_box_selectbox_ver_title + "'>"
+ "</select>"
-
- // Platform info text.
- + "<a id='platform_info'>"
- + ""
- + "</a>"
-
- + "</form>"
+/*
+ // Platform info text.
+ + "<a id='platform_info'>"
+ + ""
+ + "</a>"
+*/
+ + "</form>"
// Both download text buttons: First (left) for "full install", then
(right) for "langpack".
+ "<div style='margin: 0px 0px -15px 3%;'>"
@@ -60,7 +60,18 @@ DL.createDownloadBox = function() {
+ "</h3>"
+ "</div>"
+ "</div>"
- + "<br /><br />"
+
+ + "<br /><br />"
+
+ // Button for platform hint text.
+ + "<div style='margin: 0px 0px 0px 3%;'>"
+ + "<div class='btn_hint_text' style='display: inline-block;'>"
+ + "<h3>"
+ + "<a id='platform_info' target='_blank'></a>"
+ + "</h3>"
+ + "</div>"
+ + "</div>"
+
+ "</div>"
// Sub-box
diff --git a/assets/download/exceptions.css b/assets/download/exceptions.css
index 14e48a6..2e00af0 100644
--- a/assets/download/exceptions.css
+++ b/assets/download/exceptions.css
@@ -38,7 +38,7 @@ h1 { padding-left: 0.5em; }
.optionset p { margin: 0; padding: .1em 0 .25em 0; color: #333; }
.optionset p a { margin: 0; padding: 0; color: #333; }
#bodycol .optionset p a:hover, #bodycol.optionset .button:hover p a { color:
#000; }
-.optionset .button { border-radius: 10px; margin-top: 8px; }
+.optionset .button { border-radius: 10px; margin-top: 8px; padding: 0px 0px
15px 0px; }
.optionset .button h2 { margin-left: 3%; padding: 2% 0 0 0; border: none;
font-weight: bold; text-decoration: none; }
.optionset .button h2 a { display: block; margin-left: 3%; padding: 2% 0 0 0;
font-weight: bold; text-decoration: none; }
.optionset .button h3 { margin: 0; padding: 0; border: none; font-style:
normal; cursor: pointer; }
@@ -88,6 +88,12 @@ h1 { padding-left: 0.5em; }
.green-sel .sel-version { background: transparent; border: 2px solid #718D36;
width: 135px; height: 30px; padding: 2px; }
.green-sel .btn_dl h3 a { background: #E9FEBE; display: inline-block; margin:
0px 0px 0px 0px; padding: 5px 5px 5px 5px; border: 2px solid #546828;
border-radius: 5px; color: #546828; text-decoration: none; font-style: normal; }
.green-sel .btn_dl h3 a:hover { background: #546828; display: inline-block;
margin: 0px 0px 0px 0px; padding: 5px 5px 5px 5px; border: 2px solid #E9FEBE;
border-radius: 5px; color: #E9FEBE; text-decoration: none; font-style: normal; }
+/*
+.green-sel .btn_hint_text h3 a { background: #E9FEBE; display: inline-block;
margin: 0px 0px 0px 0px; padding: 5px 5px 5px 5px; border: 2px solid #546828;
border-radius: 5px; color: #546828; text-decoration: none; font-style: normal; }
+.green-sel .btn_hint_text h3 a:hover { background: #546828; display:
inline-block; margin: 0px 0px 0px 0px; padding: 5px 5px 5px 5px; border: 2px
solid #E9FEBE; border-radius: 5px; color: #E9FEBE; text-decoration: none;
font-style: normal; }
+*/
+.green-sel .btn_hint_text h3 a { background: #E9FEBE; display: inline-block;
margin: 0px 0px 0px 0px; padding: 5px 5px 5px 5px; border: 2px solid #D36812;
border-radius: 5px; color: #D36812; text-decoration: none; font-style: normal; }
+.green-sel .btn_hint_text h3 a:hover { background: #546828; display:
inline-block; margin: 0px 0px 0px 0px; padding: 5px 5px 5px 5px; border: 2px
solid #FFE2B5; border-radius: 5px; color: #FFE2B5; text-decoration: none;
font-style: normal; }
.sub-green-sel { background: #E9FEBE; border: 1px solid #C3E480;
border-radius: 10px; font-size: .8em; padding: 5px 5px 5px 0px; }
.sub-green-sel p { padding: .1em 3%; width: 100%; }
.sub-green-sel_error { background: #FECBCB; border: 1px solid #C00000;
border-radius: 10px; font-size: .8em; padding: 5px 5px 5px 0px; }
diff --git a/assets/download/msg_prop_l10n_en.js
b/assets/download/msg_prop_l10n_en.js
index 3880d85..1b4add5 100644
--- a/assets/download/msg_prop_l10n_en.js
+++ b/assets/download/msg_prop_l10n_en.js
@@ -228,9 +228,9 @@ 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_win_info_text = "32-bit, 64-bit and Java -
What to choose?";
+l10n.dl_win_info_text = "Important hint: 32-bit,
64-bit and Java - What to choose?";
l10n.dl_win_info_title = "At the moment we offer a
32-bit (x86) version for Windows. However, it installs and runs also on Windows
64-bit (x86-64).\nPlease note that you may need Java in 32-bit for additional
functionality which must then be selected only once (see menu 'Tools - Options
- OpenOffice - Java').\n\nFor more information about OpenOffice and Java please
see the link on the right 'Java and Apache OpenOffice'.";
-l10n.dl_linux_info_text = "RPM vs. DEB = What
to choose?";
+l10n.dl_linux_info_text = "Important hint: 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";
