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/03/10 16:00:49 UTC

svn commit: r900918 [1/3] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/

Author: buildbot
Date: Mon Mar 10 15:00:48 2014
New Revision: 900918

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/all_beta.html
    websites/staging/ooo-site/trunk/content/download/download.js
    websites/staging/ooo-site/trunk/content/download/download_other.js
    websites/staging/ooo-site/trunk/content/download/exceptions.css
    websites/staging/ooo-site/trunk/content/download/globalvars.js
    websites/staging/ooo-site/trunk/content/download/index.html
    websites/staging/ooo-site/trunk/content/download/languages.js
    websites/staging/ooo-site/trunk/content/download/other.html
    websites/staging/ooo-site/trunk/content/download/release_matrix.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Mar 10 15:00:48 2014
@@ -1 +1 @@
-1575939
+1575959

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Mar 10 15:00:48 2014
@@ -1 +1 @@
-1575939
+1575959

Modified: websites/staging/ooo-site/trunk/content/download/all_beta.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/all_beta.html (original)
+++ websites/staging/ooo-site/trunk/content/download/all_beta.html Mon Mar 10 15:00:48 2014
@@ -4,8 +4,16 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta http-equiv="refresh" content="1; URL=index.html" />
-  <title>Apache OpenOffice</title>
+  <title>Apache OpenOffice Downloads - Official Site - Beta Release</title>
+  <script type="text/javascript" src="globalvars.js"></script>
+  <script type="text/javascript" src="download_other.js"></script>
+  <style type="text/css">
+  /* <![CDATA[ */
+  /*-------------------- Exceptions on standard css -----------------------*/
+  @import "styles.css";
+  @import "exceptions.css";
+  /* ]]> */
+  </style>
 
 <!--#include virtual="/google-analytics.js" --> 
 <!--#include virtual="/scripts/entourage.js" -->
@@ -24,7 +32,174 @@
     
     
 
-If your browser do not support redirection please click yourself to go to the <a href="index.html">main download website</a>.
+<script type="text/javascript">
+  <!--
+  entourage.initialize();
+  // -->
+</script>	
+
+<h1>Apache OpenOffice Downloads - Official Site - Beta Release</h1>
+<br />
+
+<!-- No JavaScript enabled -->
+<noscript>
+  <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
+  for presenting the actual download links. If you want to download Apache OpenOffice, go to the alternative
+  <a href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/">download page</a>, and you will skip this page. Our
+  apologies for the inconvenience.</p></div>
+</noscript>
+
+<script type="text/javascript">
+  <!--
+  if ( BETA_ACTIVE ) {
+	// Beta Release online
+	document.write( "<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>"
+	+ "<li><h3><a href='#source' title='Source code tarballs'>Source code tarballs</a></h3></li>"
+	+ "<li><h3><a href='#source' title='Release notes'>Release notes</a></h3></li>"
+	+ "<li><h3><a href='checksums.html' title='How to verify the downloaded file?'>"
+	+ "How to verify the downloaded file?</a></h3></li>"
+	+ "<li><h3><a href='../porting/index.html'"
+	+ "title='Looking for portable version, Solaris, OS/2, FreeBSD, Linux with glibc 2.5?'>"
+	+ "Looking for portable version, Solaris, OS/2, FreeBSD, Linux with glibc 2.5?</a></h3></li>"
+	+ "<li><h3><a href='#notes'  title='Use Apache mirrors to download Apache OpenOffice'>"
+	+ "Alternative download mirrors</a></h3></li>"
+	+ "<li><h3><a href='#notes'  title='Please read the important notes before downloading and using Apache OpenOffice'>"
+	+ "Important Notes</a></h3></li>"
+	+ "</ul>"
+	+ "<br />"
+
+	+ "<hr style='display: block;' />"
+	+ "<div class='largetable'>"
+	+ "<h3 id='aoo'>Apache OpenOffice " + BETA_NAME + " - Full installation sets and language packs</h3>"
+
+	+ "<h3>Full Installation vs. Language Pack</h3>"
+  
+	+ "<p>If you want to use more than a single language in Apache OpenOffice then it is recommended to use "
+	+ "<a href='http://wiki.openoffice.org/wiki/Languagepack' title='What is a language pack?'>language packs</a>. The "
+	+ "idea is to have a base language, e.g., English (US) and several other languages without a need to install for "
+	+ "every language a full installation. Due to this it has to be installed over a full installation with the same "
+	+ "version number and platform. The language can be changed via the menu \"Tools - Options - Language Settings - "
+	+ "Languages - User Interface\".</p>"
+
+	+ "<p>They are not integrated in the full installation file and it contains only resource files to show, e.g., "
+	+ "menus, dialogs, error messages in your favorite language - but there is no program logic. It may contain "
+	+ "translated Help content as well. Language packs are created only when also a full installation file is "
+	+ "available. In case it is not fully localized, some elements of the UI or help topics will display in English as "
+	+ "default language.</p>"
+
+	+ "<h3>Please check the integrity of the downloaded file</h3>"
+
+	+ "<p>It is recommended that you <a href='http://en.wikipedia.org/wiki/Checksum'"
+	+ "title='What means to verify the file integrity?'>verify the integrity</a> of the downloaded file. Available are "
+	+ "<a href='http://en.wikipedia.org/wiki/MD5' title='What is MD5?'>MD5</a> + "
+	+ "<a href='http://en.wikipedia.org/wiki/SHA256' title='What is SHA256?'>SHA256</a> hash values. "
+	+ "Here you have to create a <a href='http://en.wikipedia.org/wiki/Hash_function'"
+	+ "title='What is a hash value?'>hash value</a> of your downloaded, locally saved Apache OpenOffice file and "
+	+ "compare this with the hash value of the respective file in the table below.</p>"
+
+	+ "<p>We also provide <a href='http://en.wikipedia.org/wiki/Pretty_Good_Privacy' title='What is PGP?'>PGP</a> "
+	+ "signatures. To use this verfication you have to download the respective ASC file in the table "
+	+ "below and this <a href='https://people.apache.org/keys/group/openoffice.asc'"
+	+ "title='The KEYS file contains the PGP keys of the Apache OpenOffice Release Managers'>KEYS</a> file.</p>"
+
+	+ "<p>For more information and details how to do the integrity verification please read the guide: "
+	+ "<a href='checksums.html' title='How to verify the download with signatures and hash values?'>"
+	+ "How to verify the download with signatures and hash values?</a></p>" );
+	document.write( "<br />" );
+
+	write_table( 1 );
+
+	document.write( "</div>" );
+  } else {
+	// Beta Release coming soon
+	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>" );
+  }
+  -->
+</script>
+<br />
+
+<hr style="display: block;" />
+
+<h3 id="notes">Important Notes:</h3>
+
+<h3>Language is not listed</h3>
+
+<p>If your language is not listed here then this means the translation is not yet completed. Our translations are all done
+by volunteers, by OpenOffice users like yourself. If you are interested in helping translate OpenOffice into your language,
+please see our <a href="http://openoffice.apache.org/translate.html" title="How to Help Translate Apache OpenOffice">
+How to Help Translate Apache OpenOffice</a> page.</p>
+
+<h3>Platform is not listed</h3>
+
+<p>If your operating system is not listed here, you are looking for a portale version, or you need a version for Solaris,
+OS/2, FreeBSD, Linux (32/64-bit) with glibc 2.5, please see our
+<a href="../porting/index.html">list of third-party ports and distributions</a>.</p>
+
+<h3>Alternative Download Mirrors</h3>
+
+<p>In the table above, installation files point to our main distribution site, that uses the
+<a href='http://sourceforge.net/'>SourceForge.net</a> mirror network. Additionally, all the installation files are also
+available on the <a href='http://www.apache.org/mirrors/ooo.html'>Apache mirrors</a>. Just search your
+<a href='http://www.apache.org/dyn/aoo-closer.cgi/openoffice/'>nearest mirror</a>.</p>
+
+<h3>Software Development Kit (SDK)</h3>
+
+<p>The <a href="sdk/index.html" title="For Developers and Power-Users: Apache OpenOffice SDK (AOO SDK)">
+Apache OpenOffice SDK (AOO SDK)</a> is an add-on for the office suite. It provides the necessary tools and documentation
+for programming the AOO APIs and creating own extensions (UNO components). If you want to use Apache OpenOffice without to
+plan any own extended functionality then you do not need to install the AOO SDK.</p>
+
+<h3>Source code</h3>
+
+<p>The <a href="source/index.html" title="For Developers and Power-Users: Apache OpenOffice source code">
+Apache OpenOffice source</a> contain the source code that was used to built the Apache OpenOffice releases from. Different
+compressed file formats are offered. Apache OpenOffice is licensed with the
+<a href="http://www.apache.org/licenses/LICENSE-2.0.html" title="Apache License v2">Apache License v2</a>. If you want to
+use Apache OpenOffice without to plan to build it from scratch then you do not need to download any of the source
+tarballs.</p>
+
+<h3><a href="notes.html" title="Please read the important notes before downloading and using Apache OpenOffice">
+More important notes</a></h3>
+
+<p class="footer"><small><a href="#" title="Go to the start of the page">Start of page</a></small></p>
+<br />
+
+<hr style="display: block;" />
+
+<h3>Report broken links</h3>
+
+<p>Please report any broken link or things you think that needs to be corrected on this webpage by sending a mail to:
+<a href="mailto:dev@openoffice.apache.org&#63;subject=Possible%20broken%20link&#58;%20from%20other.html"
+title="Development mailing list (to receive answers you need to be subscribed)">
+Development mailing list</a>.&nbsp;<b>*)</b></p>
+
+<h3>Where to get help when I have a problem?</h3>
+
+<p>If you encounter problems with installation or using Apache OpenOffice, please contact us via the following ways:</p>
+<ul>
+  <li><a href="mailto:users@openoffice.apache.org"
+  title="User's mailing list (to receive answers you need to be subscribed)">User's mailing list</a>&nbsp;<b>*)</b></li>
+  <li><a href="http://forum.openoffice.org" title="User forums (different languages)">
+  User forums (different languages)</a></li>
+  <li><a href="http://www.oooforum.org" title="Another user forums">Another user forums</a></li>
+</ul>
+<br />
+
+<p><b>*)</b> Please note that all mails go to a public mailing list, not an individual person. Mails will be archived and 
+can be accessed also by other users. To receive answers, you will need to subscribe to the mailing list before sending
+mails. For instructions, see: <a href="http://openoffice.apache.org/mailing-lists.html"
+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>
 
 
   </div>

