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 2014/05/03 13:25:34 UTC

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

Author: buildbot
Date: Sat May  3 11:25:34 2014
New Revision: 907906

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_droplist.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat May  3 11:25:34 2014
@@ -1 +1 @@
-1592183
+1592184

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat May  3 11:25:34 2014
@@ -1 +1 @@
-1592183
+1592184

Modified: websites/staging/ooo-site/trunk/content/download/test/index_droplist.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html Sat May  3 11:25:34 2014
@@ -67,14 +67,15 @@ screen reader. -->
   <!-- Green: Stable release -->
   <script type="text/javascript">
   <!--
-  // Set a specific language ISO code to force to assemble a certain localized build as download URL
-  NL_LANGUAGE = "";
-  // Get the download URL for released install files (0 = release mode)
-  var dl_link = getLink( 1 );
+  // Set a specific language ISO code to force to assemble a certain localized build as download link.
+  NL_LANG	= "";
+  // Get the download link (1 = Stable Release).
+  var dl_link	= getLink( 1 );
+  // Does the browser language match with AOO languages?
   if ( hasMirrorLink() ) {
     if ( SOURCEFORGE ) {
-      // If download URL contains "sourceforge" (-> normal and correct download link),
-      // then download from Sourceforge with displayed platform and language.
+      // If download link contains "sourceforge" (-> normal and correct download link),
+      // offer download link from Sourceforge with displayed platform and language.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
         + dl_link + "'); return false;\">"
         + "<h2><a href='" + dl_link + "' title='Click to download: " + FILENAME_FULL + "'>"
@@ -86,8 +87,8 @@ screen reader. -->
         + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "</a></p>"
       + "</div>" );
     } else if ( OTHER ) {
-      // If download URL contains "other" (-> platform, OS or package manager was not recognized),
-      // then use "other.html" as download link.
+      // If download link contains "other" (-> platform, OS or package manager was not recognized),
+      // use "other.html" as download link.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
         + dl_link + "'); return false;\">"
         + "<h2><a href='" + dl_link + "' title='Click to download: " + FILENAME_FULL + "'>"
@@ -98,8 +99,8 @@ screen reader. -->
         + "Click here to choose from the alternative download webpage.</a></p>"
       + "</div>" );
     } else if ( ARCHIVE ) {
-      // If download URL contains "archive" (-> platform/OS is no longer supported),
-      // then provide a download link to the previous version.
+      // If download link contains "archive" (-> platform/OS is no longer supported),
+      // offer download link from archive to the previous version.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','" 
         + dl_link + "'); return false;\">"
         + "<h2><a href='" + dl_link + "' title='Click to download: " + FILENAME_FULL + "'>"
@@ -111,7 +112,7 @@ screen reader. -->
       + "</div>" );
     }
   } else {
-    // If browser language do not match with AOO languages, then download from an alternative webpage.
+    // If browser language do not match with AOO languages, download from an alternative webpage.
     document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
       + dl_link + "'); return false;\">"
       + "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>"
@@ -121,7 +122,7 @@ screen reader. -->
       + "Click here to choose from the alternative " + LANG_ARRAY[ 1 ] + " download webpage.</a></p>"
     + "</div>" );
   }
-  // Show some helpful links for SDK, source, checksums, release notes, legacy version.
+  // Show some helpful data and links for SDK, source, checksums, release notes, legacy version.
   document.write( "<div class='sub-green'>"
     + "<p>" );
     if ( LINK_CHECKSUM_ASC_FULL ) {
@@ -204,7 +205,7 @@ screen reader. -->
     + "</div>"
   + "</div>" );
 
