You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2013/03/31 20:36:01 UTC

svn commit: r856770 [1/2] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index.html content/download/test/other.html

Author: buildbot
Date: Sun Mar 31 18:36:00 2013
New Revision: 856770

Log:
Staging update by buildbot for ooo-site

Added:
    websites/staging/ooo-site/trunk/content/download/test/other.html
Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/download/test/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Mar 31 18:36:00 2013
@@ -1 +1 @@
-1463027
+1463030

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Mar 31 18:36:00 2013
@@ -1 +1 @@
-1463027
+1463030

Modified: websites/staging/ooo-site/trunk/content/download/test/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/index.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/index.html Sun Mar 31 18:36:00 2013
@@ -4,17 +4,29 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta itemprop="name" content="Download Apache OpenOffice" />
+  <meta itemprop="description" content="Join the OpenOffice revolution, the free office productivity suite with over
+  40 million trusted downloads." />
+  <meta itemprop="image" content="http://www.openoffice.org/images/aoo-logo-100x100.png" />
+  <meta property="og:title" content="Download Apache OpenOffice" />
+  <meta property="og:description" content="Join the OpenOffice revolution, the free office productivity suite with over
+  40 million trusted downloads." />
+  <meta property="og:image" content="http://www.openoffice.org/images/aoo-logo-100x100.png" />
+  <meta name="description" content="Official Apache OpenOffice download page. Join the OpenOffice revolution,
+  the free office productivity suite with over 40 million trusted downloads." />
   <title>Apache OpenOffice Downloads - Official Site</title>
-
-  <script type="text/javascript">
-    if (window.document.referrer.indexOf("shell.windows.com") != -1)
-      location.href = "/download/windows-odf/";
-  </script>
-
-  <script type="text/javascript" src="globalvars.js"></script>
-  <script type="text/javascript" src="download.js"></script>
-  <script type="text/javascript" src="languages.js"></script>
-  <script type="text/javascript" src="../../../scripts/entourage.js"></script>
+  <!-- <script type="text/javascript" src="globalvars.js"></script> -->
+  <!-- <script type="text/javascript" src="download.js"></script> -->
+  <!-- <script type="text/javascript" src="download_bouncer.js"></script> -->
+  <!-- <script type="text/javascript" src="globalvars_new_dl.js"></script> -->
+  <!-- <script type="text/javascript" src="download_new_dl.js"></script> -->
+  <!-- <script type="text/javascript" src="download_new_mirrorbrain.js"></script> -->
+  <!-- <script type="text/javascript" src="languages_new_dl.js"></script> -->
+  <script type="text/javascript" src="globalvars_improved.js"></script>
+  <script type="text/javascript" src="download_improved.js"></script>
+  <script type="text/javascript" src="download_mirrorbrain_improved.js"></script>
+  <script type="text/javascript" src="languages_improved.js"></script>
+  <script type="text/javascript" src="../scripts/entourage.js"></script>
   <style type="text/css">
   /* <![CDATA[ */
   /*-------------------- Exceptions on standard css -----------------------*/
@@ -22,6 +34,23 @@
   @import "exceptions.css";
   /* ]]> */
   </style>
