svn commit: r1591656 - /openoffice/ooo-site/trunk/content/de/downloads/index.html

Thu, 01 May 2014 06:31:36 -0700 

Author: marcus
Date: Thu May  1 13:30:45 2014
New Revision: 1591656

URL: http://svn.apache.org/r1591656
Log:
Updates from the recent changes on the main download webpage

Modified:
    openoffice/ooo-site/trunk/content/de/downloads/index.html

Modified: openoffice/ooo-site/trunk/content/de/downloads/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/de/downloads/index.html?rev=1591656&r1=1591655&r2=1591656&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/de/downloads/index.html (original)
+++ openoffice/ooo-site/trunk/content/de/downloads/index.html Thu May  1 
13:30:45 2014
@@ -2,13 +2,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml"; />
 <head itemscope itemtype="http://schema.org/Article";>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta itemprop="name" content="Apache OpenOffice Herunterladen" />
-  <meta itemprop="description" content="Folge der OpenOffice Revolution, die 
freie Büro-Software mit vielen Dutzenden Millionen gesicherten Downloads." />
+  <meta itemprop="name" content="Apache OpenOffice herunterladen" />
+  <meta itemprop="description" content="Folge der OpenOffice Revolution, die 
freie Büro-Software mit vielen Dutzenden Millionen glaubhaften Downloads." />
   <meta itemprop="image" 
content="http://www.openoffice.org/images/aoo-logo-100x100.png"; />
-  <meta property="og:title" content="Download Apache OpenOffice" />
-  <meta property="og:description" content="Folge der OpenOffice Revolution, 
die freie Büro-Software mit vielen Dutzenden Millionen gesicherten Downloads." 
/>
+  <meta property="og:title" content="Apache OpenOffice herunterladen" />
+  <meta property="og:description" content="Folge der OpenOffice Revolution, 
die freie Büro-Software mit vielen Dutzenden Millionen glaubhaften Downloads." 
/>
   <meta property="og:image" 
content="http://www.openoffice.org/images/aoo-logo-100x100.png"; />
-  <title>Apache OpenOffice Herunterladen - Offizielle Webseite</title>
+  <meta name="description" content="Offizielle Apache OpenOffice 
Download-Webseite. Folge der OpenOffice Revolution, die freie Büro-Software 
mit vielen Dutzenden Million glaubhaften Downloads." />
+  <title>Apache OpenOffice herunterladen - Offizielle Webseite</title>
   <script type="text/javascript" src="../../download/globalvars.js"></script>
   <script type="text/javascript" src="../../download/languages.js"></script>
   <script type="text/javascript" 
src="../../download/release_matrix.js"></script>
@@ -53,7 +54,7 @@ screen reader. -->
   // Set a specific language ISO code to force to assemble a certain localized 
build as download URL
   var NL_LANGUAGE = "de";
   // Get the download URL
-  var LINK        = getLink( 0 );
+  var LINK        = getLink( 1 );
   if ( hasMirrorLink() ) {
     if ( SOURCEFORGE ) {
       // If download URL contains "sourceforge" (-> normal and correct 
download link),
@@ -64,7 +65,7 @@ screen reader. -->
         + " | Build ID " + BUILD + " | SVN " + SVN_REV + " | Released: " + 
REL_DATE + "'>"
         + "Herunterladen von Apache OpenOffice " + VERSION + "</a></h2>"
         + "<p><a href='" + LINK + "' title='Version " + VERSION + " | 
Milestone " + MILESTONE + " | Build ID " + BUILD
-        + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>Hier klicken 
f&uuml;r:<br />"
+        + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>Hier klicken 
f&uuml;r (startet von Sourceforge.net):<br />"
         + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | ~" 
+ FILESIZE + "&nbsp;MByte | Released:&nbsp;"
         + REL_DATE + "<br /></a></p>"
       + "</div>" );
@@ -98,8 +99,8 @@ screen reader. -->
       + "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + 
"'>"
       + "Herunterladen von Apache OpenOffice</a></h2>"
       + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + 
