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 f80a07d git-site-role commit from copy_staging.sh
f80a07d is described below
commit f80a07de538d51ace91fb0152e86bdc12bafa0df
Author: jenkins <[email protected]>
AuthorDate: Thu Jan 7 18:11:54 2021 +0000
git-site-role commit from copy_staging.sh
---
content/brand.html | 2 +-
content/download/boxed_download.js | 6 ++---
content/download/download.js | 43 ++++++++++++++++++++++++++----------
content/download/msg_prop_l10n_en.js | 9 +++++---
content/feed.xml | 4 ++--
content/product/windows.html | 10 ++++-----
content/projects/blog/index.html | 33 +++++++++++++++++++++++++++
content/stats/aoo-downloads.txt | 7 ++++++
8 files changed, 88 insertions(+), 26 deletions(-)
diff --git a/content/brand.html b/content/brand.html
index a7a3933..ab8f6f7 100644
--- a/content/brand.html
+++ b/content/brand.html
@@ -55,7 +55,7 @@
}
</script>
</div>
- <div id="bannerleft"><a title="Apache OpenOffice" href="/"><img
id="ooo-logo" alt="Apache OpenOffice"
src="/images/AOO_logos/christmas-logo.png"/></a></div>
+ <div id="bannerleft"><a title="Apache OpenOffice" href="/"><img
id="ooo-logo" alt="Apache OpenOffice"
src="/images/AOO_logos/AOO4_website_logo.png"/></a></div>
<div id="bannerright">
<div id="searchdiv">
<form id="cse-search-box-header" action="https://www.google.com/search";
method="get">
diff --git a/content/download/boxed_download.js
b/content/download/boxed_download.js
index 2153b1c..129a18a 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='platform_info'>"
+ + ""
+ "</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..3880d85 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 = "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_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..719f3db 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>Thu, 7 Jan 2021 18:05:27 +0000</pubDate>
+ <lastBuildDate>Thu, 7 Jan 2021 18:05:27 +0000</lastBuildDate>
</channel>
diff --git a/content/product/windows.html b/content/product/windows.html
index 467fac2..f252f3c 100644
--- a/content/product/windows.html
+++ b/content/product/windows.html
@@ -23,22 +23,22 @@
<div id="content"><h1 class="title">Apache OpenOffice for Windows</h1>
<h2><a href="#windows-version-support"
id="windows-version-support">Windows Version Support</a></h2>
-<p>The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows
7 and Windows 8.</p>
+<p>The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows
7, Windows 8 and Windows 10.</p>
<p>Specific platform version notes:</p>
<ul>
<li><strong>Windows 2000</strong>: OpenOffice may work on Windows 2000, but we
don’t test or recommend it.</li>
<li><strong>Windows XP</strong>: Tested, stable, no platform-specific problems
known.</li>
<li><strong>Windows Vista</strong>: Tested, stable, no platform-specific
problems known.</li>
<li><strong>Windows 7</strong>: Tested, stable.</li>
-<li><strong>Windows 8</strong>: We run as a “desktop application”,
not a Metro “App”. Requires x86 or 64-bit Windows. We do not
support Windows RT, the ARM-based version, intended for tablets.</li>
+<li><strong>Windows 8, 10</strong>: We run as a “desktop
application”, not a Metro “App”. Requires x86 or 64-bit
Windows. We do not support Windows RT, the ARM-based version, intended for
tablets.</li>
</ul>
-<p><strong>Please note</strong>: Apache OpenOffice is distributed as a 32-bit
application. It will run successfully in 32-bit mode on 64-bit versions of
Windows 7 and Windows 8. But in those cases a 32-bit JVM is required for some
functionality. Details are <a
href="http://www.openoffice.org/download/common/java.html";>here</a>.</p>
+<p><strong>Please note</strong>: Apache OpenOffice is distributed as a 32-bit
application. It will run successfully in 32-bit mode on 64-bit versions of
Windows 7, 8 and 10. But in those cases a 32-bit JVM is required for some
functionality. Details are <a
href="http://www.openoffice.org/download/common/java.html";>here</a>.</p>
<h2><a href="#hardware-requirements" id="hardware-requirements">Hardware
Requirements</a></h2>
<p>Hardware demands are quite modest and even older machines should be able to
run OpenOffice:</p>
<ul>
<li><strong>Memory</strong>: Minimum 256 Mbytes RAM (512 MB RAM
recommended).</li>
<li><strong>Storage</strong>: At least 650 Mbytes available disk space for a
default install via download. After installation and deletion of temporary
installation files, Apache OpenOffice will use approximately 440 Mbytes disk
space.</li>
-<li><strong>Graphics</strong>: 1024 x 768 or higher resolution with at least
256 colours.</li>
+<li><strong>Graphics</strong>: 1024 x 768 or higher resolution with at least
256 colors.</li>
</ul>
<h2><a href="#windows-specific-features"
id="windows-specific-features">Windows-specific Features</a></h2>
<p>Apache OpenOffice has the following special features on Windows:</p>
@@ -48,7 +48,7 @@
<h2><a href="#additional-resources" id="additional-resources">Additional
Resources</a></h2>
<ul>
<li>Click here to <a
href="http://www.openoffice.org/download/";>download</a></li>
-<li>Click here to get <a
href="http://www.openoffice.org/download/common/instructions.html#win";>Install
intructions for OpenOffice on Windows</a></li>
+<li>Click here to get <a
href="http://www.openoffice.org/download/common/instructions.html#win";>Install
instructions for OpenOffice on Windows</a></li>
<li>Click here to get help and support in the <a
href="http://forum.openoffice.org/";>Community Support Forums</a></li>
</ul>
diff --git a/content/projects/blog/index.html b/content/projects/blog/index.html
new file mode 100644
index 0000000..a798896
--- /dev/null
+++ b/content/projects/blog/index.html
@@ -0,0 +1,33 @@
+<!--#include virtual="/doctype.html" -->
+<html>
+ <head>
+
+ <title>Apache OpenOffice Blog</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <link href="/css/ooo.css" rel="stylesheet" type="text/css">
+
+
+
+ <!--#include virtual="/scripts/google-analytics.js" -->
+ <!--#include virtual="/scripts/entourage.js" -->
+ </head>
+ <body>
+ <!--#include virtual="/brand.html" -->
+ <div id="topbara">
+ <!--#include virtual="/topnav.html" -->
+ <div id="breadcrumbsa"><a href="/">home</a> » <a
href="/projects/">projects</a> » <a
href="/projects/blog/">blog</a></div>
+ </div>
+ <div id="clear"></div>
+
+
+ <div id="content"><h1 class="title">Apache OpenOffice Blog</h1>
+
+ <ul>
+<li><a href="https://blogs.apache.org/ooo/";>Apache OpenOffice Blog</a></li>
+</ul>
+
+
+ </div>
+ <!--#include virtual="/footer.html" -->
+ </body>
+</html>
diff --git a/content/stats/aoo-downloads.txt b/content/stats/aoo-downloads.txt
index 1120a92..71e3291 100644
--- a/content/stats/aoo-downloads.txt
+++ b/content/stats/aoo-downloads.txt
@@ -3155,3 +3155,10 @@
2020-12-25,42112,304243220
2020-12-26,43074,304286294
2020-12-27,57380,304343674
+2020-12-28,74031,304417705
+2020-12-29,57549,304475254
+2020-12-30,53390,304528644
+2020-12-31,39177,304567821
+2021-01-01,35254,304603075
+2021-01-02,45706,304648781
+2021-01-03,47216,304695997
