You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2015/01/22 23:04:07 UTC

svn commit: r1654082 - /openoffice/ooo-site/trunk/content/xx/index.html

Author: marcus
Date: Thu Jan 22 22:04:06 2015
New Revision: 1654082

URL: http://svn.apache.org/r1654082
Log:
Updated with the changes from main 'index.html'

Modified:
    openoffice/ooo-site/trunk/content/xx/index.html

Modified: openoffice/ooo-site/trunk/content/xx/index.html
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/xx/index.html?rev=1654082&r1=1654081&r2=1654082&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/xx/index.html (original)
+++ openoffice/ooo-site/trunk/content/xx/index.html Thu Jan 22 22:04:06 2015
@@ -1,13 +1,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" />
 <head>
+    <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, Writer, Calc, Impress, Draw, Base, ODF, Open Document Format, free office editors" />
     <meta name="google-site-verification" content="x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4" />
     <meta name="p:domain_verify" content="bd1ba1fb9d25b0eb3d64891f89e9195e" /> 
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link href="https://plus.google.com/+openoffice" rel="publisher" />
-    <title>Apache OpenOffice - The Free and Open Productivity Suite</title>
+    <title>Apache OpenOffice - Official Site - The Free and Open Productivity Suite</title>
     <script type="text/javascript" src="../download/globalvars.js"></script>
     <script type="text/javascript" src="msg_prop_l10n_xx.js"></script>
     <script type="text/javascript" src="../download/languages.js"></script>
@@ -15,9 +16,9 @@
     <style type="text/css">
     /* <![CDATA[ */
     /*-------------------- Exceptions on standard css -----------------------*/
-    @import "/home.css";
-    @import "/styles.css";
-    @import "/exceptions.css";
+    @import "../home.css";
+    @import "../styles.css";
+    @import "../exceptions.css";
     /* ]]> */
     </style>
     <script>
@@ -168,6 +169,12 @@
 	    lang_mode = "none";
 	}
 
+	// Fix for English as main language for the website, it does not need a language code.
+	if( lang_iso === "en-us" || lang_iso === "en-gb" || lang_iso === "en-uk" || lang_iso === "en" ||
+	    lang_iso === "en-US" || lang_iso === "en-GB" || lang_iso === "en-UK" ) {
+		lang_iso = "";
+	}
+
 	switch( lang_mode ) {
 		case "hard":
 			// Do not show a message, just redirect. 
@@ -329,22 +336,22 @@
             <p>
               <span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'ApacheBlog' );"
                 title="Blog of OpenOffice.">
-                <img src="/images/logo-rss-16.png" alt="Blog of OpenOffice" />
+                <img src="../images/logo-rss-16.png" alt="Blog of OpenOffice" />
                 <a>Official Blog</a>
               </span>
               <span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'Facebook' );"
                 title="Follow us on Facebook.">
-                <img src="/images/logo-facebook-16.png" alt="Follow us on Facebook" />
+                <img src="../images/logo-facebook-16.png" alt="Follow us on Facebook" />
                 <a>Facebook</a>
               </span>
               <span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'Twitter' );"
                 title="Follow us on Twitter.">
-                <img src="/images/logo-twitter-16.png" alt="Follow us on Twitter" />
+                <img src="../images/logo-twitter-16.png" alt="Follow us on Twitter" />
                 <a>Twitter</a>
               </span>
               <span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'GooglePlus' );"
                 title="Follow us on Google+.">
-                <img src="/images/logo-googleplus-16.png" alt="Follow us on Google+" />
+                <img src="../images/logo-googleplus-16.png" alt="Follow us on Google+" />
                 <a>Google+</a>
               </span>
             </p>
@@ -367,14 +374,20 @@
 
 <div id="news">
 
-  <div class="campaign" style="height: 200px; float: right; overflow: auto;">
-    <h2 style="display: inline;">Recent Blog Posts</h2>
+  <div class="first campaign" style="height: 200px; float: right; overflow: auto;">
+    <h2>Recent Blog Posts</h2>
 
     <p style="text-align:right">
       <a href="http://blogs.apache.org/OOo/" target="_blank">All Posts</a>
     </p>
 
     <p>
+      <em>31 December:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2014_a">
+      Apache OpenOffice in 2014: a year in review</a>
+      <br />
+
       <em>21 August:</em>
       <br />
       <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1">
@@ -392,36 +405,30 @@
       <a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56">
       100 Million downloads</a>
       <br />
-
-      <em>31 December:</em>
-      <br />
-      <a href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a">
-      Apache OpenOffice in 2013: a year in review</a>
-      <br/>
     </p>
   </div>
 
-  <div id="all_news" style="height: 320px; float: left; overflow: auto;">
+  <div id="all_news" style="height: 500px; float: left; overflow: auto;">
     <div class="campaign">
       <h2>Recent News</h2>
 
       <p style="text-align:right">
-        <a href="news/index.html">All News</a>
+        <a href="news/index.html" target="_blank">All News</a>
       </p>
       <p></p>
 
-
       <h2>Udine moves to OpenOffice, will save 360,000 Euro</h2>
-       <p>
+
+      <p>
         <em>16 September 2014:</em>
         The City of Udine, in Italy, announced a process that will lead to the installation
         of OpenOffice on 900 municipal desktops, saving the city 360,000 Euro.  
-        ZDNet's Raffaele Mastrolonardo has the <a href="http://www.zdnet.com/another-italian-city-announces-its-ditching-microsoft-windows-for-open-source-7000033682/">details</a>.
-    <p>
-
-
-
+        ZDNet's Raffaele Mastrolonardo has the
+        <a href="http://www.zdnet.com/another-italian-city-announces-its-ditching-microsoft-windows-for-open-source-7000033682/">details</a>.
+      </p>
+    </div>
 
+    <div class="campaign">
       <h2>Apache OpenOffice 4.1.1 released</h2>
 
       <p>