+  <script>
+    if (window.document.referrer.indexOf("shell.windows.com") != -1)
+       location.href = "/why/why_odf.html";
+
+    function shareFacebook() {
+      _gaq.push(['_trackEvent','social', 'shareDownload', 'facebook']); 
+      window.open('https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');	
+    }
+    function shareTwitter(){
+      _gaq.push(['_trackEvent','social', 'shareDownload', 'twitter']); 
+      window.open('https://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+40+million+trusted+downloads.&hashtags=openoffice','_blank','toolbar=0,status=0,width=580,height=325');
+    }
+    function shareGooglePlus(){
+      _gaq.push(['_trackEvent','social', 'shareDownload', 'google+']); 
+      window.open('https://plus.google.com/share?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
+    }
+  </script>
 
 <!--#include virtual="/google-analytics.js" -->
 </head>
@@ -38,57 +67,57 @@
     
     
     
-
+	
 <div class="optionset">
 
-<!-- Green: Stable release -->
+  <!-- Green: Stable release -->
   <script type="text/javascript">  
   <!--
   // Set a specific language ISO code to force to assemble a certain localized build as download URL
   var NL_LANGUAGE = "";
-  var LINK        = getLink();
+  // Set some variables
+  var LINK        = getLink( VERSION, NL_LANGUAGE, MIRROR, SCHEMA );
+  var LANG_ARRAY  = getArray( NL_LANGUAGE );
+  var LANG_ISO    = getLanguageISO( NL_LANGUAGE );
+  var PLATFORM    = getPlatform( SCHEMA );
 
-  if ( hasMirrorLink() ) {
-    // Download directly from a mirror with displayed platform and language.
+  if ( hasMirrorLink( NL_LANGUAGE ) ) {
     document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
     + LINK + "');" + "return false;\">" );
     document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>Download Apache OpenOffice " + VERSION + "</a></h2>"
-    + "<p><a href='" + LINK + "' title='" + LINK + "'>Click here to start the download for <b>" + UI_PLATFORM + "</b>"
-    + " and <b>" + LANG_ARRAY[ 2 ] + "</b>.</a></p>" );
+    + "<p><a href='" + LINK + "' title='" + LINK + "'>Click here for the most recent version for <b>"
+    + PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.<br /></p>");
   } else {
-    // Download from an alternative webpage as hasMirrorLink() == false.
+    // dump SF download and redirect to NL webpage (see URLs in "languages.js") if no mirror link (hasMirrorLink() == false)
+    // Get first the array data for NL_LANGUAGE and then the redirect link from the array data
     document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
-    + LANG_ARRAY[ 4 ] + "');" + "return false;\">" );
-    document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>Apache OpenOffice " + VERSION
-    + "</a></h2>"
-    + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>A release for <b>" + UI_PLATFORM + "</b>"
-    + " and <b>" + LANG_ARRAY[ 2 ] + "</b> is not available. Click to choose from alternative download webpage.</a></p>" );
+    + LANG_ARRAY[ 3 ] + "');" + "return false;\">" );
+    document.write( "<h2><a href='" + LANG_ARRAY[ 3 ] + "' title='" + LANG_ARRAY[ 3 ] + "'>Download Apache OpenOffice "
+    + VERSION + "</a></h2><p><a href='" + LANG_ARRAY[ 3 ] + "' title='" + LANG_ARRAY[ 3 ] + "'>A release for <b>"
+    + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Please choose another language from the alternative "
+    + "download webpage.</a></p>" );
   }
-
   document.write( "</div>" );
+
   document.write( "<div class=\"sub-green\">"
     + "<p><a href='other.html' title='Get all platforms, languages, language packs to download'>"
     + "<b>Get all platforms, languages, language packs</b></a> | "
     + "<a href='other.html#tested-sdk' title='Get all source code tarballs and SDK to download'>"
     + "<b>Source Code tarballs and SDK</b></a> | <br />"
     + "Signatures and Hashes: "
-    + "<a href='" + CHECKSUM_ASC    + "' + title='ASC signature'>ASC</a> , "
-    + "<a href='" + CHECKSUM_MD5    + "' + title='MD5 hash'>MD5</a> , "
-    + "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256 hash'>SHA256</a> | "
+    + "<a href='" + apache_getChecksum( VERSION, NL_LANGUAGE, SCHEMA, "asc" )    + "' + title='ASC signature'>ASC</a> , "
+    + "<a href='" + apache_getChecksum( VERSION, NL_LANGUAGE, SCHEMA, "md5" )    + "' + title='MD5 hash'>MD5</a> , "
+    + "<a href='" + apache_getChecksum( VERSION, NL_LANGUAGE, SCHEMA, "sha256" ) + "' + title='SHA256 hash'>SHA256</a> | "
     + "<a href='../development/releases/" + VERSION + ".html'"
     + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'>Release Notes</a> | "
     + "<a href='legacy/index.html' title='Get the legacy version OpenOffice.org 3.3.0'>Legacy Version</a></p>"
   + "</div>" );