-  // Show some helpful data for filesizes and checksums.
+  // Show some helpful data and links for filesizes and checksums.
   document.write( "<div class='sub-grey'>"
     + "<p>"
     + "<a id='dl_full_hl'         style='font-weight: bold; text-decoration: none'; >Full installation: </a>"
@@ -248,14 +249,17 @@ screen reader. -->
   <!-- Yellow: Beta Release online -->
   <script type="text/javascript">
   <!--
+  // If the Beta Release is available for download, offer download links.
   if ( BETA_ACTIVE == 1 ) {
-    // Set a specific language ISO code to force to assemble a certain localized build as download URL
-    NL_LANGUAGE = "";
-    // Get the download URL for Beta releases (>0 = beta mode)
-    var dl_link = getLink( 1 );
+    // Set a specific language ISO code to force to assemble a certain localized build as download link.
+    NL_LANG	= "";
+    // Get the download link (1 = Beta Release).
+    var dl_link	= getLink( 1 );
+    // Does the browser language match with AOO languages?
     if ( hasMirrorLink() ) {
       if ( SOURCEFORGE ) {
-        // If a Beta Release is available for download, then download from Sourceforge with displayed platform and language.
+        // If download link contains "sourceforge" (-> normal and correct download link),
+        // offer download link from Sourceforge with displayed platform and language.
         document.write( "<div class=\"button yellow\" id=\"optionitem3\" onclick=\"openItem('optionitem3','"
           + dl_link + "'); return false;\">"
           + "<h2><a href='" + dl_link + "' title='Version " + BETA_NAME + " | Milestone " + BETA_MILESTONE
@@ -269,7 +273,7 @@ screen reader. -->
           + "It is strongly not recommended to use in production!</b></a></p>"
         + "</div>" );
       } else if ( OTHER ) {
-        // If download URL contains "other" (-> platform, OS or package manager was not recognized),
+        // If download link contains "other" (-> platform, OS or package manager was not recognized),
         // then use "other.html" as download link.
         document.write( "<div class=\"button yellow\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
           + dl_link + "'); return false;\">"
@@ -280,7 +284,7 @@ screen reader. -->
           + "Click here to choose from the alternative download webpage.</a></p>"
         + "</div>" );
       } else if ( ARCHIVE ) {
-        // If download URL contains "archive" (-> platform/OS is no longer supported),
+        // If download link contains "archive" (-> platform/OS is no longer supported),
         // then provide a download link to the previous version.
         document.write( "<div class=\"button yellow\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
           + dl_link + "'); return false;\">"
@@ -322,7 +326,7 @@ screen reader. -->
       + "<a href='all_beta.html#source' title='Get the source code and SDK to download'>Source code and SDK</a></p>"
     + "</div>" );
   } else if ( BETA_ACTIVE == 0 ) {
-    // Yellow: Beta Release coming soon
+    // If the Beta Release is not yet available for download, show a "coming soon" message.
     var announce_link  = "https://blogs.apache.org/OOo/";
     var announce_title = "Official blog of Apache OpenOffice";
     document.write( "<div class=\"button yellow\" id=\"optionitem2_1\" onclick=\"openItem('optionitem2_1','"
@@ -334,7 +338,7 @@ screen reader. -->
       + "new version.</a></p>"
     + "</div>" );
   } else {
-    // Yellow: Beta Release, show nothing as it is not at all yet ready
+    // If the Beta Release is not planned at all, show nothing.
   }
   //-->
   </script>
@@ -405,6 +409,7 @@ screen reader. -->
   /*
   <!--
   if ( RC_ACTIVE == 1 ) {
+    // If the RC is available for download, download from Sourceforge with displayed platform and language.
     document.write( "<div class=\"button yellow\" id=\"optionitem4\" onclick=\"openItem('optionitem4',"
       + "'all_rc.html#untested-full');"
       + "return false;\">"
@@ -422,14 +427,15 @@ screen reader. -->
       + "'>MD5 checksums</a></p>"
     + "</div>" );
   } else if ( RC_ACTIVE == 0 ) {
-  // Yellow: Release Candidate coming soon
+    // If the RC is not yet available for download, show a "coming soon" message.
     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>" );
-  }
+  } else {
+    // If the RC is not planned at all, show nothing.
   //-->
   */
   </script>
@@ -544,8 +550,10 @@ screen reader. -->
     title="If the information above did not answer your question: Free and paid support!"><b>Support</b></a></li>
     <li><a href="../common/java.html"
     title="Explains why to use Java and what it is">Java and Apache OpenOffice</a></li>
-    <!--<li><a href="http://java.com/en/download/manual_v6.jsp"
-    title="Get the Java Runtime Environment (JRE 1.6)">Get the Java Runtime Environment (JRE 1.6)</a></li>-->
+    <!--
+    <li><a href="http://java.com/en/download/manual_v6.jsp"
+    title="Get the Java Runtime Environment (JRE 1.6)">Get the Java Runtime Environment (JRE 1.6)</a></li>
+    -->
   </ul>
 
   <h3>Additional Resources</h3>