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/08/11 19:27:53 UTC

svn commit: r874214 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/index.html

Author: buildbot
Date: Sun Aug 11 17:27:53 2013
New Revision: 874214

Log:
Staging update by buildbot for ooo-site

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/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Aug 11 17:27:53 2013
@@ -1 +1 @@
-1512975
+1512976

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Aug 11 17:27:53 2013
@@ -1 +1 @@
-1512975
+1512976

Modified: websites/staging/ooo-site/trunk/content/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/index.html (original)
+++ websites/staging/ooo-site/trunk/content/download/index.html Sun Aug 11 17:27:53 2013
@@ -14,6 +14,7 @@
   <title>Apache OpenOffice Downloads - Official Site</title>
   <script type="text/javascript" src="globalvars.js"></script>
   <script type="text/javascript" src="languages.js"></script>
+  <script type="text/javascript" src="release_matrix.js"></script>
   <script type="text/javascript" src="download.js"></script>
   <script type="text/javascript" src="../scripts/entourage.js"></script>
   <style type="text/css">
@@ -75,8 +76,8 @@
       document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION + " - Milestone " + MILESTONE
       + " - Build ID " + BUILD + " - SVN " + SVN_REV + "'>Download Apache OpenOffice " + VERSION + "</a></h2>"
       + "<p><a href='" + LINK + "' title='Version " + VERSION + " - Milestone " + MILESTONE + " - Build ID " + BUILD
-      + " - SVN " + SVN_REV + "'>Click here for the most recent version for "
-      + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.</a></p>");
+      + " - SVN " + SVN_REV + "'>Click here for the most recent version for:<br />"
+      + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> (~" + FILESIZE + " MByte)</a></p>" );
     } else {
       // OS and/or package manager was not recognized, therefore use "other.html" as download link.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
@@ -84,8 +85,8 @@
       document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>"
       + "Download Apache OpenOffice</a></h2>"
       + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + VERSION + " for "
-      + "<b>" + UI_PLATFORM + "</b> is not available. Please click this text to choose "
-      + "another platform build from the alternative download webpage.</a></p>" );
+      + "<b>" + UI_PLATFORM + "</b> is not available. Please choose another platform build from the alternative download "
+      + "webpage.</a></p>" );
     }
   } else {
     // Download from an alternative webpage if hasMirrorLink() == false.
@@ -94,33 +95,35 @@
     document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>"
     + "Download Apache OpenOffice</a></h2>"
     + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>Apache OpenOffice " + VERSION + " for "
-    + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Please click this text to choose "
-    + "another build from the alternative " + LANG_ARRAY[ 1 ] + " download webpage.</a></p>" );
+    + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Please choose another build from the "
+    + "alternative " + LANG_ARRAY[ 1 ] + " download webpage.</a></p>" );
   }
   document.write( "</div>" );
 
   // Show some helpful links for SDK, source, checksums, release notes, legacy version.
