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/07/24 23:13:43 UTC

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

Author: buildbot
Date: Wed Jul 24 21:13:43 2013
New Revision: 871047

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

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul 24 21:13:43 2013
@@ -1 +1 @@
-1506715
+1506718

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul 24 21:13:43 2013
@@ -1 +1 @@
-1506715
+1506718

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 Wed Jul 24 21:13:43 2013
@@ -15,12 +15,12 @@
   <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="../scripts/entourage.js"></script>
   <style type="text/css">
   /* <![CDATA[ */
   /*-------------------- Exceptions on standard css -----------------------*/
-  @import "../styles.css";
-  @import "../exceptions.css";
+  @import "styles.css";
+  @import "exceptions.css";
   /* ]]> */
   </style>
   <script>
@@ -64,32 +64,28 @@
   <!--
   // Set a specific language ISO code to force to assemble a certain localized build as download URL
   var NL_LANGUAGE = "";
+  // Get the download URL
   var LINK        = getLink();
 
   if ( hasMirrorLink() ) {
-    //  if ( LINK.toLowerCase().indexOf( "other" ) ) {
-    //    // 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','"
-    //    + 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 for the most recent version for <b>"
-    //    + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.<br /></a></p>");
-    //  } else {
-      // Download directly from a mirror with displayed platform and language.
+    /*
+    if ( LINK.toLowerCase().indexOf( "other" ) ) {
+      // 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','"
       + LINK + "');" + "return false;\">" );
-      document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION
-      + " - Milestone " + MILESTONE + " - Build ID " + BUILD + " - SVN " + SVN_REV + "'>"
-      + "Download Apache OpenOffice " + VERSION + "</a></h2>"
+      document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>Download Apache OpenOffice " + VERSION + "</a></h2>"
       + "<p><a href='" + LINK + "' title='" + LINK + "'>Click here for the most recent version for "
+      + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.</a></p><br />");
+    } else {
+    */
+      // Download directly from a mirror with displayed platform and language.
+      document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+      + LINK + "');" + "return false;\">" );
+      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>");
-      /*
-      + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.</a></p>"
-      + "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes#AOO4.0ReleaseNotes-KnownIssues'"
-      + "title='Get information about known issues in Apache OpenOffice " + VERSION + "'>"
-      + "<b>Click here for known installation issues.</b></a><br /><br />");
-      */
     //  }
   } else {
     // Download from an alternative webpage if hasMirrorLink() == false.
@@ -103,16 +99,6 @@
   }
   document.write( "</div>" );
 
-  /*
-  // Show a link for the known issues.
-  document.write( "<div class=\"sub-green\">"
-    + "<p><br />"
-    + "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes#AOO4.0ReleaseNotes-KnownIssues'"
-    + "title='Get information about known issues in Apache OpenOffice " + VERSION + ".'>"
-    + "<b>Click here for known installation issues.</b></a></p><br />"
-  + "</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'>"
@@ -121,6 +107,7 @@
     + "<b>Source Code tarballs and SDK</b></a> | <br />");
     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> | ");
@@ -162,11 +149,11 @@
     <p style="cursor: default;" id="ShareDownloadLinks">
     <a style="cursor: default;" title="Help spread the word and tell your friends about Apache OpenOffice">Please tell your friends about Apache OpenOffice.</a>
     <a style="display: inline; padding: 0 5px 0 30px;" href="javascript:shareFacebook()" title="Please tell your friends about Apache OpenOffice via Facebook">
-    <img src="../../images/logo-facebook-32.png" alt="Please tell your friends about Apache OpenOffice via Facebook" /></a>
+    <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()" title="Please tell your friends about Apache OpenOffice via Twitter">
-    <img src="../../images/logo-twitter-32.png" alt="Please tell your friends about Apache OpenOffice via Twitter" /></a>
+    <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()" title="Please tell your friends about Apache OpenOffice via Google+">
-    <img src="../../images/logo-googleplus-32.png" alt="Please tell your friends about Apache OpenOffice via Google+" /></a>
+    <img src="../images/logo-googleplus-32.png" alt="Please tell your friends about Apache OpenOffice via Google+" /></a>
     </p>
   </div>
 
@@ -370,11 +357,13 @@
     title="When were old releases planned?"> Historic Release Schedule</a></li>
     <li><a href="../development/releases/index.html"
     title="What is new, what has been improved in Apache OpenOffice?">Release Notes</a></li>
+    <!--
     <li><a href="checksums/3.4.1_checksums.html"
     title="Several checksums for Apache OpenOffice">Checksums for Apache OpenOffice</a></li>
+    -->
     <li><a href="../product/index.html"
     title="A tour through all Apache OpenOffice applications">Product Information</a></li>
-    <li><a href="../dev_docs/source/sys_reqs_aoo34.html"
+    <li><a href="../dev_docs/source/sys_reqs_aoo40.html"
     title="HDD: ~300MB free - Memory: &gt;128MB - Processor: &gt;500MHz - OS: Win, Linux, Mac OS, Solaris, FreeBSD...">System Requirements</a></li>
     <li><a href="common/instructions.html"
     title="Instructions for installing Apache OpenOffice on Windows, Linux and Mac OS machines">Install Guides</a> and
@@ -410,9 +399,9 @@
     title="If you cannot download OpenOffice.org, order a CD-ROM">Order CD-ROM</a>
     <li><a href="../distribution/mirrors#mirrors"
     title="To get alternative download locations">All Mirror Server</a><br /></li>
-    -->
     <li><a href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
     title="Download via Apache mirrors">Download via Apache mirrors</a><br /></li>
+    -->
     <li><a href="archive.html"
     title="Download legacy and archived releases">Archived legacy releases</a><br /></li>
   </ul>
@@ -421,7 +410,7 @@
     <p>&nbsp;</p>
     <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="../../images/valid-xhtml10-blue.png"
+    <img src="../images/valid-xhtml10-blue.png"
     alt="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents" /></a>
     &nbsp;&nbsp;&nbsp;
   </div>