openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r907270 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/index.html
Date Tue, 29 Apr 2014 09:06:20 GMT
Author: buildbot
Date: Tue Apr 29 09:06:20 2014
New Revision: 907270

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 Tue Apr 29 09:06:20 2014
@@ -1 +1 @@
-1590922
+1590923

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Apr 29 09:06:20 2014
@@ -1 +1 @@
-1590922
+1590923

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 Tue Apr 29 09:06:20 2014
@@ -174,91 +174,94 @@ screen reader. -->
   <!-- Yellow: Beta Release online -->
   <script type="text/javascript">
   <!--
-  if ( BETA_ACTIVE ) {
-    // Set a specific language ISO code to force to assemble a certain localized build as
download URL
-    var NL_LANGUAGE = "";
-    // Get the download URL for Beta releases (>0 = beta mode)
-    var LINK        = getLink( 1 );
-    if ( hasMirrorLink() ) {
-      if ( SOURCEFORGE ) {
-        // If a Beta Release is available for download, then download from Sourceforge with
displayed platform and language.
-        document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','"
-          + LINK + "') return false;\">"
-          + "<h2><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone
" + BETA_MILESTONE
-          + " | Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE
+ "'>"
-          + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>"
-          + "<p><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone
" + BETA_MILESTONE + " | "
-          + "Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE
+ "'>"
-          + "Click here to download (hosted by Sourceforge.net) for:<br />"
-	  + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>
| ~" + FILESIZE + " MByte | "
-	  + "Released: " + BETA_REL_DATE + "<br />"
-          + "<br /><b>The Beta release is feature complete but not yet fully
tested and can contain issues. "
-          + "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),
-        // then use "other.html" as download link.
-        document.write( "<div class=\"button yellow\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
-          + LINK + "');" + "return false;\">"
-          + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
-          + "Download Apache OpenOffice</a></h2>"
-          + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice
" + BETA_NAME + " for "
-          + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "
(" + LANG_ARRAY[ 1 ] + ")</b> is not available. "
-          + "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.
-        document.write( "<div class=\"button yellow\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
-          + LINK + "');" + "return false;\">"
-          + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
-          + "Download Apache OpenOffice</a></h2>"
-          + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice
" + BETA_NAME + " for "
-          + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "
(" + LANG_ARRAY[ 1 ] + ")</b> is not available. "
-          + "Click here for the previous version " + PRE_VERSION + ".</a></p>"
-        + "</div>" );
-      }
-    } else {
-      // If browser language do not match with AOO languages, then use "all_beta.html" as
download link.
-      // LINK = "http://www.openoffice.org/download/test/all_beta.html";
-      document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','"
-        + LINK + "') return false;\">"
-        + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
-        + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>"
-        + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice "
+ BETA_NAME + " for "
-        + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available.
"
-        + "Click here to choose from the alternative download webpage.</a></p>"
-      + "</div>" );
-    }
-    // Show some helpful links for SDK, source, checksums, release notes.
-    document.write( "<div class=\"sub-yellow\">" );
-    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.1+Release+Notes'"
-      + "title='What is new, what has been improved in Apache OpenOffice " + BETA_NAME +
"?'><b>Release Notes</b></a> | "
-      + "<br /><a href='all_beta.html' title='Get all platforms, languages, language
packs to download'>"
-      + "<b>Get all platforms, languages, language packs</b></a> | "
-      + "<a href='all_beta.html#source' title='Get the source code and SDK to download'>Source
code and SDK</a></p>"
-    + "</div>" );
-  } else {
-    // Yellow: Beta Release coming soon
-    var ANN_LINK  = "https://blogs.apache.org/OOo/";
-    var ANN_TITLE = "Official blog of Apache OpenOffice";
-    document.write( "<div class=\"button yellow\" id=\"optionitem2_1\" onclick=\"openItem('optionitem2_1','"
-      + ANN_LINK + "') return false;\">"
-      + "<h2><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'>"
-      + "Get Apache OpenOffice " + BETA_NAME + "<br /><small>(planned for: "
+ BETA_REL_DATE + ")</small></a></h2>"
-      + "<p><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'><br />"
-      + "The Beta release is not yet available. Please make sure to come back on the release
date to download and test the "
-      + "new version.</a></p>"
-    + "</div>" );
+	if (BETA_VISIBLE) {	  
+  
+	  if ( BETA_ACTIVE ) {
+		// Set a specific language ISO code to force to assemble a certain localized build as download
URL
+		var NL_LANGUAGE = "";
+		// Get the download URL for Beta releases (>0 = beta mode)
+		var LINK        = getLink( 1 );
+		if ( hasMirrorLink() ) {
+		  if ( SOURCEFORGE ) {
+			// If a Beta Release is available for download, then download from Sourceforge with displayed
platform and language.
+			document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','"
+			+ LINK + "') return false;\">"
+			+ "<h2><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone "
+ BETA_MILESTONE
+			+ " | Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE
+ "'>"
+			+ "Download Apache OpenOffice " + BETA_NAME + "</a></h2>"
+			+ "<p><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone " +
BETA_MILESTONE + " | "
+			+ "Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE
+ "'>"
+			+ "Click here to download (hosted by Sourceforge.net) for:<br />"
+			+ "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>
| ~" + FILESIZE + " MByte | "
+			+ "Released: " + BETA_REL_DATE + "<br />"
+			+ "<br /><b>The Beta release is feature complete but not yet fully tested
and can contain issues. "
+			+ "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),
+			// then use "other.html" as download link.
+			document.write( "<div class=\"button yellow\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+			  + LINK + "');" + "return false;\">"
+			  + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+			  + "Download Apache OpenOffice</a></h2>"
+			  + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " +
BETA_NAME + " for "
+			  + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" +
LANG_ARRAY[ 1 ] + ")</b> is not available. "
+			  + "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.
+			document.write( "<div class=\"button yellow\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+			  + LINK + "');" + "return false;\">"
+			  + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+			  + "Download Apache OpenOffice</a></h2>"
+			  + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " +
BETA_NAME + " for "
+			  + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" +
LANG_ARRAY[ 1 ] + ")</b> is not available. "
+			  + "Click here for the previous version " + PRE_VERSION + ".</a></p>"
+			+ "</div>" );
+		  }
+		} else {
+		  // If browser language do not match with AOO languages, then use "all_beta.html" as download
link.
+		  // LINK = "http://www.openoffice.org/download/test/all_beta.html";
+		  document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','"
+			+ LINK + "') return false;\">"
+			+ "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+			+ "Download Apache OpenOffice " + BETA_NAME + "</a></h2>"
+			+ "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + BETA_NAME
+ " for "
+			+ "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available.
"
+			+ "Click here to choose from the alternative download webpage.</a></p>"
+		  + "</div>" );
+		}
+		// Show some helpful links for SDK, source, checksums, release notes.
+		document.write( "<div class=\"sub-yellow\">" );
+		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.1+Release+Notes'"
+		  + "title='What is new, what has been improved in Apache OpenOffice " + BETA_NAME + "?'><b>Release
Notes</b></a> | "
+		  + "<br /><a href='all_beta.html' title='Get all platforms, languages, language
packs to download'>"
+		  + "<b>Get all platforms, languages, language packs</b></a> | "
+		  + "<a href='all_beta.html#source' title='Get the source code and SDK to download'>Source
code and SDK</a></p>"
+		+ "</div>" );
+	  } else {
+		// Yellow: Beta Release coming soon
+		var ANN_LINK  = "https://blogs.apache.org/OOo/";
+		var ANN_TITLE = "Official blog of Apache OpenOffice";
+		document.write( "<div class=\"button yellow\" id=\"optionitem2_1\" onclick=\"openItem('optionitem2_1','"
+		  + ANN_LINK + "') return false;\">"
+		  + "<h2><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'>"
+		  + "Get Apache OpenOffice " + BETA_NAME + "<br /><small>(planned for: " +
BETA_REL_DATE + ")</small></a></h2>"
+		  + "<p><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'><br />"
+		  + "The Beta release is not yet available. Please make sure to come back on the release
date to download and test the "
+		  + "new version.</a></p>"
+		+ "</div>" );
+	  }
   }
   //-->
   </script>



Mime
View raw message