Author: buildbot
Date: Thu Mar 13 22:58:04 2014
New Revision: 901486

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/de/downloads/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar 13 22:58:04 2014
@@ -1 +1 @@
-1576967
+1577368

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar 13 22:58:04 2014
@@ -1 +1 @@
-1576967
+1577368

Modified: websites/staging/ooo-site/trunk/content/de/downloads/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/de/downloads/index.html (original)
+++ websites/staging/ooo-site/trunk/content/de/downloads/index.html Thu Mar 13 
22:58:04 2014
@@ -57,6 +57,10 @@
     
     
 
+<!-- The text in the H1 tag is intentionally shown as not displayable, just to 
please accessibility tools like a
+screen reader. -->
+<h1 style="display: none;">Apache OpenOffice Herunterladen</h1>
+
 <div class="optionset">
 
   <!-- Green: Stable release -->
@@ -65,49 +69,55 @@
   // 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();
-
+  var LINK        = getLink( 0 );
   if ( hasMirrorLink() ) {
-    if ( LINK.toLowerCase().indexOf( "sourceforge" ) != -1 ) {
-      // Download directly from a mirror with displayed platform and language.
+    if ( SOURCEFORGE ) {
+      // If download URL contains "sourceforge" (-> normal and correct 
download link),
+      // then download from Sourceforge with displayed platform and language.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" 
onclick=\"openItem('optionitem1','"
-      + LINK + "');" + "return false;\">" );
-      document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION + 
" - Milestone " + MILESTONE
-      + " - Build ID " + BUILD + " - SVN " + SVN_REV + "'>Herunterladen von 
Apache OpenOffice " + VERSION + "</a></h2>"
-      + "<p><a href='" + LINK + "' title='Version " + VERSION + " - Milestone 
" + MILESTONE + " - Build ID " + BUILD
-      + " - SVN " + SVN_REV + "'>Hier klicken f&uuml;r die neueste Version 
f&uuml;r:<br />"
-      + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> (~" + 
FILESIZE + " MByte)</a></p>" );
-    } else {
-      // OS and/or package manager was not recognized, therefore use 
"other.html" as download link.
+        + LINK + "');" + "return false;\">"
+        + "<h2><a href='" + LINK + "' title='Version " + VERSION + " | 
Milestone " + MILESTONE
+        + " | 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 />"
+        + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | ~" 
+ FILESIZE + "&nbsp;MByte | Released:&nbsp;"
+        + REL_DATE + "<br /></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 green\" id=\"optionitem1\" 
onclick=\"openItem('optionitem1','"
-      + LINK + "');" + "return false;\">" );
-      document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>"
-      + "Herunterladen von Apache OpenOffice</a></h2>"
-      + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + 
VERSION + " f&uuml;r "
-      + "<b>" + UI_PLATFORM + "</b> ist nicht verf&uuml;gbar. Bitte den Text 
anklicken, um eine andere Plattform von der "
-      + " alternativen Download-Webseite auszuw&auml;hlen.</a></p>" );
+        + LINK + "');" + "return false;\">"
+        + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+        + "Herunterladen von Apache OpenOffice</a></h2>"
+        + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " 
+ VERSION + " f&uuml;r "
+        + "<b>" + UI_PLATFORM + "</b> ist nicht verf&uuml;gbar. Bitte den Text 
anklicken, um eine andere Plattform von der "
+        + "alternativen Download-Webseite auszuw&auml;hlen.</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 green\" id=\"optionitem1\" 
onclick=\"openItem('optionitem1','"
+        + LINK + "');" + "return false;\">"
+        + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+        + "Herunterladen von Apache OpenOffice</a></h2>"
+        + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " 
+ VERSION + " f&uuml;r "
+        + "<b>" + UI_PLATFORM + "</b> und <b>" + LANG_ARRAY[ 2 ] + " (" + 
LANG_ARRAY[ 1 ] + ")</b> ist nicht "
+        + "verf&uuml;gbar. Hier klicken f&uuml;r die vorherige Version " + 
PRE_VERSION + "</a>.</p>"
+      + "</div>" );
     }
   } else {
-    // Download from an alternative webpage if hasMirrorLink() == false.
+    // If browser language do not match with AOO languages, then download from 
an alternative webpage.
     document.write( "<div class=\"first button green\" id=\"optionitem1\" 
onclick=\"openItem('optionitem1','"
-    + LANG_ARRAY[ 3 ] + "');" + "return false;\">" );
-    document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + 
LANG_ARRAY[ 4 ] + "'>"
-    + "Download Apache OpenOffice " + VERSION + "</a></h2>"
-    + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + 
"'>Eine Version f&uuml;r "
-    + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> ist nicht 
verf&uuml;gbar. Bitte "
-    + "w&auml;hle eine andere Sprache von der alternativen 
Download-Webseite.</a></p>" );
-
-    // Download from an alternative webpage if hasMirrorLink() == false.
-    document.write( "<div class=\"first button green\" id=\"optionitem1\" 
onclick=\"openItem('optionitem1','"
-    + LANG_ARRAY[ 3 ] + "');" + "return false;\">" );
-    document.write( "<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 Download-Webseite auszuw&auml;hlen.</a></p>" );
+      + LINK + "');" + "return false;\">"
+      + "<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>"
+    + "</div>" );
   }