Modified: websites/staging/ooo-site/trunk/content/download/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/download.js Mon Mar 10 15:00:48 2014
@@ -11,32 +11,25 @@
 /*
  * Define global variables
  */
-var LANG_ISO				= "";
-var LANG_ARRAY				= "";
-var LANG_NAME				= "";
-var RELEASE_MATRIX_PLATFORM_POS		= -1;
-var RELEASE_MATRIX_PLATFORM		= "";
-var UI_PLATFORM				= "";
-var URL_PLATFORM			= "";
-var FILENAME				= "";
-var FILESIZE				= 0;
-var EXTENSION				= "";
-var LINK				= "";
-var CHECKSUM_KEYS			= "";
-var CHECKSUM_ASC			= "";
-var CHECKSUM_MD5			= "";
-var CHECKSUM_SHA256			= "";
-var ERROR				= false;
-
-/*
- * Initialize the download script and set all global variables with data
- */
-function initializeDL() {
-	getLanguage();
-	getPlatform();
-	getFilesize();
-	getLink();
-}
+var LANG_ISO			= "";	 // The language as ISO code
+var LANG_ARRAY			= "";	 // This array contains all language specific data
+var RELEASE_MATRIX_PLATFORM_POS	= -1;	 // The position of the platform in the release matrix array
+var RELEASE_MATRIX_PLATFORM	= "";	 // The platform in the release matrix array
+var UI_PLATFORM			= "";	 // The platform as readable string
+var URL_PLATFORM		= "";	 // The platform as part of the download URL
+var OLD_PLATFORM		= false; // The browser platform is old (true) or not (false)
+var FILENAME			= "";	 // The complete filename of the download URL
+var FILESIZE			= 0;	 // The filesize of the download file
+var EXTENSION			= "";	 // The file extension of the download URL
+var LINK			= "";	 // The complete download URL
+var CHECKSUM_KEYS		= "";	 // The KEYS file as download URL
+var CHECKSUM_ASC		= "";	 // The ASC file as download URL
+var CHECKSUM_MD5		= "";	 // The MD5 file as download URL
+var CHECKSUM_SHA256		= "";	 // The SHA256 file as download URL
+var SOURCEFORGE			= false; // The download URL points to Soureforge
+var OTHER			= false; // The download URL points to 'other.html'
+var ARCHIVE			= false; // The download URL points to the ASF archive
+var ERROR			= false; // The download URL is correct (false) or not (true)?
 
 /*
  * Get array and ISO code for language
@@ -107,9 +100,8 @@ function getLanguage() {
 		thisLanguage = thisLanguageSet[ "-" ];
 	}
 
-	LANG_ISO	= language;
-	LANG_ARRAY	= thisLanguage;
-	LANG_NAME	= thisLanguage[ 2 ];
+	LANG_ISO   = language;
+	LANG_ARRAY = thisLanguage;
 }
 
 /*
@@ -129,105 +121,233 @@ function hasMirrorLink() {
  * Get link to mirror system for download file and checksum file
  * Depends on array-list
  */