-  // -->
+  
+  entourage.initialize();
+  //-->
   </script>
 
-  <script type="text/javascript">
-    <!--
-    entourage.initialize();
-    // -->
-  </script>	
-
-<!-- Green: Stable release: No JavaScript enabled -->
+  <!-- Green: Stable release: No JavaScript enabled -->
   <noscript>
   <div class="button green" id="optionitem1" onclick="openItem('optionitem1','other.html#tested-full'); return false;">
     <h2><a href="other.html" title="Select from other platforms and languages to download">
@@ -105,11 +134,25 @@
     <a href="checksums/3.4.1_checksums.html" title="Checksums for Apache OpenOffice">Signatures and Hashes</a> |
     <a href="../development/releases/index.html" title="What is new, what has been improved in Apache OpenOffice?">
     Release Notes</a> |
-    <a href='legacy/index.html' title='Get the legacy version OpenOffice.org 3.3.0'>Legacy Version</a></p>
+    <a href="legacy/index.html" title="Get the legacy version OpenOffice.org 3.3.0">Legacy Version</a></p>
   </div>
   </noscript>
 
-<!-- Blue: Extensions -->
+  <!-- Light Blue: Share download with social networks -->
+  <div class="button lightblue" >
+    <h2><a>Help Spread the Word</a></h2>
+    <p id="ShareDownloadLinks">
+    <a>Please tell your friends about Apache OpenOffice.</a><br />
+    <a style="display:inline; padding: 0 5px 0 30px;" href="javascript:shareFacebook(); ">
+    <img src="../images/logo-facebook-32.png" alt="Please tell your friends about Apache OpenOffice via Facebook." /></a>
+    <a style="display:inline; padding: 0 5px;" href="javascript:shareTwitter(); ">
+    <img src="../images/logo-twitter-32.png" alt="Please tell your friends about Apache OpenOffice via Twitter." /></a>
+    <a style="display:inline; padding: 0 5px;" href="javascript:shareGooglePlus(); ">
+    <img src="../images/logo-googleplus-32.png" alt="Please tell your friends about Apache OpenOffice via Google+." /></a>
+    </p>
+  </div>
+
+  <!-- Blue: Extensions -->
   <div class="button blue" id="optionitem3" onclick="openItem('optionitem3','http://extensions.openoffice.org');
     return false;">
     <h2><a href="http://extensions.openoffice.org"
@@ -118,8 +161,8 @@
     title="Choose from a wide range of additional and individual functionality">
     Extend your Apache OpenOffice functionality with a large and growing library of extensions with other users.</a></p>
   </div>
-
-<!-- Blue: Templates -->
+  
+  <!-- Blue: Templates -->
   <div class="button blue" id="optionitem3_1" onclick="openItem('optionitem3_1','http://templates.openoffice.org');
     return false;">
     <h2><a href="http://templates.openoffice.org"
@@ -129,41 +172,163 @@
     Extend your Apache OpenOffice creativity with a large and growing library of templates with other users.</a></p>
   </div>
 
