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 645beba  git-site-role commit from build_staging.sh
645beba is described below

commit 645bebaa117b81f0400f8375ebe60a0d2e24647f
Author: jenkins <[email protected]>
AuthorDate: Fri May 14 11:33:25 2021 +0000

    git-site-role commit from build_staging.sh
---
 content/de/index.html     |   2 +-
 content/feed.xml          |   4 +-
 content/index.html        |  16 ++---
 content/social/index.html | 146 +++++++++++++++++++++++++++++++---------------
 4 files changed, 109 insertions(+), 59 deletions(-)

diff --git a/content/de/index.html b/content/de/index.html
index 56827eb..6123611 100644
--- a/content/de/index.html
+++ b/content/de/index.html
@@ -137,7 +137,7 @@ screen reader.
         + "<a href='./download/'>"
           + "<h2>Ich m&ouml;chte Apache OpenOffice herunterladen</h2>"
           + "<p style='font-size: 1.0em; font-weight: bold;'>(Neueste Version: 
" + DL.VERSION + ")</p>"
-          + "<p>Laden Sie Apache OpenOffice kostenlos herunter 
<b>(wirklich!)</b> | "
+          + "<p>Laden Sie Apache OpenOffice kostenlos herunter <b>(wirklich, 
ohne Lizenzgeb&uuml;hren!)</b> | "
             + "<a 
href='https://blogs.apache.org/OOo/entry/with_apache_openoffice_you_get'"
               + "title='Blog post: With Apache OpenOffice you get what you do 
not pay for' target='_blank'>"
               + "Hier mehr Informationen (in Englisch)"
diff --git a/content/feed.xml b/content/feed.xml
index 29e0c7c..a5a7a57 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, 13 May 2021 23:13:38 +0000</pubDate>
-    <lastBuildDate>Thu, 13 May 2021 23:13:38 +0000</lastBuildDate>
+    <pubDate>Fri, 14 May 2021 11:31:52 +0000</pubDate>
+    <lastBuildDate>Fri, 14 May 2021 11:31:52 +0000</lastBuildDate>
     
 
   </channel> 
diff --git a/content/index.html b/content/index.html
index b727498..9dcdd55 100644
--- a/content/index.html
+++ b/content/index.html
@@ -150,10 +150,10 @@
                lang_iso = "pt";
        }
 
-    // Fix for Norwegian to map both "nb" and "nn" -> "nb", then after looking 
up globalvars we change "nb" -> "no"
-    if( lang_iso === "no" || lang_iso === "no-NO" || lang_iso === "nn" || 
lang_iso === "nb-NO" || lang_iso === "nn-NO" ) {
-        lang_iso = "nb";
-    }
+       // Fix for Norwegian to map both "nb" and "nn" -> "nb", then after 
looking up globalvars we change "nb" -> "no"
+       if( lang_iso === "no" || lang_iso === "no-NO" || lang_iso === "nn" || 
lang_iso === "nb-NO" || lang_iso === "nn-NO" ) {
+               lang_iso = "nb";
+       }
 
        // Query if the browser language is one of the released languages.
        // The array has 3 elements per language (defined in 
"/download/globalvars.js"
@@ -186,10 +186,10 @@
                lang_iso = "";
        }
 
