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

[bu...@apache.org]

Author: buildbot
Date: Fri May  2 17:27:47 2014
New Revision: 907789

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

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May  2 17:27:47 2014
@@ -1 +1 @@
-1591975
+1591976

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May  2 17:27:47 2014
@@ -1 +1 @@
-1591975
+1591976

Modified: websites/staging/ooo-site/trunk/content/download/test/all_beta.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/all_beta.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/all_beta.html Fri May  2 17:27:47 2014
@@ -32,17 +32,10 @@
     
     
 
-<script type="text/javascript">
-  <!--
-  entourage.initialize();
-  // -->
-</script>	
-
-<h1>Apache OpenOffice Downloads - Official Site - Beta Release</h1>
-<br />
-
 <!-- No JavaScript enabled -->
 <noscript>
+  <h1>Apache OpenOffice Downloads - Official Site - Beta Release</h1>
+
   <h2>JavaScript not enabled?</h2>
 
   <div class="notice"><p>Your browser does not seem to allow JavaScript on websites. This technique is used on this webpage
@@ -53,9 +46,12 @@
 
 <script type="text/javascript">
   <!--
-  if ( BETA_ACTIVE ) {
+  if ( BETA_ACTIVE == 1 ) {
 	// Beta Release online
-	document.write( "<ul>"
+	document.write( "<h1>Apache OpenOffice Downloads - Official Site - Beta Release</h1>"
+	+ "<br />"
+
+	+ "<ul>"
 	+ "<li><h3><a href='#aoo'    title='Full installation sets + languages packs'>"
 	+ "Full installation sets + languages packs</a></h3></li>"
 	+ "<li><h3><a href='#source' title='Software Development Kit (SDK)'>Software Development Kit (SDK)</a></h3></li>"
@@ -115,13 +111,21 @@
 	write_table( 2 );
 
 	document.write( "</div>" );
-  } else {
-	// Beta Release coming soon
+  } else if ( BETA_ACTIVE == 0 ) {
+	// Beta Release, show nothing as it is not yet ready
 	document.write( "<div><h2>Apache OpenOffice " + BETA_NAME
 	+ "<small> (planned for: " + BETA_REL_DATE + ")</small></h2>"
 	+ "<h3>The Beta release is not yet available. Please make sure to come back on the release date to "
 	+ "download and test the new version.</h3><br /><br /><br /><br /><br /><br />" );
 	document.write( "</div>" );
+  } else {
+    // Yellow: Beta Release, show nothing as it is not yet ready
+	document.write( "<div><h2>Apache OpenOffice "
+	+ "<h3>The Beta release is not yet available. Please make sure to come back on the release date to "
+	+ "download and test the new version.</h3>" );
+	document.write( "</div>" );
+
+	exit;
   }
   document.write( "<br />"
   + "<hr style='display: block;' />"
@@ -200,7 +204,9 @@
   + "title='Learn more about how to use mailing lists'>Learn more about how to use mailing lists</a>.</p>"
 
   + "<p class='footer'><small><a href='#' title='Go to the start of the page'>Start of page</a></small></p>" );
-  -->
+
+  entourage.initialize();
+  //-->
 </script>