-<!-- Red: Developer Snapshots online -->
+
+  <!-- Yellow: Release Candidate online -->
+  <script type="text/javascript">
+  /*
+  <!--
+  if ( RC_ACTIVE == 1 ) {
+    document.write( "<div class=\"button yellow\" id=\"optionitem4\" onclick=\"openItem('optionitem4',"
+      + "'all_rc.html#untested-full');"
+      + "return false;\">"
+      + "<h2><a href='all_rc.html#untested-full' title='Select from other platforms and languages to download'>"
+      + "Get OpenOffice.org Release Candidates</a></h2>"
+      + "<p><a href='all_rc.html#untested-full' title='Select from other platforms and languages to download'>"
+      + "<b>Most recent: OOo " + RC_NAME + " " + RC_NUMBER + "</b></a></p>"
+    + "</div>" );
+    document.write( "<div class=\"sub-yellow\">"
+      + "<p><a href='all_rc.html' title='Get all platforms, languages, language packs to download'>"
+      + "Get all platforms, languages, language packs</a> | "
+      + "<a href='http://www.openoffice.org/development/releases/" + RC_BUILD + ".html'"
+      + "title='What is new, what has been improved in OpenOffice.org " + RC_NAME + RC_NUMBER + "?'>Release Notes</a> | "
+      + "<a href='next/md5sums/" + RC_BUILD + "_md5sums.txt' title='MD5 checksums for OpenOffice.org " + RC_NAME + RC_NUMBER
+      + "'>MD5 checksums</a></p>"
+    + "</div>" );
+  } else if ( RC_ACTIVE == 0 ) {
+  // Yellow: Release Candidate coming soon
+    document.write( "<div class=\"button yellow\" id=\"optionitem4\">"
+      + "<h2><a>Get OpenOffice.org Release Candidate <small>(" + RC_NAME + RC_NUMBER + " coming soon)</small></a></h2>"
+      + "<p><a>A wide range of platforms and languages will be available."
+      + "<br /><b>Important:</b> These builds are nearly ready but needs to be finally tested and are therefore not "
+      + "released.</a></p>"
+    + "</div>" );
+  }
+  //-->
+  */
+  </script>
+
+  <!-- Yellow: Release Candidate: No JavaScript enabled -->
+  <!--
+  <noscript>
+  <div class="button yellow" id="optionitem4" onclick="openItem('optionitem4','all_rc.html#untested-full'); return false;">
+    <h2><a href="all_rc.html" title="Select from all platforms, languages, language packs to download">
+    Get OpenOffice.org Release Candidate</a></h2>
+    <p><a href="all_rc.html" title="Select from other platforms, languages, language packs to download">
+    JavaScript needs to be enabled to take full advantage of this download section. Currently it does not seem to be enabled.
+    Please click on this text to use the alternative webpage to select the favorite platform and language.</a></p>
+  </div>
+  <div class="sub-yellow">
+    <p><a href="all_rc.html" title="Get all platforms, languages, language packs to download">
+    Get all platforms, languages, language packs</a> |
+    <a href="http://www.openoffice.org/development/releases/dev_index.html"
+    title="What is new, what has been improved in OpenOffice.org?">Release Notes</a> |
+    <a href="next/md5sums/index.html" title="MD5 checksums for OpenOffice.org">MD5 checksums</a></p>
+  </div>
+  </noscript>
+  //-->
+
+  <!-- Yellow: Beta Release online -->
   <script type="text/javascript">