"'>Apache OpenOffice " + VERSION + " f&uuml;r "
-      + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> ist nicht 
verf&uuml;gbar. Bitte den Text anklicken, um von "
-      + "der lokalen " + LANG_ARRAY[ 1 ] + " Download-Webseite 
auszuw&auml;hlen</a>.</p>"
+      + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> ist nicht 
verf&uuml;gbar. Bitte den Text anklicken, um "
+      + "von der lokalen " + LANG_ARRAY[ 1 ] + " Download-Webseite 
auszuw&auml;hlen</a>.</p>"
     + "</div>" );
   }
   // Show some helpful links for SDK, source, checksums, release notes, legacy 
version.
@@ -164,11 +165,11 @@ 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( 1 );
+    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.
@@ -179,8 +180,9 @@ screen reader. -->
           + "Herunterladen von 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 + "'>"
-          + "Hier klicken f&uuml;r:<br /><b>" + UI_PLATFORM + "</b> and <b>" + 
LANG_ARRAY[ 2 ] + "</b> | "
-          + "~" + FILESIZE + " MByte | Released: " + BETA_REL_DATE + "<br />"
+          + "Hier klicken f&uuml;r (startet von Sourceforge.net):<br />"
+          + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | 
~" + FILESIZE + " MByte | "
+          + "Released: " + BETA_REL_DATE + "<br />"
           + "<br /><b>Die Beta-Version ist funktionsfertig, aber noch nicht 
vollst&auml;ndig getestet und kann Probleme "
           + "beinhalten. Es wird dringend empfohlen sie nicht in einer 
Produktionsumgebung einzusetzen!</b></a></p>"
         + "</div>" );
@@ -216,8 +218,8 @@ screen reader. -->
         + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
         + "Herunterladen von Apache OpenOffice " + BETA_NAME + "</a></h2>"
         + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " 
+ BETA_NAME + " f&uuml;r "
-        + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> ist nicht 
verf&uuml;gbar. Bitte den Text anklicken, um von "
-        + "der lokalen " + LANG_ARRAY[ 1 ] + " Download-Webseite 
auszuw&auml;hlen</a>.</p>"
+        + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> ist nicht 
verf&uuml;gbar. Bitte den Text anklicken, um "
+        + "von der lokalen " + LANG_ARRAY[ 1 ] + " Download-Webseite 
auszuw&auml;hlen</a>.</p>"
       + "</div>" );
     }
     // Show some helpful links for SDK, source, checksums, release notes.
@@ -231,17 +233,30 @@ screen reader. -->
       + "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256 
Hashwert'>SHA256</a> , "
       + "<a href='../../download/checksums.html' "
       + "title='Wie kann der Download mit Signaturen und Hashwerten 
überprüft werden?'>Download überprüfen?</a> | " );
-  }
-  if ( ARCHIVE ) {
-    VERSION = PRE_VERSION;
-  }
-  document.write( "<a 
href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes+(Deutsch)'"
-    + "title='Was ist neu, was wurde verbessert in Apache OpenOffice " + 
BETA_NAME + "?'>Release Notes</a> | <br />"
-    + "<a href='../../download/all_beta.html' title='Hier gibts alle 
Plattformen, Spachen, Sprachpakete zum Herunterladen'>"
-    + "<b>Alle Plattformen, Sprachen, Sprachpakete</b></a> | "
-    + "<a href='../../download/all_beta.html#source' title='Hier gibts alle 
Quelldateien und das SDK zum Herunterladen'>"
-    + "Quelldateien und SDK</a> | <br />"
+    }
+    document.write( "<a 
href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes+(Deutsch)'"
+      + "title='Was ist neu, was wurde verbessert in Apache OpenOffice " + 
BETA_NAME + "?'>Release Notes</a> | <br />"
+      + "<a href='../../download/all_beta.html'"
+      + "title='Hier gibts alle Plattformen, Spachen, Sprachpakete zum 
Herunterladen'>"
+      + "<b>Alle Plattformen, Sprachen, Sprachpakete</b></a> | "
+      + "<a href='../../download/all_beta.html#source'"
+      + "title='Hier gibts alle Quelldateien und das SDK zum Herunterladen'>"
+      + "Quelldateien und SDK</a> | <br />"
+      + "</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>

Reply via email to