-  document.write( "</div>" );
-
   // Show some helpful links for SDK, source, checksums, release notes, legacy 
version.
   document.write( "<div class=\"sub-green\">" );
   document.write( "<p>" );
@@ -120,61 +130,157 @@
     + "<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.0+Release+Notes+(Deutsch)'"
-  + "title='Was ist neu, was wurde verbessert in Apache OpenOffice " + VERSION 
+ "?'>Release Notes</a> | <br />"
-  + "<a href='../../download/other.html' title='Hier gibts alle Plattformen, 
Spachen, Sprachpakete zum Herunterladen'>"
-  + "<b>Alle Plattformen, Sprachen, Sprachpakete</b></a> | "
-  + "<a href='../../download/other.html#source' title='Hier gibts alle 
Quelldateien und das SDK zum Herunterladen'>"
-  + "Quelldateien und SDK</a> | <br />"
-  + "<a href='../../porting/index.html'"
-  + "title='Hier gibts Apache OpenOffice-Software als USB-Versionen und andere 
Drittanbieter-Portierungen'>"
-  + "<b>USB-Versionen</b> und andere Drittanbieter-Portierungen</a> | "
-  + "Vorgänger- und Legacy-Version: "
-  + "<a href='../../download/other-341.html' title='Hier gibts die 
Vorgängerversion Apache OpenOffice "
-  + OLDVERSION + "'><b>" + OLDVERSION + "</b></a> + "
-  + "<a href='../../download/legacy/index.html' title='Hier gibts die 
Legacy-Version OpenOffice.org "
-  + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a>" );
-  document.write( "</div>" );
-
+    + "title='Was ist neu, was wurde verbessert in Apache OpenOffice " + 
VERSION + "?'>Release Notes</a> | <br />"
+    + "<a href='../../download/other.html' title='Hier gibts alle Plattformen, 
Spachen, Sprachpakete zum Herunterladen'>"
+    + "<b>Alle Plattformen, Sprachen, Sprachpakete</b></a> | "
+    + "<a href='../../download/other.html#source' title='Hier gibts alle 
Quelldateien und das SDK zum Herunterladen'>"
+    + "Quelldateien und SDK</a> | <br />"
+    + "<a href='../../porting/index.html'"
+    + "title='Hier gibts Apache OpenOffice-Software als USB-Versionen und 
andere Drittanbieter-Portierungen'>"
+    + "<b>USB-Versionen</b> und andere Drittanbieter-Portierungen</a> | "
+    + "Vorgänger- und Legacy-Version: "
+    + "<a href='../../download/other-341.html' title='Hier gibts die 
Vorgängerversion Apache OpenOffice "
+    + OLDVERSION + "'><b>" + OLDVERSION + "</b></a> + "
+    + "<a href='../../download/legacy/index.html' title='Hier gibts die 
Legacy-Version OpenOffice.org "
+    + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a>"
+  + "</div>" );
   entourage.initialize();
   //-->
   </script>
 
   <!-- Green: Stable release: No JavaScript enabled -->
   <noscript>