-function getLink() {
+function getLink( rel_mode ) {
 	var chk_link = "";
 
 	getLanguage();
-	hasMirrorLink();
 	getPlatform();
-	getFilesize();
-
+	if ( hasMirrorLink() ) {
+		getFilesize( rel_mode );
+	}
+	/*
 	if ( NL_LANGUAGE == "" )
 		NL_LANGUAGE = LANG_ISO;
-
+	*/
 	/*
 	Trim timestamp from version, required for RC
 	if ( version.indexOf( "_" ) > -1 )
 		version = version.split( "_" )[0];
 	*/
 
+	// If language is supported, then provide a download link. 
 	if ( hasMirrorLink() ) {
-		if ( URL_PLATFORM == "" ) {
-			// If no platform was recognized, set the "other.html" webpage as alternative download URL
-			if ( UI_PLATFORM == "" ) {
-				UI_PLATFORM = "an unknown platform/OS";
+		// Release mode
+		if ( rel_mode == 0 ) {
+			// If platform is too old, then provide a general download link to the archive.
+			if ( OLD_PLATFORM ) {
+				// If platform is Mac OS X <=10.6, then provide a download link with previous AOO version.
+				if ( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
+
+					FILENAME	= "Apache_OpenOffice_" + PRE_VERSION + "_" + URL_PLATFORM + "_";
+					FILENAME	= FILENAME + LANG_ISO + EXTENSION;
+					LINK		= SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME;
+					LINK		= LINK + "/download";
+
+					chk_link	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
+					chk_link	= chk_link + FILENAME;
+
+					CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
+					CHECKSUM_ASC	= chk_link + ".asc";
+					CHECKSUM_MD5	= chk_link + ".md5";
+					CHECKSUM_SHA256	= chk_link + ".sha256";
+
+					SOURCEFORGE	= false;
+					OTHER		= false;
+					ARCHIVE		= true;
+					ERROR		= true;
+					return LINK;
+				}
+				// If platform is Solaris, FreeBSD or OS/2,
+				// then provide a download link to the porting webpage.
+				if ( UI_PLATFORM == "Solaris x86 (PKG)"   ||
+				     UI_PLATFORM == "Solaris SPARC (PKG)" ||
+				     UI_PLATFORM == "FreeBSD (PKG)"       ||
+				     UI_PLATFORM == "OS/2" ) {
+
+					LINK		= "http://www.openoffice.org/porting/index.html";
+
+					SOURCEFORGE	= false;
+					OTHER		= true;
+					ARCHIVE		= false;
+					ERROR		= true;
+					return LINK;
+				}
+				LINK		= "http://archive.apache.org/dist/openoffice/";
+
+				CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
+				CHECKSUM_ASC	= "http://archive.apache.org/dist/openoffice/";
+				CHECKSUM_MD5	= "http://archive.apache.org/dist/openoffice/";
+				CHECKSUM_SHA256	= "http://archive.apache.org/dist/openoffice/";
+
+				SOURCEFORGE	= false;
+				OTHER		= true;
+				ARCHIVE		= false;
+				ERROR		= true;
+				return LINK;
 			}
-			LINK  = "http://www.openoffice.org/download/other.html";
-			ERROR = true;
-			return LINK;
-		} else {
-			// If platform was recognized, get the download filename and checksum filename
+			// If no platform was recognized, then provide a general download link to the "other.html" webpage.
+			if ( URL_PLATFORM == "" ) {
+				// If no UI string was set, then show it to the user.
+				if ( UI_PLATFORM == "" ) {
+					UI_PLATFORM = "unknown platform/OS";
+				}
+				LINK		= "http://www.openoffice.org/download/other.html";
+
+				SOURCEFORGE	= false;
+				OTHER		= true;
+				ARCHIVE		= false;
+				ERROR		= true;
+				return LINK;
+			}
+
+			// If platform was recognized, assemble the filenames for download and checksums
 
-			// FILENAME	= "Apache_OpenOffice_" + VERSION + "_" + URL_PLATFORM + "_" + NL_LANGUAGE;
+			// FILENAME	= "Apache_OpenOffice_" + VERSION + "_" + URL_PLATFORM + "_" + LANG_ISO;
 			// FILENAME	= FILENAME + EXTENSION;
 
 			// Assign the file name (column 3) from the release matrix of language and platform
 			FILENAME	= release_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
 
-			// LINK		= SOURCEFORGE_BASE_URL + NL_LANGUAGE + "/Apache_OpenOffice_" + VERSION + "_";
-			// LINK		= LINK + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION + "/download";
-			LINK		= SOURCEFORGE_BASE_URL + NL_LANGUAGE + "/" + FILENAME + "/download";
-
-			// chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_";
-			// chk_link	= chk_link + VERSION + "_" + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
-			chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + NL_LANGUAGE + "/" + FILENAME;
+			// LINK	= SOURCEFORGE_BASE_URL + LANG_ISO + "/Apache_OpenOffice_" + VERSION + "_";
+			// LINK	= LINK + URL_PLATFORM + "_" + LANG_ISO + EXTENSION + "/download";
+			LINK		= SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME + "/download";
+
+			// chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/Apache_OpenOffice_";
+			// chk_link	= chk_link + VERSION + "_" + URL_PLATFORM + "_" + LANG_ISO + EXTENSION;
+			chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME;
+
+			CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
+			CHECKSUM_ASC	= chk_link + ".asc";
+			CHECKSUM_MD5	= chk_link + ".md5";
+			CHECKSUM_SHA256	= chk_link + ".sha256";
+
+			/*
+			// Used for debugging
+			LINK		= PEOPLE_BASE_URL + "/binaries/" + LANG_ISO + "/Apache_OpenOffice_";
+			LINK		= LINK + "/Apache_OpenOffice_" + "_" + LANG_ISO + EXTENSION;
+			chk_link	= PEOPLE_BASE_URL + "/binaries/" + LANG_ISO + "/Apache_OpenOffice_" + VERSION;
+			chk_link	= chk_link + "_" + URL_PLATFORM + "_" + LANG_ISO + EXTENSION;
+			*/
+
+			SOURCEFORGE	= true;
+			OTHER		= false;
+			ARCHIVE		= false;
+			ERROR		= false;
+			return LINK;
+		} else {
+			// Beta release mode
+
+			// If platform is too old, then provide a general download link to the archive.
+			if ( OLD_PLATFORM ) {
+				// If platform is Mac OS X <=10.6, then provide a download link with previous AOO version.
+				if ( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
+
+					FILENAME	= "Apache_OpenOffice_" + PRE_VERSION + "_" + URL_PLATFORM + "_";
+					FILENAME	= FILENAME + LANG_ISO + EXTENSION;
+					LINK		= SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME;
+					LINK		= LINK + "/download";
+
+					chk_link	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
+					chk_link	= chk_link + FILENAME;
+
+					CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
+					CHECKSUM_ASC	= chk_link + ".asc";
+					CHECKSUM_MD5	= chk_link + ".md5";
+					CHECKSUM_SHA256	= chk_link + ".sha256";
+
+					SOURCEFORGE	= false;
+					OTHER		= false;
+					ARCHIVE		= true;
+					ERROR		= true;
+					return LINK;
+				}
+				LINK	= "http://www.openoffice.org/download/all_beta.html";
+
+				SOURCEFORGE	= false;
+				OTHER		= true;
+				ARCHIVE		= false;
+				ERROR		= true;
+				return LINK;
+			}
+			// Assign the file name (column 3) from the release matrix of language and platform
+			FILENAME	= release_matrix_beta[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
+
+			// LINK	= SOURCEFORGE_BASE_URL_BETA + LANG_ISO + "/Apache_OpenOffice_Beta_" + VERSION + "_";
+			// LINK	= LINK + URL_PLATFORM + "_" + LANG_ISO + EXTENSION + "/download";
+			LINK		= SOURCEFORGE_BASE_URL_BETA + LANG_ISO + "/" + FILENAME + "/download";
+
+			// chk_link	= APACHE_DIST_BASE_URL_BETA + "/binaries/" + LANG_ISO;
+			// chk_link	= chk_link + "/Apache_OpenOffice_Beta_" + VERSION + "_" + URL_PLATFORM + "_";
+			// chk_link	= chk_link + LANG_ISO + EXTENSION;
+			chk_link	= APACHE_DIST_BASE_URL_BETA + "/binaries/" + LANG_ISO + "/" + FILENAME;
+//			chk_link	= SOURCEFORGE_BASE_URL_BETA + LANG_ISO + "/" + FILENAME;
 
 			CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
 			CHECKSUM_ASC	= chk_link + ".asc";
 			CHECKSUM_MD5	= chk_link + ".md5";
 			CHECKSUM_SHA256	= chk_link + ".sha256";
 		}
+		SOURCEFORGE	= true;
+		OTHER		= false;
+		ARCHIVE		= false;
+		ERROR		= false;
  		return LINK;
-
-		/*
-		Used for debugging
-		LINK		= PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_";
-		LINK		= LINK + "/Apache_OpenOffice_" + "_" + NL_LANGUAGE + EXTENSION;
-		chk_link	= PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_" + VERSION;
-		chk_link	= chk_link + "_" + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
-		return LINK;
-		 */
 	} else {
-		ERROR = true;
-		return false;
+		// Release mode
+		if ( rel_mode == 0 ) {
+			// If language is not supported, then provide the link from the Native Language (NL) group.
+			LINK	= LANG_ARRAY[ 4 ];
+		} else {
+			// Beta release mode
+			// If language is not supported, then provide the "all_beta.html" as download link.
+			LINK	= "http://www.openoffice.org/download/all_beta.html";
+		}
+		ERROR	= true;
+ 		return LINK;
 	}
 }
 
 /*
  * Get platform of browser
- * Depending on internal browser data
+ * Depends on internal browser data
  */
 function getPlatform() {
 	// For more help or data see: "http://www.useragentstring.com"
 
-	var os	= navigator.platform.toLowerCase();
-	var ua	= navigator.userAgent.toLowerCase();
-	var av	= navigator.appVersion.toLowerCase();
+	var os = navigator.platform.toLowerCase();
+	var ua = navigator.userAgent.toLowerCase();
+	var av = navigator.appVersion.toLowerCase();
 
 	// Add ECMA262-5 Array methods if not supported natively
 	// To workaround that MSIE 8 and older do not support this function
 	if ( !( 'indexOf' in Array.prototype ) ) {
-	  Array.prototype.indexOf= function( find, i /*opt*/ ) {
-	    if ( i === undefined )
-	      i = 0;
-	    if ( i < 0 )
-	      i+= this.length;
-	    if ( i < 0 )
-	      i = 0;
-	    for ( var n = this.length; i < n; i++ ) {
-	      if ( i in this && this[ i ] === find )
-		return i;
-	    }
-	    return -1;
-	  };
+		Array.prototype.indexOf= function( find, i /*opt*/ ) {
+			if ( i === undefined )
+				i = 0;
+			if ( i < 0 )
+				i+= this.length;
+			if ( i < 0 )
+				i = 0;
+			for ( var n = this.length; i < n; i++ ) {
+				if ( i in this && this[ i ] === find )
+					return i;
+			}
+			return -1;
+		};
 	}
 
 	if ( os ) {
-
-	  // Recognized but not supported platforms / OS, set $UI_PLATFORM to show it to the user
-	  if ( os.indexOf( "sunos"		) != -1 ) {	UI_PLATFORM	= "Solaris x86 (PKG)";
-	    if ( ua.indexOf( "sun4u"		) != -1 )	UI_PLATFORM	= "Solaris SPARC (PKG)";
-	  }
+	  // Recognized but not supported platforms/OS, set $UI_PLATFORM to show it to the user.
 	  if ( os.indexOf( "os/2"		) != -1 )	UI_PLATFORM	= "OS/2";
 	  if ( os.indexOf( "freebsd"		) != -1 )	UI_PLATFORM	= "FreeBSD (PKG)";
 	  if ( os.indexOf( "openbsd"		) != -1 )	UI_PLATFORM	= "OpenBSD";
@@ -241,12 +361,18 @@ function getPlatform() {
 	  if ( os.indexOf( "vms"		) != -1 )	UI_PLATFORM	= "OpenVMS";
 	  if ( os.indexOf( "alphaserver"	) != -1 )	UI_PLATFORM	= "AlphaServer";
 	  if ( os.indexOf( "qnx"		) != -1 )	UI_PLATFORM	= "QNX";
-	  if ( os.indexOf( "x11"		) != -1 )	UI_PLATFORM	= "an unknown OS (X11 support)";
-
+	  if ( os.indexOf( "x11"		) != -1 )	UI_PLATFORM	= "unknown OS (X11 support)";
 	  if ( os.indexOf( "arm"		) != -1 )	UI_PLATFORM	= "ARM mobile devices";
-
+	  if ( os.indexOf( "sunos"		) != -1 ) {	UI_PLATFORM	= "Solaris x86 (PKG)";
+								OLD_PLATFORM	= true;
+	  }
+	  if ( ua.indexOf( "sun4u"		) != -1 ) {	UI_PLATFORM	= "Solaris SPARC (PKG)";
+								OLD_PLATFORM	= true;
+	  }
 	  if ( ua.indexOf( "ppc"		) != -1 ||
-	       ua.indexOf( "power_pc"		) != -1 )	UI_PLATFORM	= "Mac OS PPC (DMG)";
+	       ua.indexOf( "power_pc"		) != -1 ) {	UI_PLATFORM	= "Mac OS PPC (DMG)";
+								OLD_PLATFORM	= true;
+	  }
 	  if ( ua.indexOf( "iphone"		) != -1 ||
 	       ua.indexOf( "ipad"		) != -1 ||
 	       ua.indexOf( "ipod"		) != -1	)	UI_PLATFORM	= "Apple iPhone/iPad/iPod";
@@ -265,16 +391,14 @@ function getPlatform() {
 	  if ( ua.indexOf( "widerweb"		) != -1 )	UI_PLATFORM	= "mobile phones (WiderWeb)";
 	  if ( ua.indexOf( "brew"		) != -1 )	UI_PLATFORM	= "smartphones (BREW)";
 	  if ( ua.indexOf( "hiptop"		) != -1 )	UI_PLATFORM	= "smartphones (Hiptop)";
-
 	  if ( ua.indexOf( "playstation"	) != -1 )	UI_PLATFORM	= "Sony Playstation";
 	  if ( ua.indexOf( "psp"		) != -1 )	UI_PLATFORM	= "Sony Playstation Portable";
 	  if ( ua.indexOf( "nintendo"		) != -1 )	UI_PLATFORM	= "Nintendo game console";
 	  if ( ua.indexOf( "wii"		) != -1 )	UI_PLATFORM	= "Nintendo Wii game console";
 
-	  // If the $UI_PLATFORM variable is already filled, then something was recognized and no more work is need
-	  if ( UI_PLATFORM ) {
-	    return;
-	  }
+	  // If the $UI_PLATFORM variable is already filled, then something was recognized and no more work is need.
+	  if ( UI_PLATFORM != "" )
+		return;
 
 	  // Windows, x86 or mobile?
 	  if ( os.indexOf( "windows"		) != -1 ||
@@ -285,50 +409,61 @@ function getPlatform() {
 		 ua.indexOf( "mobile"		) != -1 )	UI_PLATFORM	= "Windows Mobile device";
 	  }
 
-	  // Linux, x86 or x86_64, DEB or RPM?
+	  // Linux, x86 or x86-64, DEB or RPM?
 	  if ( os.indexOf( "linux"		) != -1 ) {
-	    // 32-bit, DEB or RPM?
-	    if ( os.indexOf( "x86"		) != -1 ||
-		 os.indexOf( "i686"		) != -1 ||
-		 os.indexOf( "i586"		) != -1 ||
-		 os.indexOf( "i486"		) != -1 ||
-		 os.indexOf( "i386"		) != -1 ) {	UI_PLATFORM	= "Linux 32-bit (RPM)";
+		// 32-bit, DEB or RPM?
+		if ( os.indexOf( "x86"		) != -1 ||
+		     os.indexOf( "i686"		) != -1 ||
+		     os.indexOf( "i586"		) != -1 ||
+		     os.indexOf( "i486"		) != -1 ||
+		     os.indexOf( "i386"		) != -1 ) {	UI_PLATFORM	= "Linux 32-bit (RPM)";
 								URL_PLATFORM	= "Linux_x86_install-rpm";
 								EXTENSION	= ".tar.gz";
-	      if ( ua.indexOf( "debian"		) != -1 ||
-		   ua.indexOf( "ubuntu"		) != -1 ||
-		   ua.indexOf( "iceweasel"	) != -1 ) {	UI_PLATFORM	= "Linux Debian 32-bit (DEB)";
+		     if ( ua.indexOf( "debian"    ) != -1 ||
+			  ua.indexOf( "ubuntu"    ) != -1 ||
+			  ua.indexOf( "iceweasel" ) != -1 ) {	UI_PLATFORM	= "Linux Debian 32-bit (DEB)";
 								URL_PLATFORM	= "Linux_x86_install-deb";
 								EXTENSION	= ".tar.gz";
-	      }
-	    }
-	    // 64-bit, DEB or RPM?
-	    if ( os.indexOf( "_64"		) != -1 ||
-		 os.indexOf( "-64"		) != -1 ||
-		 os.indexOf( "x64"		) != -1 ||
-		 os.indexOf( "amd64"		) != -1 ) {	UI_PLATFORM	= "Linux 64-bit (RPM)";
+		     }
+		}
+		// 64-bit, DEB or RPM?
+		if ( os.indexOf( "_64"		) != -1 ||
+		     os.indexOf( "-64"		) != -1 ||
+		     os.indexOf( "x64"		) != -1 ||
+		     os.indexOf( "amd64"	) != -1 ) {	UI_PLATFORM	= "Linux 64-bit (RPM)";
 								URL_PLATFORM	= "Linux_x86-64_install-rpm";
 								EXTENSION	= ".tar.gz";
-	      if ( ua.indexOf( "debian"		) != -1 ||
-		   ua.indexOf( "ubuntu"		) != -1 ||
-		   ua.indexOf( "iceweasel"	) != -1 ) {	UI_PLATFORM	= "Linux Debian 64-bit (DEB)";
+		     if ( ua.indexOf( "debian"	  ) != -1 ||
+		          ua.indexOf( "ubuntu"	  ) != -1 ||
+		          ua.indexOf( "iceweasel" ) != -1 ) {	UI_PLATFORM	= "Linux Debian 64-bit (DEB)";
 								URL_PLATFORM	= "Linux_x86-64_install-deb";
 								EXTENSION	= ".tar.gz";
-	      }
-	    }
+		     }
+		}
 	  }
 
-	  // OS X x86?
-	  if ( os.indexOf( "mac"		) != -1 ) {	UI_PLATFORM	= "OS X 32-bit Intel (DMG)";
+	  // Mac OS X?
+	  if ( os.indexOf( "mac"		) != -1 ) {	UI_PLATFORM	= "OS X 64-bit Intel (DMG)";
 								URL_PLATFORM	= "MacOS_x86_install";
 								EXTENSION	= ".dmg";
+		// OS X is 10.6 or older?
+		if ( ua.indexOf( "10.6"		) != -1 ||
+		     ua.indexOf( "10_6"		) != -1 ||
+		     ua.indexOf( "10.5"		) != -1 ||
+		     ua.indexOf( "10_5"		) != -1 ||
+		     ua.indexOf( "10.4"		) != -1 ||
+		     ua.indexOf( "10_4"		) != -1 ||
+		     ua.indexOf( "10.3"		) != -1 ||
+		     ua.indexOf( "10_3"		) != -1 ) {	UI_PLATFORM	= "Mac OS X (10.6 or older)";
+								OLD_PLATFORM	= true;
+		}
 	  } 
 	} 
 
 	// If nothing was recognized until now, set $UI_PLATFORM to show it to the user
-	if ( ! UI_PLATFORM ) {
-		ERROR = true;
-		UI_PLATFORM = "an unknown platform/OS";
+	if ( UI_PLATFORM == "" ) {
+		UI_PLATFORM = "unknown platform/OS";
+		ERROR	    = true;
 	}
 	return;
 }
@@ -337,7 +472,7 @@ function getPlatform() {
  * Get file size for download file
  * Depends on array-list
  */
-function getFilesize() {
+function getFilesize( rel_mode ) {
 	// Depending on $URL_PLATFORM assign the platform position of the release matrix
 	switch ( URL_PLATFORM ) {
 		case "Linux_x86-64_install-deb":
@@ -352,7 +487,7 @@ function getFilesize() {
 		case "Linux_x86_install-rpm":
 			RELEASE_MATRIX_PLATFORM_POS = 5;
 			break;
-		case "MacOS_x86_install":
+		case "MacOS_x86-64_install":
 			RELEASE_MATRIX_PLATFORM_POS = 8;
 			break;
 		case "Win_x86_install":
@@ -364,14 +499,22 @@ function getFilesize() {
 
 	// If a platform was found and no error occurred, assign the array data and filesize from the release matrix
 	if ( RELEASE_MATRIX_PLATFORM_POS > -1 && !ERROR ) {
-		// Assign all values from the release matrix of language and platform
-		RELEASE_MATRIX_PLATFORM		= release_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ];
-
-		// Assign the file size (column 2) from the release matrix of language and platform
-		FILESIZE			= release_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 2 ];
+		if ( rel_mode == 0 ) {
+			// Release mode
+			// Assign all values from the release matrix of language and platform
+			RELEASE_MATRIX_PLATFORM	= release_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ];
+			// Assign the file size (column 2) from the release matrix of language and platform
+			FILESIZE		= release_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 2 ];
+		} else {
+			// Beta release mode
+			// Assign all values from the release matrix of language and platform
+			RELEASE_MATRIX_PLATFORM	= release_matrix_beta[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ];
+			// Assign the file size (column 2) from the release matrix of language and platform
+			FILESIZE		= release_matrix_beta[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 2 ];
+		}
 	} else {
-		ERROR				= true;
-		FILESIZE			= 0;
+		ERROR	 = true;
+		FILESIZE = 0;
 	}
 
 	return FILESIZE;

Modified: websites/staging/ooo-site/trunk/content/download/download_other.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download_other.js (original)
+++ websites/staging/ooo-site/trunk/content/download/download_other.js Mon Mar 10 15:00:48 2014
@@ -22,28 +22,57 @@ var LANG_MAX		= 133;	// The maximal avai
  * Define base variables
  * The main entry for writting the table into the webpage 
  */
-function write_table() {
-	var AOO		= "Apache_OpenOffice_";
-	var AOO_SDK	= "Apache_OpenOffice-SDK_";
-	var AOO_SRC	= "/source/apache-openoffice-" + VERSION + "-" + SVN_REV + "-src";
-	var URL_AOO	= SOURCEFORGE_BASE_URL;
-	var URL_SDK	= SOURCEFORGE_BASE_URL + "SDK/Apache_OpenOffice-SDK_" + VERSION;
-	var URL_SRC	= APACHE_DIST_BASE_URL + AOO_SRC;
+function write_table( rel_mode ) {
+	if ( rel_mode == 0 ) {
+		// Release mode
+		var AOO		= "Apache_OpenOffice_";
+		var AOO_SDK	= "Apache_OpenOffice-SDK_";
+		var AOO_SRC	= "/source/apache-openoffice-" + VERSION + "-" + SVN_REV + "-src";
+		var URL_AOO	= SOURCEFORGE_BASE_URL;
+		var URL_SDK	= SOURCEFORGE_BASE_URL + "SDK/" + AOO_SDK + VERSION;
+		var URL_SRC	= APACHE_DIST_BASE_URL + AOO_SRC;
+		var URL_HASH	= APACHE_DIST_BASE_URL;
 
 // Debug: Uncomment to use different base URLs
 /*
-	var URL_AOO	= PEOPLE_BASE_URL + "/binaries/";
-	var URL_SDK	= PEOPLE_BASE_URL + "/binaries/SDK/Apache_OpenOffice-SDK_" + VERSION;
-	var URL_SRC	= PEOPLE_BASE_URL + "/source/" + AOO_SRC + VERSION + "-" + SVN_REV;
+		var URL_AOO	= PEOPLE_BASE_URL + "/binaries/";
+		var URL_SDK	= PEOPLE_BASE_URL + "/binaries/SDK/" + AOO_SDK + VERSION;
+		var URL_SRC	= PEOPLE_BASE_URL + "/source/" + AOO_SRC + VERSION + "-beta-" + SVN_REV + "-src";
 */
-	var URL_HASH	= APACHE_DIST_BASE_URL;
+
+	} else {
+		// Beta release mode
+		BETA_VERSION	= "4.1.0";
+		VERSION		= BETA_VERSION;
+		SVN_REV		= BETA_SVN_REV;
+		PLATFORM	= BETA_PLATFORM;
+		FULL_LANG	= BETA_FULL_LANG;
+		LP_LANG		= BETA_LP_LANG;
+		SDK_LANG	= BETA_SDK_LANG;
+		var AOO		= "Apache_OpenOffice_Beta_";
+		var AOO_SDK	= "Apache_OpenOffice_Beta-SDK_";
+		var AOO_SRC	= "source/apache-openoffice-" + BETA_VERSION + "-beta-" + SVN_REV + "-src";
+		var URL_AOO	= SOURCEFORGE_BASE_URL_BETA;
+		var URL_SDK	= SOURCEFORGE_BASE_URL_BETA + "SDK/" + AOO_SDK + BETA_VERSION;
+//		var URL_SRC	= APACHE_DIST_BASE_URL_BETA + AOO_SRC;
+		var URL_SRC	= "http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/" + BETA_VERSION + "-beta/" + AOO_SRC;
+		var URL_HASH	= APACHE_DIST_BASE_URL_BETA;
+//		var URL_HASH	= "http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/" + BETA_VERSION + "-beta/";
+
+// Debug: Uncomment to use different base URLs
+/*
+		var URL_AOO	= PEOPLE_BASE_URL + "/binaries/";
+		var URL_SDK	= PEOPLE_BASE_URL + "/binaries/SDK/" + AOO_SDK + BETA_VERSION;
+		var URL_SRC	= PEOPLE_BASE_URL + "/source/" + AOO_SRC + BETA_VERSION + "-beta-" + SVN_REV + "-src";
+*/
+	}
 
 	document.write( "<table class='builds' cellpadding='2' cellspacing='2'>" );
 
-	write_header( 1 );
+	write_header( rel_mode, 1 );
 	document.write( "<tbody>" );
-	write_lang( URL_AOO,                   URL_HASH,          PLATFORM, FULL_LANG, LP_LANG, VERSION, AOO     );
-	write_sdk(           URL_SDK, URL_SRC, URL_HASH, AOO_SRC, PLATFORM, SDK_LANG,           VERSION, AOO_SDK );
+	write_lang( rel_mode, URL_AOO,                   URL_HASH,          PLATFORM, FULL_LANG, LP_LANG, VERSION, AOO     );
+	write_sdk(  rel_mode,          URL_SDK, URL_SRC, URL_HASH, AOO_SRC, PLATFORM, SDK_LANG,           VERSION, AOO_SDK );
 	write_top();
 
 	document.write( "</tbody>" );
@@ -79,7 +108,7 @@ function write_top() {
 /*
  * This writes the header row with the OS headlines
  */
-function write_header( FIRST_HEADER ) {
+function write_header( rel_mode, FIRST_HEADER ) {
 	// Add ECMA262-5 Array methods if not supported natively
 	// To workaround that MSIE 8 and older do not support this function
 	if ( !( 'indexOf' in Array.prototype ) ) {
@@ -121,15 +150,23 @@ function write_header( FIRST_HEADER ) {
 		document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "Linux      <br />x86-64<br />RPM" + SMALL2 + "</span></th>" );
 	if ( PLATFORM.indexOf( "Linux_x86-64_deb" ) > -1 )
 		document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "Linux      <br />x86-64<br />DEB" + SMALL2 + "</span></th>" );
-	if ( PLATFORM.indexOf( "MacOS_x86" ) > -1 )
-		document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "OS&nbsp;X<br />Intel <br />DMG" + SMALL2 + "</span></th>" );
+	if ( rel_mode == 0 ) {
+		// Release mode
+		if ( PLATFORM.indexOf( "MacOS_x86" ) > -1 )
+			document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "OS&nbsp;X  <br />Intel <br />DMG" + SMALL2 + "</span></th>" );
+	} else {
+		// Beta release mode
+		PLATFORM = BETA_PLATFORM;
+		if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
+			document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "OS&nbsp;X  <br />x86-64<br />DMG" + SMALL2 + "</span></th>" );
+	}
 	document.write( "</tr></thead>" );
 }
 
 /*
  * This writes the build rows (full install, langpack, SDK)
  */
-function write_build( URL_AOO, URL_HASH, PLATFORM, INSTALL_LANG, i, k, VERSION, AOO, TYPE ) {
+function write_build( rel_mode, URL_AOO, URL_HASH, PLATFORM, INSTALL_LANG, i, k, VERSION, AOO, TYPE ) {
 	// Show the checksum links in smaller font size than the binary links
 	var SMALL = "style='font-size: x-small'";
 
@@ -156,80 +193,100 @@ function write_build( URL_AOO, URL_HASH,
 	if ( URL_AOO.indexOf( "SDK" ) < 0 ) {
 		// Write download links for binary builds and its checksums
 		if ( PLATFORM.indexOf( "Win_x86" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe'><b>exe</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe/download'><b>exe</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe.sha256'>SHA256</a></td>" );
 		}
 		if ( PLATFORM.indexOf( "Linux_x86_rpm" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz'><b>rpm</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz/download'><b>rpm</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.sha256'>SHA256</a></td>" );
 		}
 		if ( PLATFORM.indexOf( "Linux_x86_deb" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz'><b>deb</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz/download'><b>deb</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.sha256'>SHA256</a></td>" );
 		}
 		if ( PLATFORM.indexOf( "Linux_x86-64_rpm" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz'><b>rpm</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz/download'><b>rpm</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.sha256'>SHA256</a></td>" );
 		}
 		if ( PLATFORM.indexOf( "Linux_x86-64_deb" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz'><b>deb</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz/download'><b>deb</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.sha256'>SHA256</a></td>" );
 		}
-		if ( PLATFORM.indexOf( "MacOS_x86" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86_"    + TYPE          + "_" + INSTALL_LANG[ k ] + ".dmg'><b>dmg</b></a><br /><br />" );
-			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86_"    + TYPE          + "_" + INSTALL_LANG[ k ] + ".dmg.asc'>ASC</a>" );
-			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86_"    + TYPE          + "_" + INSTALL_LANG[ k ] + ".dmg.md5'>MD5</a><br />" );
-			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86_"    + TYPE          + "_" + INSTALL_LANG[ k ] + ".dmg.sha256'>SHA256</a></td>" );
+		if ( rel_mode == 0 ) {
+			// Release mode
+			if ( PLATFORM.indexOf( "MacOS_x86" ) > -1 ) {
+				document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86_"    + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg/download'><b>dmg</b></a><br /><br />" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86_"    + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.asc'>ASC</a>" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86_"    + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.md5'>MD5</a><br />" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86_"    + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.sha256'>SHA256</a></td>" );
+			}
+		} else {
+			// Beta release mode
+			if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 ) {
+				document.write( "<td style='text-align: center'><a href='"              + URL_AOO                 + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg/download'><b>dmg</b></a><br /><br />" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.asc'>ASC</a>" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.md5'>MD5</a><br />" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/" + INSTALL_LANG[ k ] + "/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.sha256'>SHA256</a></td>" );
+			}
 		}
 	} else {
-
-
 		// Write download links for SDK builds and its checksums
 		if ( PLATFORM.indexOf( "Win_x86" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe'><b>exe</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe/download'><b>exe</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Win_x86_"      + TYPE          + "_" + INSTALL_LANG[ k ] + ".exe.sha256'>SHA256</a></td>" );
 		}
 		if ( PLATFORM.indexOf( "Linux_x86_rpm" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz'><b>rpm</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz/download'><b>rpm</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.sha256'>SHA256</a></td>" );
 		}
 		if ( PLATFORM.indexOf( "Linux_x86_deb" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz'><b>deb</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz/download'><b>deb</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86_"    + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.sha256'>SHA256</a></td>" );
 		}
 		if ( PLATFORM.indexOf( "Linux_x86-64_rpm" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz'><b>rpm</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz/download'><b>rpm</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-rpm" + "_" + INSTALL_LANG[ k ] + ".tar.gz.sha256'>SHA256</a></td>" );
 		}
 		if ( PLATFORM.indexOf( "Linux_x86-64_deb" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz'><b>deb</b></a><br /><br />" );
+			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz/download'><b>deb</b></a><br /><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.asc'>ASC</a>" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.md5'>MD5</a><br />" );
 			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_Linux_x86-64_" + TYPE + "-deb" + "_" + INSTALL_LANG[ k ] + ".tar.gz.sha256'>SHA256</a></td>" );
 		}
-		if ( PLATFORM.indexOf( "MacOS_x86" ) > -1 ) {
-			document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_MacOS_x86_"    + TYPE          + "_" + INSTALL_LANG[ k ] + ".dmg'><b>dmg</b></a><br /><br />" );
-			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_MacOS_x86_"    + TYPE          + "_" + INSTALL_LANG[ k ] + ".dmg.asc'>ASC</a>" );
-			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_MacOS_x86_"    + TYPE          + "_" + INSTALL_LANG[ k ] + ".dmg.md5'>MD5</a><br />" );
-			document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_MacOS_x86_"    + TYPE          + "_" + INSTALL_LANG[ k ] + ".dmg.sha256'>SHA256</a></td>" );
+		if ( rel_mode == 0 ) {
+			// Release mode
+			if ( PLATFORM.indexOf( "MacOS_x86" ) > -1 ) {
+				document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_MacOS_x86_"    + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg/download'><b>dmg</b></a><br /><br />" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_MacOS_x86_"    + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.asc'>ASC</a>" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_MacOS_x86_"    + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.md5'>MD5</a><br />" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_MacOS_x86_"    + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.sha256'>SHA256</a></td>" );
+			}
+		} else {
+			// Beta release mode
+			if ( PLATFORM.indexOf( "MacOS_x86-64" ) > -1 ) {
+				document.write( "<td style='text-align: center'><a href='"              + URL_AOO  +                                    "_MacOS_x86-64_" + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg/download'><b>dmg</b></a><br /><br />" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.asc'>ASC</a>" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.md5'>MD5</a><br />" );
+				document.write( "                               <a " + SMALL + "href='" + URL_HASH + "/binaries/SDK/" + AOO + VERSION + "_MacOS_x86-64_" + TYPE  + "_" + INSTALL_LANG[ k ] + ".dmg.sha256'>SHA256</a></td>" );
+			}
 		}
 	}
 
@@ -239,7 +296,7 @@ function write_build( URL_AOO, URL_HASH,
 	ROW_COUNT++;
 	if ( ROW_COUNT == 9 ) {
 		write_top();
-		write_header( 0 );
+		write_header( rel_mode, 0 );
 		ROW_COUNT = 1;
 	}
 }
@@ -247,7 +304,7 @@ function write_build( URL_AOO, URL_HASH,
 /*
  * This writes the English and native name of a language and all download links
  */
-function write_lang( URL_AOO, URL_HASH, PLATFORM, FULL_LANG, LP_LANG, VERSION, AOO ) {
+function write_lang( rel_mode, URL_AOO, URL_HASH, PLATFORM, FULL_LANG, LP_LANG, VERSION, AOO ) {
 	ROW_COUNT	= 1;
 	FULL_LANG_COUNT	= 1;
 	LP_LANG_COUNT	= 1;
@@ -268,7 +325,7 @@ function write_lang( URL_AOO, URL_HASH, 
 			for ( var k = 0; k < FULL_LANG.length; k++ ) {
 				if ( FULL_LANG[ k ] == LANG[ i ][ "ISO" ] ) {
 					if ( FULL_LANG[ k ] == "en-US" ) {
-						write_build( URL_AOO, URL_HASH, PLATFORM, FULL_LANG, i, k, VERSION, AOO, "install" );
+						write_build( rel_mode, URL_AOO, URL_HASH, PLATFORM, FULL_LANG, i, k, VERSION, AOO, "install" );
 					}
 					FULL_LANG_COUNT++;
 
@@ -285,12 +342,12 @@ function write_lang( URL_AOO, URL_HASH, 
 			if ( LP_LANG[ j ] == LANG[ i ][ "ISO" ] ) {
 				for ( var k = 0; k < FULL_LANG.length; k++ ) {
 					if ( FULL_LANG.length > 1 && FULL_LANG[ k ] == LANG[ i ][ "ISO" ] ) {
-						write_build( URL_AOO, URL_HASH, PLATFORM, FULL_LANG, i, k, VERSION, AOO, "install" );
+						write_build( rel_mode, URL_AOO, URL_HASH, PLATFORM, FULL_LANG, i, k, VERSION, AOO, "install" );
 						FULL_LANG_COUNT++;
 					}
 				}
 				if ( URL_AOO.indexOf( "SDK" ) == -1 ) {
-					write_build( URL_AOO, URL_HASH, PLATFORM, LP_LANG, i, j, VERSION, AOO, "langpack" );
+					write_build( rel_mode, URL_AOO, URL_HASH, PLATFORM, LP_LANG, i, j, VERSION, AOO, "langpack" );
 					LP_LANG_COUNT++;
 				}
 			}
@@ -304,7 +361,7 @@ function write_lang( URL_AOO, URL_HASH, 
 /*
  * This writes the column names and download links for SDK builds, source tarballs and other files
  */
-function write_sdk( URL_SDK, URL_SRC, URL_HASH, AOO_SRC, PLATFORM, SDK_LANG, VERSION, AOO_SDK ) {
+function write_sdk( rel_mode, URL_SDK, URL_SRC, URL_HASH, AOO_SRC, PLATFORM, SDK_LANG, VERSION, AOO_SDK ) {
 	// Show the checksum links in smaller font size than the binary links
 	var SMALL = "style='font-size: x-small'";
 
@@ -316,8 +373,7 @@ function write_sdk( URL_SDK, URL_SRC, UR
 		document.write( "<tr id='source' class='a'><td class='footer' colspan='" + COLSPAN + "'>&nbsp;<br />&nbsp;<br />&nbsp;<br />&nbsp;</td></tr>" );
 
 	// Then write the row with the SDK builds
-	write_lang( URL_SDK, URL_HASH, PLATFORM, SDK_LANG, SDK_LANG, VERSION, AOO_SDK );
-
+	write_lang( rel_mode, URL_SDK, URL_HASH, PLATFORM, SDK_LANG, SDK_LANG, VERSION, AOO_SDK );
 
 	// Then write the row with the source tarballs
 	if ( ROW_COUNT ==  1 || ROW_COUNT ==  3 || ROW_COUNT ==  5 || ROW_COUNT ==  7 || ROW_COUNT ==  9 ||
@@ -326,28 +382,54 @@ function write_sdk( URL_SDK, URL_SRC, UR
 	else
 		document.write( "<tr class='b'><td>-</td><td>-</td><td><small><a href='#notes'" + "title='What are source tarballs?'>Source<br />tarballs</a></small></td>" );
 
-	document.write( "<td style='text-align: center'><a href='"              + URL_SRC            + ".tar.bz2'><b>tar.bz2</b></a><br /><br />" );
-	document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.asc'>ASC</a>" );
-	document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.md5'>MD5</a><br />" );
-	document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.sha256'>SHA256</a></td>" );
-	document.write( "<td>&nbsp;</td>" );
-	document.write( "<td style='text-align: center'><a href='"              + URL_SRC            + ".tar.gz'><b>tar.gz</b></a><br /><br />" );
-	document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.asc'>ASC</a>" );
-	document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.md5'>MD5</a><br />" );
-	document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.sha256'>SHA256</a></td>" );
-	document.write( "<td>&nbsp;</td>" );
-	document.write( "<td style='text-align: center'><a href='"              + URL_SRC            + ".zip'><b>zip</b></a><br /><br />" );
-	document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.asc'>ASC</a>" );
-	document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.md5'>MD5</a><br />" );
-	document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.sha256'>SHA256</a></td>" );
-	document.write( "<td>&nbsp;</td>" );
-
+	if ( rel_mode == 0 ) {
+		// Release mode
+		document.write( "<td style='text-align: center'><a href='"              + URL_SRC            + ".tar.bz2'><b>tar.bz2</b></a><br /><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.asc'>ASC</a>" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.md5'>MD5</a><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.sha256'>SHA256</a></td>" );
+		document.write( "<td>&nbsp;</td>" );
+		document.write( "<td style='text-align: center'><a href='"              + URL_SRC            + ".tar.gz'><b>tar.gz</b></a><br /><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.asc'>ASC</a>" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.md5'>MD5</a><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.sha256'>SHA256</a></td>" );
+		document.write( "<td>&nbsp;</td>" );
+		document.write( "<td style='text-align: center'><a href='"              + URL_SRC            + ".zip'><b>zip</b></a><br /><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.asc'>ASC</a>" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.md5'>MD5</a><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.sha256'>SHA256</a></td>" );
+		document.write( "<td>&nbsp;</td>" );
+	} else {
+		// Beta release mode
+		document.write( "<td style='text-align: center'><a href='"              + URL_SRC            + ".tar.bz2'><b>tar.bz2</b></a><br /><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.asc'>ASC</a>" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.md5'>MD5</a><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.bz2.sha256'>SHA256</a></td>" );
+		document.write( "<td>&nbsp;</td>" );
+		document.write( "<td style='text-align: center'><a href='"              + URL_SRC            + ".tar.gz'><b>tar.gz</b></a><br /><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.asc'>ASC</a>" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.md5'>MD5</a><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".tar.gz.sha256'>SHA256</a></td>" );
+		document.write( "<td>&nbsp;</td>" );
+		document.write( "<td style='text-align: center'><a href='"              + URL_SRC            + ".zip'><b>zip</b></a><br /><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.asc'>ASC</a>" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.md5'>MD5</a><br />" );
+		document.write( "                               <a " + SMALL + "href='" + URL_HASH + AOO_SRC + ".zip.sha256'>SHA256</a></td>" );
+		document.write( "<td>&nbsp;</td>" );
+	}
 	document.write( "</tr>" );
 	ROW_COUNT++;
 
 	// At last write the row with the other files (release notes)
 	document.write( "<tr class='a'><td>-</td><td>-</td><td><small>Other&nbsp;files</small></td>" );
-	document.write( "<td style='text-align: center'><a href='../development/releases/" + VERSION + ".html' title='Apache OpenOffice Release Notes'>AOO<br />Release<br />Notes</a></td>" );
+	if ( rel_mode == 0 ) {
+		// Release mode
+		document.write( "<td style='text-align: center'><a href='../development/releases/" + VERSION + ".html' title='Apache OpenOffice Release Notes'>AOO<br />Release<br />Notes</a></td>" );
+	} else {
+		// Beta release mode
+//		document.write( "<td style='text-align: center'><a href='../development/releases/" + BETA_VERSION + "_Beta.html' title='Apache OpenOffice Release Notes'>AOO<br />Release<br />Notes</a></td>" );
+		document.write( "<td style='text-align: center'><a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes'>AOO<br />Release<br />Notes</a></td>" );
+	}
 	document.write( "<td>&nbsp;</td>" );
 	document.write( "<td style='text-align: center'><a href='checksums.html' title='How to verify the download with checksums?'>How to<br />verify the<br />download?</a></td>" );
 	document.write( "<td>&nbsp;</td>" );

Modified: websites/staging/ooo-site/trunk/content/download/exceptions.css
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/exceptions.css (original)
+++ websites/staging/ooo-site/trunk/content/download/exceptions.css Mon Mar 10 15:00:48 2014
@@ -24,30 +24,32 @@ h1 { padding-left: 0.5em; }
 #navcol { display: none; }
 .warning { border: solid 3px #F00; background: #FDD; padding: 1em; }
 
-.optionset { margin: 0 0 0 -2px; float: left; width: 67%; max-width: 1200px; }
-.optionset a { margin: 0; padding: .1em 0 .25em 3%; width: 97%; color: #333; }
-.optionset p { margin: 0; padding: .1em 0 .25em 3%; width: 97%; color: #333; }
+#content h2 { margin-top: 0; }
+
+.optionset { margin: 0 0 0 -2px; float: left; width: 77%; max-width: 1200px; }
+.optionset a { margin: 0; padding: .1em 0 .25em 3%; color: #333; }
+.optionset p { margin: 0; padding: .1em 0 .25em 3%; color: #333; }
 .optionset p a { margin: 0; padding: 0; color: #333; }
 .optionset a p { margin: 0; padding: 0; color: #333; }
 #bodycol .optionset p a:hover, #bodycol .optionset .button:hover p a { color: #000; }
-.optionset .button { margin-top: 20px; }
+.optionset .button { border-radius: 15px; margin-top: 10px; }
 .optionset .button h2 { margin: 0 0 0 -1px; padding: 0; cursor: pointer; border: none; }
-.optionset .button h2 a { display: block; padding: 25px 25% 0 3%; font-weight: bold; width: 72%; text-decoration: none; cursor: pointer; }
-.optionset .button a h2 { display: block; padding: 0px 0% 0 3%; font-weight: bold; width: 72%; text-decoration: none; cursor: pointer; }
+.optionset .button h2 a { display: block; padding: 25px 25% 0 3%; font-weight: bold; text-decoration: none; cursor: pointer; }
+.optionset .button a h2 { display: block; padding: 0px 0% 0 3%; font-weight: bold; text-decoration: none; cursor: pointer; }
 .optionset .button h3 { margin: 0 0 0 -1px; padding: 0; cursor: pointer; border: none; }
-.optionset .button h3 a { display: block; padding: 5px 25% 0 3%; font-weight: bold; width: 72%; text-decoration: none; cursor: pointer; }
+.optionset .button h3 a { display: block; padding: 5px 25% 0 3%; font-weight: bold; text-decoration: none; cursor: pointer; }
 .optionset .button p { padding: 0; font-size: .9em; padding-bottom: 25px; cursor: pointer; }
-.optionset .button p a { display: block; padding: .1em 25% .25em 3%; text-decoration: none; cursor: pointer; width: 72%; }
-.optionset .button a p { display: block; padding: .1em 25% .25em 3%; text-decoration: none; cursor: pointer; width: 72%; }
+.optionset .button p a { display: block; padding: .1em 25% .25em 3%; text-decoration: none; cursor: pointer; }
+.optionset .button a p { display: block; padding: .1em 25% .25em 3%; text-decoration: none; cursor: pointer; }
 .optionset .first { margin-top: 0; }
 .optionset p.promotional { margin-top: 25px; }
 
-.green { background: url(http://www.openoffice.org/download/cachedimages/button-green.png) #D1EAA0 right top no-repeat; }
-.green:hover { background: url(http://www.openoffice.org/download/cachedimages/button-green.png) #C3E480 right -200px no-repeat; }
+.green { background: url(cachedimages/button-green.png) #D1EAA0 right top no-repeat; }
+.green:hover { background: url(cachedimages/button-green.png) #C3E480 right -200px no-repeat; }
 .green h2 a { color: #718D36; }
 .green:hover h2 a, #bodycol .green h2 a:hover { color: #546828; }
-.sub-green { background: #E9FEBE; border-top: 1px solid #C3E480; border-bottom: 1px solid #C3E480; font-size: .8em; }
-.sub-green p { padding: .1em 3%; width: 94%; }
+.sub-green { background: #E9FEBE; border-top: 1px solid #C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size: .8em; }
+.sub-green p { padding: .1em 3%; width: 72%; }
 
 .grey { background: #C0C0C0 right top no-repeat; cursor: default; }
 .grey:hover { background: #A0A0A0 right -200px no-repeat; cursor: default; }
@@ -59,54 +61,94 @@ h1 { padding-left: 0.5em; }
 .grey:hover h2 a, #bodycol .grey h2 a:hover { color: #202020; cursor: default; }
 .grey:hover h3 a, #bodycol .grey h3 a:hover { color: #202020; cursor: default; }
 .grey:hover p a, #bodycol .grey p a:hover { color: #202020; cursor: default; }
-.sub-grey { background: #E0E0E0; border-top: 1px solid #E0E0E0; border-bottom: 1px solid #E0E0E0; font-size: .8em; cursor: default; }
-.sub-grey p { padding: .1em 3%; width: 94%; cursor: default; }
+.sub-grey { background: #E0E0E0; border-top: 1px solid #E0E0E0; border-bottom: 1px solid #E0E0E0; border-radius: 15px; font-size: .8em; cursor: default; }
+.sub-grey p { padding: .1em 3%; width: 72%; cursor: default; }
 
 /* exchanged the normal picture with one that includes the extension repository graphic */
-.blue { background: url(http://www.openoffice.org/download/cachedimages/button-blue-ext.png) #D8E5F6 right top no-repeat; }
-.blue:hover { background: url(http://www.openoffice.org/download/cachedimages/button-blue-ext.png) #C3D9F1 right -200px no-repeat; }
+.blue { background: url(cachedimages/button-blue-ext.png) #D8E5F6 right top no-repeat; }
+.blue:hover { background: url(cachedimages/button-blue-ext.png) #C3D9F1 right -200px no-repeat; }
 .blue h2 a { color: #2D72CE; }
 .blue a h2 { color: #2D72CE; }
+.blue p { color: #2D72CE; }
 .blue:hover h2 a, #bodycol .blue h2 a:hover { color: #21549A; }
 .blue:hover a h2, #bodycol .blue a h2:hover { color: #21549A; }
-.sub-blue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid #D1D1FF; font-size: .8em; }
-.sub-blue p { padding: .1em 3%; width: 94%; }
-.sub-blue p a { padding: .1em 3%; width: 94%; }
+.sub-blue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid #D1D1FF; border-radius: 15px; font-size: .8em; }
+.sub-blue p { padding: .1em 3%; width: 72%; }
 
-.lightblue { background: url(http://www.openoffice.org/download/cachedimages/button-lightblue.png) #D8E5F6 right 0 no-repeat; }
-.lightblue:hover { background: url(http://www.openoffice.org/download/cachedimages/button-lightblue.png) #C3D9F1 right -200px no-repeat; }
+.lightblue { background: url(cachedimages/button-lightblue.png) #D8E5F6 right top no-repeat; }
+.lightblue:hover { background: url(cachedimages/button-lightblue.png) #C3D9F1 right -200px no-repeat; }
 .lightblue h2 a { color: #2D72CE; }
+.lightblue a h2 { color: #2D72CE; }
 .lightblue:hover h2 a, #bodycol .lightblue h2 a:hover { color: #21549A; }
-.sub-lightblue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid #D1D1FF; font-size: .8em; }
-.sub-lightblue p { padding: .1em 3%; width: 94%; }
+.lightblue:hover a h2, #bodycol .lightblue a h2:hover { color: #21549A; }
+.sub-lightblue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid #D1D1FF; border-radius: 15px; font-size: .8em; }
+.sub-lightblue p { padding: .1em 3%; width: 72%; }
 
-.yellow { background: url(http://www.openoffice.org/download/cachedimages/button-yellow.png) #FFF379 right top no-repeat; }
-.yellow:hover { background: url(http://www.openoffice.org/download/cachedimages/button-yellow.png) #FFF24F right -200px no-repeat; }
+.yellow { background: url(cachedimages/button-yellow.png) #FFF379 right top no-repeat; }
+.yellow:hover { background: url(cachedimages/button-yellow.png) #FFF24F right -200px no-repeat; }
 .yellow h2 a { color: #E09C09; }
+.yellow a h2 { color: #E09C09; }
 .yellow:hover h2 a, #bodycol .yellow h2 a:hover { color: #C80; }
-.sub-yellow { background: #FFFEAF; border-top: 1px solid #FBD34E; border-bottom: 1px solid #FBD34E; font-size: .8em; }
-.sub-yellow p { padding: .1em 3%; width: 94%; }
+.yellow:hover a h2, #bodycol .yellow a h2:hover { color: #C80; }
+.sub-yellow { background: #FFFEAF; border-top: 1px solid #FBD34E; border-bottom: 1px solid #FBD34E; border-radius: 15px; font-size: .8em; }
+.sub-yellow p { padding: .1em 3%; width: 72%; }
+
+.yellow_wo_icon { background: #FFF379 right top no-repeat; }
+.yellow_wo_icon:hover { background: #FFF24F right -200px no-repeat; }
+/*.yellow_wo_icon { background: url(cachedimages/button-yellow.png) #FFF379 right top no-repeat; } */
+/*.yellow_wo_icon:hover { background: url(cachedimages/button-yellow.png) #FFF24F right -200px no-repeat; } */
+.yellow_wo_icon h2 a { color: #E09C09; }
+.yellow_wo_icon a h2 { color: #E09C09; }
+.yellow_wo_icon:hover h2 a, #bodycol .yellow_wo_icon h2 a:hover { color: #C80; }
+.yellow_wo_icon:hover a h2, #bodycol .yellow_wo_icon a h2:hover { color: #C80; }
+.sub-yellow_wo_icon { background: #FFFEAF; border-top: 1px solid #FBD34E; border-bottom: 1px solid #FBD34E; border-radius: 15px; font-size: .8em; }
+.sub-yellow_wo_icon p { padding: .1em 3%; width: 72%; }
+
+.yellow_gradient { 
+background: url(cachedimages/button-yellow-top.png) #FFF379 right top no-repeat; /* Old browsers */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -moz-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, #fbe977 100%); /* FF3.6+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceabb), color-stop(0%, #f8b500), color-stop(0%, #fccd4d), color-stop(0%, #fcffb6), color-stop(0%, #fcffb6), color-stop(100%, #fbe977)); /* Chrome,Safari4+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -webkit-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, # fbe977 100%); /* Chrome10+,Safari5.1+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -o-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, #fbe977 100%); /* Opera 11.10+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -ms-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, #fbe977 100%); /* IE10+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat linear-gradient(to bottom, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, #fbe977 100%); /* W3C */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb', endColorstr='#fbe977', GradientType=0 ); /* IE6-9 */ }
+.yellow_gradient:hover { 
+background: url(cachedimages/button-yellow-bottom.png) #FFF24F right top no-repeat; /* Old browsers */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -moz-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* FF3.6+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceabb), color-stop(0%, #f8b500), color-stop(0%, #fccd4d), color-stop(0%, #fcffb6), color-stop(0%, #fbffa4), color-stop(100%, #fac81d)); /* Chrome,Safari4+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -webkit-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* Chrome10+,Safari5.1+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -o-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* Opera 11.10+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -ms-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* IE10+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, linear-gradient(to bottom, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* W3C */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb', endColorstr='#fac81d', GradientType=0 ); /* IE6-9 */ }
+.yellow_gradient h2 a { color: #E09C09; }
+.yellow_gradient a h2 { color: #E09C09; }
+.yellow_gradient:hover h2 a, #bodycol .yellow_gradient h2 a:hover { color: #C80; }
+.yellow_gradient:hover a h2, #bodycol .yellow_gradient a h2:hover { color: #C80; }
+.sub-yellow_gradient { background: #FFFEAF; border-top: 1px solid #FBD34E; border-bottom: 1px solid #FBD34E; border-radius: 15px; font-size: .8em; }
+.sub-yellow_gradient p { padding: .1em 3%; width: 72%; }
 
-.orange { background: url(http://www.openoffice.org/download/cachedimages/button-orange.png) #FFD9A7 right 0 no-repeat; }
-.orange:hover { background: url(http://www.openoffice.org/download/cachedimages/button-orange.png) #FFBE67 right -200px no-repeat; }
+.orange { background: url(cachedimages/button-orange.png) #FFD9A7 right top no-repeat; }
+.orange:hover { background: url(cachedimages/button-orange.png) #FFBE67 right -200px no-repeat; }
 .orange h2 a { color: #D36812; }
 .orange:hover h2 a, #bodycol .orange h2 a:hover { color: #C94800; }
-.sub-orange { background: #FFE2B5; border-top: 1px solid #FFB15E; border-bottom: 1px solid #FFB15E; font-size: .8em; }
-.sub-orange p { padding: .1em 3%; width: 94%; }
+.sub-orange { background: #FFE2B5; border-top: 1px solid #FFB15E; border-bottom: 1px solid #FFB15E; border-radius: 15px; font-size: .8em; }
+.sub-orange p { padding: .1em 3%; width: 72%; }
 
-.red { background: #FFD9A7 right 0 no-repeat; cursor: default; }
+.red { background: #FFD9A7 right top no-repeat; cursor: default; }
 .red h2 a { color: #D36812; cursor: default; }
-.sub-red { background: #FFE2B5; border-top: 1px solid #FFB15E; border-bottom: 1px solid #FFB15E; font-size: .8em; cursor: default; }
-.sub-red p { padding: .1em 3%; width: 94%; cursor: default; }
+.sub-red { background: #FFE2B5; border-top: 1px solid #FFB15E; border-bottom: 1px solid #FFB15E; border-radius: 15px; font-size: .8em; cursor: default; }
+.sub-red p { padding: .1em 3%; width: 72%; cursor: default; }
 
-.additionalinformation { background: none; float: right; width: 28%; clear: none; }
+.additionalinformation { background: none; float: right; width: 21%; clear: none; }
 .additionalinformation h2 { border-bottom: 1px solid #CCC; margin-bottom: 5px; margin-top: 0px; }
 .additionalinformation h3 { margin-left: 5px; margin-bottom: 5px; }
 .additionalinformation li { margin-left: 5px; font-size: 12px; }
 .additionalinformation a {color:#107EC0;text-decoration:underline;}
 .additionalinformation a:hover {background-color: #e6ebed;}
 
-.additionalinformation #nativelang { background-image: url(http://www.openoffice.org/download/cachedimages/nativelang.gif); background-repeat: no-repeat; background-position: top left; }
+.additionalinformation #nativelang { background-image: url(cachedimages/nativelang.gif); background-repeat: no-repeat; background-position: top left; }
 
 #downloadextendedtext p { background: none; }
 #downloadextendedtext ul { background: none; font-weight: bold; list-style: none; margin: 0px; padding: 0px; font-size: 2em; width: 100%; float: left; color: #333; padding-left: 20px; }
@@ -126,4 +168,5 @@ h1 { padding-left: 0.5em; }
 
 .largetable table tr.even td { background: #EEEEEE; }
 .largetable table tr.odd td  { background: none; }
-.builds   { background-position: left; background-repeat: no-repeat; padding: 2px 0 2px 18px; display: block; }
+.builds { background-position: left; background-repeat: no-repeat; padding: 2px 0 2px 18px; display: block; }
+

Modified: websites/staging/ooo-site/trunk/content/download/globalvars.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/globalvars.js (original)
+++ websites/staging/ooo-site/trunk/content/download/globalvars.js Mon Mar 10 15:00:48 2014
@@ -15,22 +15,42 @@ var VERSION			= "4.0.1";
 var MILESTONE			= "AOO401m5";
 var BUILD			= "9714";
 var SVN_REV			= "r1524958";
-var DATE			= "2013-Oct-01";
-
+var REL_DATE			= "2013-Oct-01";
+var PRE_VERSION			= "4.0.1";
 var OLDVERSION			= "3.4.1";
 var LEGACYVERSION		= "3.3.0";
 
-
-// Variables for the tables for the most recent stable release
 var PLATFORM			= new Array( "Win_x86", "Linux_x86_rpm", "Linux_x86_deb", "Linux_x86-64_rpm", "Linux_x86-64_deb", "MacOS_x86" );
 var FULL_LANG			= new Array( "ast","cs","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hu","it","ja","km","ko","lt","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","tr","vi","zh-CN","zh-TW" );
 var LP_LANG			= new Array( "ast","cs","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hu","it","ja","km","ko","lt","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","tr","vi","zh-CN","zh-TW" );
 var SDK_LANG			= new Array( "en-US" );
 
+// General variables for the most recent Beta Release
+var BETA_VERSION		= "4.1.0-beta";
+var BETA_NAME			= "4.1.0 Beta";
+var BETA_MILESTONE		= "AOO410m14";
+var BETA_BUILD			= "9760";
+var BETA_SVN_REV		= "r1573601";
+var BETA_REL_DATE		= "2014-Mar-10";
+var BETA_ACTIVE			= true;
+
+var BETA_PLATFORM		= new Array( "Win_x86", "Linux_x86_rpm", "Linux_x86_deb", "Linux_x86-64_rpm", "Linux_x86-64_deb", "MacOS_x86-64" );
+var BETA_FULL_LANG		= new Array( "ast","bg","cs","da","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hi","hu","it","ja","km","ko","lt","nb","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","th","tr","vi","zh-CN","zh-TW" );
+var BETA_LP_LANG		= new Array( "ast","bg","cs","da","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hi","hu","it","ja","km","ko","lt","nb","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","th","tr","vi","zh-CN","zh-TW" );
+var BETA_SDK_LANG		= new Array( "en-US" );
+
 // Base URLs to the Sourceforge and Apache mirror server
-var SOURCEFORGE_BASE_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/files/" + VERSION + "/binaries/";
+var SOURCEFORGE_BASE_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/files/" + VERSION      + "/binaries/";
+var SOURCEFORGE_PREVIOUS_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/files/" + PRE_VERSION  + "/binaries/";
 var APACHE_BASE_URL		= "http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"        + VERSION;
 var APACHE_DIST_BASE_URL	= "http://www.apache.org/dist/openoffice/"		        + VERSION;
+var APACHE_DIST_PREVIOUS_URL	= "http://www.apache.org/dist/openoffice/"		        + PRE_VERSION;
+
+var SOURCEFORGE_BASE_URL_BETA	= "http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/" + BETA_VERSION + "/binaries/";
+var APACHE_BASE_URL_BETA	= "http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"        + BETA_VERSION;
+var APACHE_DIST_BASE_URL_BETA	= "http://www.apache.org/dist/openoffice/"		        + BETA_VERSION;
+
+// Debug: Uncomment to use different base URLs
 // var PEOPLE_BASE_URL		= "http://people.apache.org/~marcus/aoo/"		        + VERSION;
 // var APACHE_BASE_URL		= "http://www.apache.org/dyn/aoo-closer.cgi/aoo/"	        + VERSION;
 // var APACHE_DIST_BASE_URL	= "http://www.apache.org/dist/aoo/"			        + VERSION;