openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r1591515 - /openoffice/ooo-site/trunk/content/download/test/analyze_beta.html
Date Thu, 01 May 2014 00:19:39 GMT
Author: marcus
Date: Thu May  1 00:19:38 2014
New Revision: 1591515

URL: http://svn.apache.org/r1591515
Log:
Text updates

Modified:
    openoffice/ooo-site/trunk/content/download/test/analyze_beta.html

Modified: openoffice/ooo-site/trunk/content/download/test/analyze_beta.html
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_beta.html?rev=1591515&r1=1591514&r2=1591515&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/analyze_beta.html (original)
+++ openoffice/ooo-site/trunk/content/download/test/analyze_beta.html Thu May  1 00:19:38
2014
@@ -27,59 +27,60 @@ screen reader. -->
   <!-- Yellow: Beta Release online -->
   <script type="text/javascript">
   <!--
-  if ( BETA_ACTIVE ) {
+  if ( BETA_ACTIVE == 1 ) {
     // 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( 2 );
     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=\"first 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 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>" );
+	// 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=\"first 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>" );
+	// 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=\"first 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>" );
+	// 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=\"first 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>"
+      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.
@@ -87,18 +88,32 @@ screen reader. -->
     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> | " );
+        + "<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+"
+ BETA_VERSION + "+Release+Notes'"
+    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 if ( BETA_ACTIVE == 0 ) {
+    // 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>" );
+  } else {
+    // Yellow: Beta Release, show nothing as it is not yet ready
   }
   //-->
   </script>



Mime
View raw message