Author: buildbot
Date: Sat Jun 14 06:24:42 2014
New Revision: 912504

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/download/test/all_beta.html
    websites/staging/ooo-site/trunk/content/download/test/download.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jun 14 06:24:42 2014
@@ -1 +1 @@
-1602550
+1602552

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jun 14 06:24:42 2014
@@ -1 +1 @@
-1602550
+1602552

Modified: websites/staging/ooo-site/trunk/content/download/test/all_beta.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/all_beta.html 
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/all_beta.html Sat Jun 
14 06:24:42 2014
@@ -32,27 +32,28 @@
     
     
 
+<h1>Apache OpenOffice Downloads - Official Site - Beta Release</h1>
+<br />
+
 <!-- No JavaScript enabled -->
 <noscript>
-  <h1>Apache OpenOffice Downloads - Official Site - Beta Release</h1>
-
   <h2>JavaScript not enabled?</h2>
 
-  <div class="notice"><p>Your browser does not seem to allow JavaScript on 
websites. This technique is used on this webpage
-  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>
+  <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 == 1 ) {
        // Beta Release online
-       document.write( "<h1>Apache OpenOffice Downloads - Official Site - Beta 
Release</h1>"
-       + "<br />"
-
+       document.write( ""
        + "<ul>"
-       + "<li><h3><a href='#aoo'    title='Full installation sets + languages 
packs'>"
+       + "<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>"
@@ -62,9 +63,9 @@
        + "<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'>"
+       + "<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'>"
+       + "<li><h3><a href='#notes' title='Please read the important notes 
before downloading and using Apache OpenOffice'>"
        + "Important Notes</a></h3></li>"
        + "</ul>"
        + "<br />"
@@ -74,7 +75,7 @@
        + "<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 "
@@ -105,107 +106,107 @@
 
        + "<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 />" );
+       + "How to verify the download with signatures and hash values?</a></p>"
+       + "<br />" );
 
        write_table( 2 );
 
-       document.write( "</div>" );
-  } else if ( BETA_ACTIVE == 0 ) {
-       // Beta Release, show nothing as it is not yet ready
-       document.write( "<div><h2>Apache OpenOffice " + BETA_NAME
-       + "<small> (planned for: " + BETA_REL_DATE + ")</small></h2>"
-       + "<h3>The Beta release is not yet available. Please make sure to come 
back on the release date to "
-       + "download and test the new version.</h3><br /><br /><br /><br /><br 
/><br />" );
-       document.write( "</div>" );
-  } else {
-    // Yellow: Beta Release, show nothing as it is not yet ready
-       document.write( "<div><h2>Apache OpenOffice "
-       + "<h3>The Beta release is not yet available. Please make sure to come 
back on the release date to "
-       + "download and test the new version.</h3>" );
-       document.write( "</div>" );
-
-       exit;
-  }
-  document.write( "<br />"
-  + "<hr style='display: block;' />"
+       document.write( "</div>"
+       + "<br />"
+       + "<hr style='display: block;' />"
 
-  + "<h3 id='notes'>Important Notes:</h3>"
+       + "<h3 id='notes'>Important Notes:</h3>"
 
-  + "<h3>Language is not listed</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>"
+       + "<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>"
+       + "<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>"
+       + "<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>"
+       + "<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>"
+       + "<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>"
+       + "<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>"
+       + "<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>"
+       + "<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>"
+       + "<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>"
+       + "<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 />"
+       + "<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;' />"
+       + "<hr style='display: block;' />"
 
-  + "<h3>Report broken links</h3>"
+       + "<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:[email protected]&#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>"
+       + "<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:[email protected]&#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>"
+       + "<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>"
+       + "<p>If you encounter problems with installation or using Apache 
OpenOffice, please contact us via the following "
+       + "ways:</p>"
 
-  + "<ul>"
-  + "<li><a href='mailto:[email protected]'"
-  + "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 />"
+       + "<ul>"
+       + "<li><a href='mailto:[email protected]'"
+       + "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><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>" );
+       + "<p class='footer'><small><a href='#' title='Go to the start of the 
page'>Start of page</a></small></p>" );
+  } else if ( BETA_ACTIVE == 0 ) {
+       // Beta Release, show nothing as it is not yet ready
+       document.write( "<div>"
+       + "<h2>Apache OpenOffice " + BETA_NAME + "<small> (planned for: " + 
BETA_REL_DATE + ")</small></h2>"
+       + "<h3>The Beta release is not yet available. Please make sure to come 
back on the release date to download and "
+       + "test the new version.</h3>"
+       + "</div>" );
+  } else {
+       // Yellow: Beta Release, show nothing as it is not yet ready
+       document.write( "<div>"
+       + "<h2>Apache OpenOffice Beta</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>"
+       + "</div>" );
+  }
 
   entourage.initialize();
+
   //-->
 </script>
 

Modified: websites/staging/ooo-site/trunk/content/download/test/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download.js Sat Jun 
14 06:24:42 2014
@@ -61,16 +61,21 @@ function init( a ) {
 function initVars( init_all ) {
        // Define variables without "var" to make them globally available.
 
-       // The following are used in "download.js" only.
+       // The following are used in "download.js". and "index.html".
+
+       // All elements with ID in the sub-green box.
        element_ids_sub_green = [ "dl_rel_info", "dl_rel_notes", "dl_f_info", 
"dl_f_chk_keys", "space1", "dl_f_chk_asc",
        "space2", "dl_f_chk_md5", "space3", "dl_f_chk_sha256", "dl_lp_info", 
"dl_lp_chk_keys", "space4", "dl_lp_chk_asc",
        "space5", "dl_lp_chk_md5", "space6", "dl_lp_chk_sha256", "dl_hlp_img", 
"dl_hlp", "dl_chk_img", "dl_chk",
        "dl_rpt_img", "dl_rpt" ];
 
+       // All elements with ID in the green and sub-green box that have a link.
        element_ids_links = [ "dl_f_link", "dl_lp_link", "dl_f_chk_keys", 
"dl_f_chk_asc", "dl_f_chk_md5", "dl_f_chk_sha256",
        "dl_lp_chk_keys", "dl_lp_chk_asc", "dl_lp_chk_md5", "dl_lp_chk_sha256", 
"dl_hlp", "dl_chk", "dl_rpt" ];
 
-       // The following are used in "download.js". and "index.html".
+       // The following are used in "download.js" only.
+
+       // All global variables.
        if( init_all === 1 ) {
                R_MODE                          = "";    // The release mode (1 
= stable release (default), 2 = beta release, etc.).
                LANG_ISO                        = "";    // The language as ISO 
code.


Reply via email to