-  <div class="first button green" id="optionitem1">
-    <h2><a style="cursor: default;">Herunterladen von Apache 
OpenOffice</a></h2>
-    <p style="cursor: default;">
-    <a style="cursor: default;">JavaScript muss aktiviert sein, um Apache 
OpenOffice herunterzuladen.</a></p>
-  </div>
-  <!-- Old text
-  <div class="button green" id="optionitem1" 
onclick="openItem('optionitem1','../../download/other.html'); return false;">
+  <div class="first button green" id="optionitem1" 
onclick="openItem('optionitem1','../../download/other.html');
+    return false;">
     <h2><a href="../../download/other.html"
     title="Hier gibts alle Plattformen, Spachen, Sprachpakete zum 
Herunterladen">
     Herunterladen von Apache OpenOffice</a></h2>
-    <p><a href="../../download/other.html"
-    title="Hier gibts alle Plattformen, Spachen, Sprachpakete zum 
Herunterladen">
-    JavaScript muss aktiviert sein, um Apache OpenOffice herunterzuladen. 
Bitte den Text anklicken, um die gewünschte
-    Plattform und Sprache von der alternativen Download-Webseite 
auszuw&auml;hlen.</a>
-    </p>
+    <p><a href="../../download/other.html" title="Hier gibts alle Plattformen, 
Spachen, Sprachpakete zum Herunterladen">
+    JavaScript muss aktiviert sein, um Apache OpenOffice herunterzuladen. 
Bitte den Text anklicken, um die gew&uuml;nschte
+    Plattform und Sprache von der alternativen Download-Webseite 
auszuw&auml;hlen</a>.</p>
   </div>
-  -->
   <div class="sub-green">
     <p><a href="../../porting/index.html"
     title="Hier gibts Apache OpenOffice-Software als USB-Versionen und andere 
Drittanbieter-Portierungen">
     <b>USB-Versionen</b> und andere Drittanbieter-Portierungen</a> |
     <a href="../development/releases/index.html"
     title="Was ist neu, was wurde verbessert in Apache OpenOffice?">Release 
Notes</a> | <br />
-    Vorgänger- und Legacy-Version:
-    <a href="../other-341.html"
-    title="Hier gibts die Vorgängerversion Apache OpenOffice">
+    Vorgänger- und Legacy-Version. <a href="../other-341.html"
+    title="Hier gibts die Vorg&auml;ngerversion Apache OpenOffice">
     <b>altes Apache OpenOffice</b></a> |
-    <a href="../../download/legacy/index.html"
-    title="Hier gibts die Legacy-Version OpenOffice.org">
+    <a href="../../download/legacy/index.html" title="Hier gibts die 
Legacy-Version OpenOffice.org">
     <b>Legacy-Version OpenOffice.org</b></a></p>
   </div>
   </noscript>
 