-    // Fix for Norwegian, since Download language is "nb" but site language is 
"no".
-    if( lang_iso === "nb" ) {
-        lang_iso = "no";
-    }
+       // Fix for Norwegian, since Download language is "nb" but site language 
is "no".
+       if( lang_iso === "nb" ) {
+               lang_iso = "no";
+       }
 
        switch( lang_mode ) {
                case "hard":
diff --git a/content/social/index.html b/content/social/index.html
index ce2e84f..594fe91 100644
--- a/content/social/index.html
+++ b/content/social/index.html
@@ -6,22 +6,22 @@
     
     <link href="/css/ooo.css" rel="stylesheet" type="text/css">
     
-<title>OpenOffice News Sources</title>
-<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>
-
-<style type="text/css">
-  /* <![CDATA[ */
-  /*-------------------- Exceptions on standard css -----------------------*/
-  @import "/styles.css";
-  @import "/exceptions.css";
-  /* ]]> */
-</style>
-
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="name" content="Apache OpenOffice" />
+    <meta name="description" content="The official home page of the Apache 
OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw 
and Base." />
+    <meta name="keywords" content="OpenOffice, Open Office, Apache OpenOffice, 
Apache Open Office, OpenOffice.org, Official, Official Site, Writer, Calc, 
Impress, Draw, Base, ODF, Open Document Format, free office editors" />
+    <meta name="google-site-verification" 
content="I-hPf9Mn1dfj03oW79MDQoCJLeGc0cHaQleb1aXBzzg" />
+    <meta name="p:domain_verify" content="bd1ba1fb9d25b0eb3d64891f89e9195e"/>
+    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="/favicon.ico" type="image/x-icon" />
+    <title>Apache OpenOffice - Social Media</title>
+    <style type="text/css">
+    /* <![CDATA[ */
+    /*-------------------- Exceptions on standard css -----------------------*/
+    @import "/css/styles.css";
+    @import "/css/exceptions.css";
+    /* ]]> */
+    </style>
 
     
     <script src="https://www.apachecon.com/event-images/snippet.js";></script>
@@ -38,39 +38,89 @@
     <div id="content">
       
       
-<h1>Official Announcements</h1>
-<p>
-The announce mailing list is the official avenue for announcements from the 
OpenOffice project. This is a low-volume list. All users and interested parties 
are encouraged to subscribe in order to receive release announcements, security 
bulletins and other important updates.
-</p>
-<p>
-To subscribe to the announce list, send an email to <a 
href="mailto:[email protected]";>[email protected]</a>
 and respond to the confirmation email you will receive.
-</p>
-<p>
-We also have an <a href="https://blogs.apache.org/OOo/";>official project 
blog</a>, which features more in depth stories about Apache OpenOffice, 
previews of upcoming features and interviews with project members.
-</p>
-<h1>Social Media</h1>
-<p>
-The Apache OpenOffice project provides occasional news updates and 
announcement via a variety of popular social media outlets. We invite you to 
follow us on any of these social networks, and to share our posts with friends 
in your network.
-</p>
-<p>
-Recommended hashtags for Twitter is: #apacheoo
-</p>
+  <h1>Official Announcements</h1>
+
+  <p>
+    The announce mailing list is the official avenue for announcements from 
Apache OpenOffice. This is a low-volume list.
+    All users and interested parties are encouraged to subscribe in order to 
receive release announcements, security
+    bulletins and other important updates.
+  </p>
+  <p>
+    To subscribe to the announce mailing list, send an empty email to
+    <a 
href="mailto:[email protected]";>[email protected]</a>
 and respond to
+    the confirmation mail you will receive.
+  </p>
+  <p>
+    For more information about how to work with mailing lists
+    <a href="https://openoffice.apache.org/mailing-lists.html";>please see 
here</a>.
+  </p>
+
+  <h1>Social Media</h1>
+
+  <p>
+    The Apache OpenOffice project provides occasional news updates and 
announcement via a variety of popular social media
+    outlets. We invite you to follow us on any of these social networks, and 
to share our posts with friends in your
+    network.
+  </p>
+  <p>
+    We also have an <a href="https://blogs.apache.org/OOo/";>official blog</a>, 
which features more in depth stories about
+    Apache OpenOffice, previews of upcoming features and other intersting 
things.
+  </p>
+
+  <h2>Social Media Channels</h2>
+
+  <table border="0">
+    <tr>
+      <td>
+        <h4>Follow us on our Official Blog</h4>
+      </td>
+      <td>
+        <h4>Follow us on Facebook</h4>
+      </td>
+      <td>
+        <h4>Follow the Facebook Group</h4>
+      </td>
+      <td>
+        <h4>Follow us on Twitter</h4>
+      </td>
+      <td>
+        <h4>Follow us on Youtube</h4>
+      </td>
+    </tr>
+    <tr>
+      <!-- Apache OpenOffice Official Blog -->
+      <td>
+        <a href="https://blogs.apache.org/OOo/"; title="Follow us on our 
Official Blog" target=_blank>Official Blog
+        <img src="../images/logo-rss-16.png" alt="Apache Blog logo" /></a>
+      </td>
+
+      <!-- Facebook -->
+      <td>
+        <a href="https://www.facebook.com/ApacheOO"; title="Follow us on 
Facebook" target=_blank>Facebook
+        <img src="../images/logo-facebook-16.png" alt="Facebook logo" /></a>
+      </td>
+
+      <!-- Facebook Group -->
+      <td>
+        <a href="https://www.facebook.com/groups/338330086179568/"; 
title="Follow us on Facebook" target=_blank>Facebook Group
+        <img src="../images/logo-facebook-16.png" alt="Facebook logo" /></a>
+      </td>
+
+      <!-- Twitter -->
+      <td>
+        <a href="https://twitter.com/ApacheOO"; title="Follow us on Twitter" 
target=_blank>Twitter
+        <img src="../images/logo-twitter-16.png" alt="Twitter logo" /></a>
+        <br /><br />
+        Hashtag: #apacheoo
+      </td>
 
-<table border="0">
-<tr>
-<td>
-<!-- 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">
-<!-- Facebook Badge START --><a href="https://www.facebook.com/ApacheOO"; 
target="_TOP" style="font-family: &quot;lucida 
grande&quot;,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="https://www.facebook.com/groups/338330086179568/";>Facebook 
Group</a></td>
-<td><a href="https://www.xing.com/net/aoo";>XING</a></td>
-</tr>
-</table>
+      <!-- YouTube -->
+      <td>
+        <a href="https://www.youtube.com/openoffice"; title="Follow us on 
YouTube" target=_blank>YouTube
+        <img src="../images/logo-youtube-16.png" alt="YouTube logo" /></a>
+      </td>
+    </tr>
+  </table>
 
 
       

Reply via email to