This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 73b9f09 git-site-role commit from copy_staging.sh
73b9f09 is described below
commit 73b9f092ca0a469051dfee1fac0b696e073ca261
Author: jenkins <bui...@apache.org>
AuthorDate: Sun Jan 24 14:45:13 2021 +0000
git-site-role commit from copy_staging.sh
---
content/download/boxed_download.js | 27 +++++++++----
content/download/exceptions.css | 8 +++-
content/download/msg_prop_l10n_en.js | 4 +-
content/feed.xml | 4 +-
content/nl/social/index.html | 73 +++++++++++-------------------------
5 files changed, 52 insertions(+), 64 deletions(-)
diff --git a/content/download/boxed_download.js
b/content/download/boxed_download.js
index 129a18a..bf35ba6 100644
--- a/content/download/boxed_download.js
+++ b/content/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/content/download/exceptions.css b/content/download/exceptions.css
index 14e48a6..2e00af0 100644
--- a/content/download/exceptions.css
+++ b/content/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/content/download/msg_prop_l10n_en.js
b/content/download/msg_prop_l10n_en.js
index 3880d85..1b4add5 100644
--- a/content/download/msg_prop_l10n_en.js
+++ b/content/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";
diff --git a/content/feed.xml b/content/feed.xml
index cdba921..7cb35b2 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>Thu, 7 Jan 2021 20:01:05 +0000</pubDate>
- <lastBuildDate>Thu, 7 Jan 2021 20:01:05 +0000</lastBuildDate>
+ <pubDate>Sun, 24 Jan 2021 14:32:35 +0000</pubDate>
+ <lastBuildDate>Sun, 24 Jan 2021 14:32:35 +0000</lastBuildDate>
</channel>
diff --git a/content/nl/social/index.html b/content/nl/social/index.html
index a334a46..55104fc 100644
--- a/content/nl/social/index.html
+++ b/content/nl/social/index.html
@@ -6,18 +6,20 @@
<link href="/css/ooo.css" rel="stylesheet" type="text/css">
<title>Apache OpenOffice Nieuws</title>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><!--
Supports the Google+ badge -->
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<!-- Supports the Google+ badges -->
+<script src="https://apis.google.com/js/platform.js"; async defer></script>
+<!-- Supports the Twitter widget -->
+<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
-<script type="text/javascript">
-window.___gcfg = {lang: 'en'};
-(function()
-{var po = document.createElement("script");
-po.type = "text/javascript"; po.async = true;po.src =
"https://apis.google.com/js/plusone.js";;
-var s = document.getElementsByTagName("script")[0];
-s.parentNode.insertBefore(po, s);
-})();</script>
-
+<style type="text/css">
+ /* <![CDATA[ */
+ /*-------------------- Exceptions on standard css -----------------------*/
+ @import "/styles.css";
+ @import "/exceptions.css";
+ /* ]]> */
+</style>
@@ -44,62 +46,31 @@ De announce-mailinglijst is het officiële kanaal voor
aankondigingen van het Op
Stuur een e-mail naar <a
href="mailto:announce-subscr...@openoffice.apache.org";>announce-subscr...@openoffice.apache.org</a>
om uzelf te registreren op de announce-lijst en beantwoord het
bevestigingsbericht dat u ontvangt.
</p>
<p>
-We hebben ook een <a href="http://blogs.apache.org/OOo/";>officiëel
project-blog</a>, met meer achtergrondinformatie over Apache OpenOffice,
previews van nieuwe mogelijkheden en interviews met deelnemers aan het project.
+We hebben ook een <a href="https://blogs.apache.org/OOo/";>officiëel
project-blog</a>, met meer achtergrondinformatie over Apache OpenOffice,
previews van nieuwe mogelijkheden en interviews met deelnemers aan het project.
</p>
<h1>Social Media</h1>
<p>
Het Apache OpenOffice-project publiceert af en toe nieuwsupdates en
aankondigingen via diverse populaire social media. We nodigen u uit om ons te
volgen via één van deze sociale netwerken en om onze berichten te delen met
vrienden in uw netwerk.
</p>
<p>
-Aanbevolen hashtags voor Twitter en Identi.ca zijn: #aoo #apacheoo
+Aanbevolen hashtag voor Twitter is: #apacheoo
</p>
-
-<table width="500" border="0">
+<table border="0">
<tr>
<td>
-<script charset="utf-8" src="http://widgets.twimg.com/j/2/widget.js";></script>
-<script>
-new TWTR.Widget({
- version: 2,
- type: 'profile',
- rpp: 4,
- interval: 30000,
- width: 250,
- height: 300,
- theme: {
- shell: {
- background: '#333333',
- color: '#ffffff'
- },
- tweets: {
- background: '#000000',
- color: '#ffffff',
- links: '#4aed05'
- }
- },
- features: {
- scrollbar: false,
- loop: false,
- live: true,
- behavior: 'all'
- }
-}).render().setUser('ApacheOO').start();
-</script>
+<!-- Twitter widget -->
+<a class="twitter-timeline" data-width="250" data-height="500"
data-theme="light" href="https://twitter.com/ApacheOO";>Tweets by ApacheOO</a>
</td>
<td style="vertical-align:middle">
-<g:plus href="https://plus.google.com/114598373874764163668"; rel="publisher"
width="300" height="131" theme="light"></g:plus>
-</td>
-<td style="vertical-align:middle"><!-- Facebook Badge START -->
-<a href="http://www.facebook.com/ApacheOO"; target="_TOP" style="font-family:
"lucida grande",tahoma,verdana,arial,sans-serif; font-size: 11px;
font-variant: normal; font-style: normal; font-weight: normal; color: #3B5998;
text-decoration: none;" title="Apache OpenOffice">Apache OpenOffice</a><br/><a
href="http://www.facebook.com/ApacheOO"; target="_TOP" title="Apache
OpenOffice"><img
src="http://badge.facebook.com/badge/185963401462545.2228.1991554692.png";
style="border: 0px;" / [...]
-
+<!-- Facebook Badge START --><a href="https://www.facebook.com/ApacheOO";
target="_TOP" style="font-family: "lucida
grande",tahoma,verdana,arial,sans-serif; font-size: 11px; font-variant:
normal; font-style: normal; font-weight: normal; color: #3B5998;
text-decoration: none;" title="Apache OpenOffice">Apache OpenOffice</a><br/><a
href="https://www.facebook.com/ApacheOO"; target="_TOP" title="Apache
OpenOffice"><img
src="https://badge.facebook.com/badge/185963401462545.2228.199155 [...]
</td>
</tr>
<tr>
-<td><a href="http://identi.ca/apacheoo";>Identi.ca</a></td>
-<td><a href="http://www.facebook.com/groups/338330086179568/";>Facebook
Groep</a></td>
-<td><a href="https://www.xing.com/net/aoo";>Xing</a></td>
-</tr></table>
+<td><a href="https://www.facebook.com/groups/338330086179568/";>Facebook
Group</a></td>
+<td><a href="https://www.xing.com/net/aoo";>XING</a></td>
+</tr>
+</table>
![http://badge.facebook.com/badge/185963401462545.2228.1991554692.png"](http://badge.facebook.com/badge/185963401462545.2228.1991554692.png"){kind=link}