+  <!-- Yellow: Beta Release online -->
+  <script type="text/javascript">
+  <!--
+  if ( BETA_ACTIVE ) {
+    // Set a specific language ISO code to force to assemble a certain 
localized build as download URL
+    var NL_LANGUAGE = "";
+    // Get the download URL for Beta releases (>0 = beta mode)
+    var LINK        = getLink( 1 );
+    if ( hasMirrorLink() ) {
+      if ( SOURCEFORGE ) {
+        // If a Beta Release is available for download, then download from 
Sourceforge with displayed platform and language.
+        document.write( "<div class=\"button yellow\" id=\"optionitem2\" 
onclick=\"openItem('optionitem2','"
+          + LINK + "') return false;\">"
+          + "<h2><a href='" + LINK + "' title='Version " + BETA_NAME + " | 
Milestone " + BETA_MILESTONE
+          + " | Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | 
Released: " + BETA_REL_DATE + "'>"
+          + "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 />"
+          + "<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>" );
+      } else if ( OTHER ) {
+        // If download URL contains "other" (-> platform, OS or package 
manager was not recognized),
+        // then use "other.html" as download link.
+        document.write( "<div class=\"button yellow\" id=\"optionitem1\" 
onclick=\"openItem('optionitem1','"
+          + LINK + "');" + "return false;\">"
+          + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+          + "Herunterladen von Apache OpenOffice</a></h2>"
+          + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice 
" + BETA_NAME + " f&uuml;r "
+          + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + 
LANG_ARRAY[ 1 ] + ")</b> ist nicht "
+          + "verf&uuml;gbar. Bitte den Text anklicken, um eine andere 
Plattform von der alternativen Download-Webseite "
+          + "auszuw&auml;hlen</a>.</p>"
+        + "</div>" );
+      } else if ( ARCHIVE ) {
+        // If download URL contains "archive" (-> platform/OS is no longer 
supported),
+        // then provide a download link to the previous version.
+        document.write( "<div class=\"button yellow\" id=\"optionitem1\" 
onclick=\"openItem('optionitem1','"
+          + LINK + "');" + "return false;\">"
+          + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+          + "Herunterladen von Apache OpenOffice</a></h2>"
+          + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice 
" + BETA_NAME + " f&uuml;r "
+          + "<b>" + UI_PLATFORM + "</b> und <b>" + LANG_ARRAY[ 2 ] + " (" + 
LANG_ARRAY[ 1 ] + ")</b> ist nicht "
+          + "verf&uuml;gbar. Hier klicken f&uuml;r die vorherige Version " + 
PRE_VERSION + "</a>.</p>"
+        + "</div>" );
+      }
+    } else {
+      // If browser language do not match with AOO languages, then use 
"all_beta.html" as download link.
+      // LINK = "http://www.openoffice.org/download/test/all_beta.html";;
+      document.write( "<div class=\"button yellow\" id=\"optionitem2\" 
onclick=\"openItem('optionitem2','"
+        + LINK + "') return false;\">"
+        + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
+        + "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>"
+      + "</div>" );
+    }
+    // Show some helpful links for SDK, source, checksums, release notes.
+    document.write( "<div class=\"sub-yellow\">" );
+    document.write( "<p>" );
+    if ( CHECKSUM_ASC ) {
+      document.write( "Signaturen und Hashwerte: "
+      + "<a href='" + CHECKSUM_KEYS   + "' + title='KEYS Signatur'>KEYS</a> , "
+      + "<a href='" + CHECKSUM_ASC    + "' + title='ASC Signatur'>ASC</a> , "
+      + "<a href='" + CHECKSUM_MD5    + "' + title='MD5 Hashwert'>MD5</a> , "
+      + "<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 />"
+    + "</div>" );
+  }
+  //-->
+  </script>
+
+  <!-- Yellow: Beta: No JavaScript enabled -->
+  <noscript>
+  <div class="button yellow" id="optionitem2" 
onclick="openItem('optionitem2','all_beta.html'); return false;">
+    <h2><a href="all_beta.html" title="Select from all platforms, languages, 
language packs to download">
+    Download Apache OpenOffice Beta</a></h2>
+    <p><a href="http://sourceforge.net/projects/openofficeorg.mirror/files/";
+    title="Select from all platforms, languages, language packs to 
download">Your browser does not seem to allow JavaScript
+    on websites. This technique is used on this webpage for presenting the 
actual download link. If you want to download
+    Apache OpenOffice, click here to go to the alternative download page, and 
you will skip this page.
+    Our apologies for the inconvenience</a>.</p>
+  </div>
+  <div class="sub-yellow">
+    <p><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="../development/releases/dev_index.html"
+    title="What is new, what has been improved in Apache 
OpenOffice?"><b>Release Notes</b></a></p>
+  </div>
+  </noscript>
+
   <!-- Light Blue: Share download with social networks -->
   <div class="button lightblue" id="optionitem2">
     <h2><a style="cursor: default;"


Reply via email to