+  /*
   <!--
-  var DEV_LINK = "https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds";
+  if ( BETA_ACTIVE == 1 ) {
+    document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','all_beta.html');"
+      + "return false;\">"
+      + "<h2><a href='all_beta.html' title='Select from all platforms, languages, language packs to download'\">"
+      + "Get OpenOffice.org Beta Release</a></h2>"
+      + "<p><a href='all_beta.html' title='Select from all platforms, languages, language packs to download'\">"
+      + "<b>Most recent: OOo-Dev " + BETA_NAME + " " + BETA_NUMBER + "</b></a></p>"
+    + "</div>" );
+    document.write( "<div class=\"sub-yellow\">"
+      + "<p><a href='all_beta.html' title='Get all platforms, languages, language packs to download'>"
+      + "Get all platforms, languages, language packs</a> | "
+      + "<a href='http://www.openoffice.org/development/releases/" + BETA_BUILD + ".html'"
+      + "title='What is new, what has been improved in OpenOffice.org " + BETA_NAME + BETA_NUMBER + "?'>Release Notes</a> | "
+      + "<a href='next/md5sums/index.html" + BETA_BUILD + "_md5sums.txt' title='MD5 checksums for OpenOffice.org "
+      + BETA_NAME + BETA_NUMBER + "'>MD5 checksums</a></p>"
+    + "</div>" );
+  } else if ( BETA_ACTIVE == 0 ) {
+  // Yellow: Beta Release coming soon
+    document.write( "<div class=\"button yellow\" id=\"optionitem2\">"
+      + "<h2><a>Get OpenOffice.org Beta Release <small>(" + BETA_NAME + BETA_NUMBER + " coming soon)</small></a></h2>"
+      + "<p><a>A wide range of platforms and languages will be available."
+      + "<br /><b>Important:</b> The Beta is feature complete but can contain issues and detailed tests needs to be done."
+      + "</a></p>"
+    + "</div>" );
+  }
+  //-->
+  */
+  </script>
+
+  <!-- Yellow: Beta: No JavaScript enabled -->
+  <!--
+  <noscript>
+  <div class="button yellow" id="optionitem2" onclick="openItem('optionitem2','all_beta.html#untested-full'); return false;">
+    <h2><a href="all_beta.html" title="Select from all platforms, languages, language packs to download">
+    Get OpenOffice.org Beta Release</a></h2>
+    <p><a href="all_beta.html" title="Select from all platforms, languages, language packs to download">
+    JavaScript needs to be enabled to take full advantage of this download section. Currently it does not seem to be enabled.
+    Please click on this text to use the alternative webpage to select the favorite platform and language.</a></p>
+  </div>
+  <div class="sub-yellow">
+    <p><a href="all_beta.html" title="Get all platforms, languages, language packs to download">
+    Get all platforms, languages, language packs</a> |
+    <a href="http://www.openoffice.org/development/releases/dev_index.html"
+    title="What is new, what has been improved in OpenOffice.org?">Release Notes</a> |
+    <a href="next/md5sums/index.html" title="MD5 checksums for OpenOffice.org">MD5 checksums</a></p>
+  </div>
+  </noscript>
+  //-->
 