-  document.write( "<div class=\"sub-green\">"
-  + "<p><a href='other.html' title='Get all platforms, languages, language packs to download'>"
+  document.write( "<div class=\"sub-green\">" );
+  document.write( "<p>" );
+  if ( CHECKSUM_ASC ) {
+    document.write( "Signatures and hashes: "
+    + "<a href='" + CHECKSUM_KEYS   + "' + title='KEYS signature'>KEYS</a> , "
+    + "<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='checksums.html' title='How to verify the download with checksums?'>How to verify?</a> | " );
+  }
+  document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes'"
+  + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'>Release Notes</a> | <br />"
+  + "<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#source' title='Get the source code and SDK to download'>"
-  + "<b>Source code and SDK</b></a> | <br />"
+  + "Source code and SDK</a> | <br />"
   + "<a href='../porting/index.html'"
   + "title='Get Apache OpenOffice software packaged as portable USB versions and third-party ports'>"
   + "<b>Portable USB versions</b> and third-party ports</a> | "
-  + "Older and legacy versions: <a href='other-341.html' title='Get the old version of Apache OpenOffice "
+  + "Old and legacy version: <a href='other-341.html' title='Get the old version of Apache OpenOffice "
   + OLDVERSION + "'><b>" + OLDVERSION + "</b></a> + "
   + "<a href='legacy/index.html' title='Get the legacy version of OpenOffice.org "
   + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a>" );
-  if ( CHECKSUM_ASC ) {
-    document.write( " | <br />Signatures and hashes: "
-    + "<a href='" + CHECKSUM_KEYS   + "' + title='KEYS signature'>KEYS</a> , "
-    + "<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>");
-  }
-  document.write( " | <a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes'"
-  + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'>Release Notes</a></p>" );
   document.write( "</div>" );
 
   entourage.initialize();
@@ -129,24 +132,28 @@
 
   <!-- Green: Stable release: No JavaScript enabled -->
   <noscript>
-  <div class="first button green" id="optionitem1" onclick="openItem('optionitem1','other.html'); return false;">
-    <h2><a href="other.html" title="Get all platforms, languages, language packs to download">
+  <div class="first button green" id="optionitem1">
+    <h2><a style="cursor: default;">Download Apache OpenOffice</a></h2>
+    <p style="cursor: default;">
+    <a style="cursor: default;">JavaScript needs to be enabled to download Apache OpenOffice.</a></p>
+  </div>
+  <!-- Old text
+  <div class="button green" id="optionitem1" onclick="openItem('optionitem1','other.html'); return false;">
+    <h2><a href="other.html" title="Select from other platforms and languages to download">
     Download Apache OpenOffice</a></h2>
-    <p><a href="other.html" title="Get all platforms, languages, language packs to download">
-    <b>JavaScript needs to be enabled</b> to take full advantage of this download section. Please <b>enable it and
-    reload</b> this webpage. <b>Or click on this text</b> to use the alternative download webpage to select the favorite
-    platform and language.</a></p>
+    <p><a href="other.html" title="Select from other platforms and languages 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-green">
-    <p><a href="other.html#source" title="Get the source code and SDK to download"><b>Source code and SDK</b></a> |
-    <a href="../../porting/index.html"
+    <p><a href="../porting/index.html"
     title="Get Apache OpenOffice software packaged as portable USB versions and third-party ports">
-    <b>Portable USB versions</b> and third-party ports</a> | <br />
-    <a href="other-341.html" title="Get the old version of Apache OpenOffice"><b>Older version</b></a> |
-    <a href="legacy/index.html" title="Get the legacy version of OpenOffice.org"><b>Legacy version</b></a> |
-    <a href="other.html" title="Signatures and hashes for Apache OpenOffice">Signatures and hashes</a> |
+    <b>Portable USB versions</b> and third-party ports</a> |
     <a href="../development/releases/index.html"
-    title="What is new, what has been improved in Apache OpenOffice?">Release Notes</a></p>
+    title="What is new, what has been improved in Apache OpenOffice?">Release Notes</a> | <br />
+    <a href="other-341.html" title="Get the old version of Apache OpenOffice">Old Apache OpenOffice</a> |
+    <a href="legacy/index.html" title="Get the legacy version of OpenOffice.org">Legacy OpenOffice.org</a></p>
   </div>
   </noscript>
 
@@ -177,15 +184,15 @@
     Get Apache OpenOffice Extensions and Dictionaries</a></h2>
     <p><a href="http://extensions.openoffice.org"
     title="Choose from a wide range of additional and individual functionality">
-    Extend your Apache OpenOffice functionality with a large and growing library of extensions and dictionaries with other
-    users.</a></p>
+    Extend your Apache OpenOffice functionality with a large and growing library of extensions and dictionaries with other users.</a></p>
   </div>
 
   <!-- 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"
-    title="Choose from a wide range of additional and individual documents">Get Apache OpenOffice Templates</a></h2>
+    title="Choose from a wide range of additional and individual documents">
+    Get Apache OpenOffice Templates</a></h2>
     <p><a href="http://templates.openoffice.org"
     title="Choose from a wide range of additional and individual documents">
     Extend your Apache OpenOffice creativity with a large and growing library of templates with other users.</a></p>