-  document.write( "<div class=\"button orange\" id=\"optionitem5\" onclick=\"openItem('optionitem5','" + DEV_LINK + "');"
+  <!-- Red: Developer Snapshots online -->
+  <script type="text/javascript">
+  /*
+  <!--
+  document.write( "<div class=\"button orange\" id=\"optionitem5\" onclick=\"openItem('optionitem5','next/index.html');"
     + "return false;\">"
-    + "<h2><a href='" + DEV_LINK + "' title='Select from the most recent Apache OpenOffice Developer Snapshots'>"
-    + "Get Apache OpenOffice Developer Snapshots</a></h2>" );
-    document.write( "<p><a href='" + DEV_LINK + "'"
-    + "title='Select from the most recent Apache OpenOffice Developer Snapshots'></a>" );
-    document.write( "<a href='" + DEV_LINK + "' title='Select from the most recent Apache OpenOffice Developer Snapshots'>"
-    + "Developer Snapshots represent the most recent status of the development and will be released mostly irregular. "
-    + "Please help us to improve the product quality. Download and test the latest versions.<br />"
-    + "<b>These builds are not fully tested and are under continuous development. It is not recommended to use in "
-    + "production.</b></a></p>"
+    + "<h2><a href='next/index.html' title='Select from the most recent OpenOffice.org Developer Snapshots'>"
+    + "Get OpenOffice.org Developer Snapshots</a></h2>" );
+    document.write( "<p><a href='next/index.html' title='Select from the most recent OpenOffice.org Developer "
+    + "Snapshots'><b>" );
+    if ( DEV1_VERSION != "" ) {
+      document.write( "Most recent: " + DEV1_VERSION + " (" + DEV1_BUILD + ") and " + DEV2_VERSION + " (" + DEV2_BUILD
+        + ")" );
+    } else {
+      document.write( "Most recent: " + DEV2_VERSION + " (" + DEV2_BUILD + ")" );
+    }
+    document.write( "</b></a></p>"
+  + "</div>" );
+  document.write( "<div class=\"sub-orange\">"
+    + "<p><a href='next/other.html' title='Get all platforms, languages, SDK builds, source tarballs to download'>"
+    + "Get all platforms, languages, SDK builds, source tarballs</a> | "
+    + "<a href='http://www.openoffice.org/development/releases/dev_index.html'"
+    + "title='What is new, what has been improved in OpenOffice.org?'>Release Notes</a> | "
+    + "<a href='next/md5sums/index.html' title='MD5 checksums for OpenOffice.org'>MD5 checksums</a></p>"
   + "</div>" );
   //-->
+  */
   </script>
 
-<!-- Red: Developer Snapshots: No JavaScript enabled -->
+  <!-- Red: Developer Snapshots: No JavaScript enabled -->
+  <!--
   <noscript>
-  <div class="button orange" id="optionitem5" onclick="openItem('optionitem5',
-    'https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds'); return false;">
-    <h2><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds"
-    title="Select from the most recent Apache OpenOffice Developer Snapshots">
-    Get Apache OpenOffice Developer Snapshots</a></h2>
-    <p><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds"
-    title="Select from the most recent Apache OpenOffice Developer Snapshots">Developer Snapshots represent the most
-    recent status of the development and will be released mostly irregular. Please help us to improve the product quality.
-    Download and test the latest versions.<br />
-    <b>These builds are not fully tested and are under continuous development. It is not recommended to use in
-    production.</b></a></p>
+  <div class="button orange" id="optionitem5" onclick="openItem('optionitem5','next/index.html'); return false;">
+    <h2><a href="next/other.html" title="Select from the most recent OpenOffice.org Developer Snapshots">
+    Get OpenOffice.org Developer Snapshots</a></h2>
+    <p><a href="next/other.html" title="Select from the most recent OpenOffice.org Developer Snapshots">
+    JavaScript needs to be enabled to take full advantage of this download section. Currently it does not seem to be enabled.
+    Please click on this text to use the alternative webpage to select the favorite platform and language.</a></p>
+  </div>
+  <div class="sub-orange">
+    <p><a href="next/other.html" title="Get all platforms, languages, language packs, SDK builds, source tarballs to
+    download">
+    Get all platforms, languages, language packs, SDK builds, source tarballs</a> |
+    <a href="http://www.openoffice.org/development/releases/dev_index.html" title="What is new, what has been improved in
+    OpenOffice.org?">
+    Release Notes</a> | <a href="next/md5sums/index.html" title="MD5 checksums for OpenOffice.org">MD5 checksums</a></p>
   </div>
   </noscript>
+  //-->
 </div>
 
 <div class="additionalinformation">
@@ -175,6 +340,7 @@
     title="For developers and power users: Get the source to build Apache OpenOffice from scratch.">Source</a>
     <li><a href="http://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO"
     title="For developers and power users: HowTo guide to build Apache OpenOffice from scratch.">Building Guide</a></li>
+	<li><a href="http://www.openoffice.org/stats/" title="Download and other statistics">Download Statistics</a></li>
   </ul>
 
   <h3>Documentation</h3>
@@ -213,7 +379,7 @@
     <li><a href="../projects/native-lang.html"
     title="Information and support in your favorite language">Localizations</a></li>
     <li><a href="sdk/index.html" title="For developers: Software Development Kit">Software Development Kit (SDK)</a></li>
-    <li><a href="http://www.openoffice.org/distribution/">Distribution FAQ</a></li>
+	<li><a href="http://www.openoffice.org/distribution/">Distribution FAQ</a></li>
     <!--
     <li><a href="../distribution/cdrom/iso_download.html"
     title="Download OpenOffice.org as ISO file and burn it yourself on CD-ROM">ISO images</a> and
@@ -225,12 +391,12 @@
     -->
   </ul>
 
-  <div id="validXHTMLIcon">
-    <p></p>
+  <div id="SupportedAndSupporters">
     <a href="http://validator.w3.org/check?uri=http://www.openoffice.org/download/index.html"
     title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents">
     <img src="http://www.w3.org/Icons/valid-xhtml10-blue.png"
     alt="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents" /></a>
+    &nbsp;&nbsp;&nbsp;
   </div>
 </div>