Author: buildbot
Date: Sun Jun  1 09:42:43 2014
New Revision: 910754

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/index_droplist.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jun  1 09:42:43 2014
@@ -1 +1 @@
-1598930
+1598958

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jun  1 09:42:43 2014
@@ -1 +1 @@
-1598930
+1598958

Modified: 
websites/staging/ooo-site/trunk/content/download/test/index_droplist.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html 
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html 
Sun Jun  1 09:42:43 2014
@@ -59,7 +59,7 @@
     
 
 <div class="overall_optionset">
-<div class="optionset">
+  <div class="optionset">
 
   <!-- Text above the first colored box -->
   <script type="text/javascript">
@@ -67,7 +67,7 @@
   // The text in the H1 tag is intentionally shown as "display: none" (do not 
display).
   // This is to please accessibility tools like a screen reader.
   document.write( "<h1 style='display: none;'>Apache OpenOffice Download</h1>" 
);
-  -->
+  //-->
   </script>
 
   <!-- Green: Stable release -->
@@ -75,18 +75,6 @@
   <script type="text/javascript">
   <!--
 /*
-  document.write( "<div>"
-    + "Just for testing, please ignore."
-    + "<form name='test'>"
-      + "<select class='sel1' id='test1' name='test1' title='Select your 
favorite operating system'>"
-        + "<option>Test 1</option>"
-        + "<option>Test 2</option>"
-        + "<option>Test 3</option>"
-      + "</select>"
-    + "</form>"
-  + "</div>" );
-*/
-/*
   // Set a specific language ISO code to force to assemble a certain localized 
build as download link.
   // The variable can be found in the "msg_prop_l10n_<ISO_code>.js".
   NL_LANG      = "";
@@ -160,6 +148,7 @@
     + "</div>" );
   }
   // Show some helpful data and links for SDK, source, checksums, release 
notes, legacy version.
+*/
 /*
   document.write( "<div class='sub-green'>"
     + "<p> );
@@ -230,12 +219,16 @@
   // The variable can be found in the "msg_prop_l10n_<ISO_code>.js".
   NL_LANG = "";
 
+  // Green colored box.
+  // Show select boxes and both download text buttons.
   document.write( "<div class='first button green-sel' id='optionitem2'>"
+    // Headline.
     + "<h2>"
       + "<a title='Download Apache OpenOffice for your favorite operating 
system, language and version'>"
       + "Download Apache OpenOffice</a>"
     + "</h2>"
 
+    // Select text.
     + "<p style='padding-bottom: 0px;'>"
       + "<a title='Apache OpenOffice binary files are hosted by 
Sourceforge.net - A trusted website'>"
       + "(Hosted by Sourceforge.net - A trusted website)</a>"
@@ -243,137 +236,132 @@
       + "<b>Select your favorite operating system, language and 
version:</b></a>"
     + "</p>"
 
+    // Select boxes.
     + "<form name='download'>"
-      + "<select class='sel-os' id='os'     name='os'   title='Select your 
favorite operating system'"
-      + "onchange='getLinkSel()'></select>"
-      + "<select class='sel-lang' id='lang' name='lang' title='Select your 
favorite language'"
-      + "onchange='getLinkSel()'></select>"
-      + "<select class='sel-ver' id='ver'   name='ver'  title='Select your 
favorite release version'"
-      + "onchange='getLinkSel()'></select>"
+      + "<select class='sel-os' id='os' name='os' title='Select your favorite 
operating system' onchange='getLinkSel()'>"
+      + "</select>"
+      + "<select class='sel-lang' id='lang' name='lang' title='Select your 
favorite language' onchange='getLinkSel()'>"
+      + "</select>"
+      + "<select class='sel-ver' id='ver' name='ver' title='Select your 
favorite release version' onchange='getLinkSel()'>"
+      + "</select>"
     + "</form>"
 
+    // Both download text buttons.
     + "<div class='dl-txt-btn'>"
       + "<h3 style='display: inline; cursor: default;'>"
-        + "<a id='dl_f_link'  style='padding: 5px 5px 5px 5px;' href='' 
title=''></a>"
+        + "<a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' 
title=''></a>"
         + "<a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' 
title=''></a>"
       + "</h3>"
       + "<br /><br />"
 /*
-      + "<a style='padding: 5px 0px 0px 3%; text-decoration: none; cursor: 
default;'></a>"
-      + "<a id='dl_hlp' style='padding: 5px 0px 0px 3px; text-decoration: 
none; cursor: pointer;' href='' title='' "
+      + "<a                      style='padding: 5px 0px 0px 3%; 
text-decoration: none; cursor: default;'></a>"
+      + "<a id='dl_hlp'                  style='padding: 5px 0px 0px 3px; 
text-decoration: none; cursor: pointer;' href='' title=''"
         + "target='_blank' onclick='showWindow( this.href ); return false;'>"
-        + "<img id='dl_hlp_img' 
src='../cachedimages/help-information-icon.png' "
-        + "title='What is the difference between full installation and 
language pack' height='16' width='16' "
-        + "alt='Help icon' />"
+        + "<img id='dl_hlp_img'          src='' title='' height='16' 
width='16' alt='' />"
       + "</a>"
 
-      + "<a style='padding: 5px 0px 0px 15%; text-decoration: none; cursor: 
default;'></a>"
-      + "<a id='dl_rpt' style='padding: 5px 0px 0px 3px; text-decoration: 
none; cursor: pointer;' href='' title='' "
+      + "<a                      style='padding: 5px 0px 0px 15%; 
text-decoration: none; cursor: default;'></a>"
+      + "<a id='dl_rpt'                  style='padding: 5px 0px 0px 3px; 
text-decoration: none; cursor: pointer;' href='' title=''"
         + "target='_blank'>"
-        + "<img id='dl_rpt_img' src='' title='' height='16' width='16' alt='' 
/>"
+        + "<img id='dl_rpt_img'          src='' title='' height='16' 
width='16' alt='' />"
       + "</a>"
 */
-//    + "<a id='dl_rpt' style='padding: 5px 0px 0px 3px; font-size: .9em; 
text-decoration: none; cursor: pointer;' "
+//    + "<a id='dl_rpt'                  style='padding: 5px 0px 0px 3px; 
font-size: .9em; text-decoration: none; cursor: pointer;'"
 //    + "href='' title='' target='_blank'></a>"
 
 //    + "<p></p>"
 
-//    + "<a style='text-decoration: none;' id='dl_rel_data' title=''></a>"
+//    + "<a                      style='text-decoration: none;' 
id='dl_rel_data' title=''></a>"
 /*
-      + "<a id='dl_rpt' style='padding: 5px 0px 0px 10%; cursor: pointer;' 
href='' title='' target='_blank'>"
-        + "<img id='dl_rpt_img' src='' title='' height='16' width='16' alt='' 
/>"
+      + "<a id='dl_rpt'                  style='padding: 5px 0px 0px 10%; 
cursor: pointer;' href='' title='' target='_blank'>"
+        + "<img id='dl_rpt_img'          src='' title='' height='16' 
width='16' alt='' />"
       + "</a>"
 
-      + "<a id='dl_rpt' style='padding: 5px 0px 0px 3px; text-decoration: 
none; cursor: pointer;' href='' title='' "
+      + "<a id='dl_rpt'                  style='padding: 5px 0px 0px 3px; 
text-decoration: none; cursor: pointer;' href='' title=''"
       + "target='_blank' ></a>"
 */
 //    + "<p></p>"
     + "</div>"
   + "</div>" );
 
-  // Show some helpful data and links for filesizes and checksums.
-//document.write( "<div class='sub-green-sel'>"
+  // Sub-green colored box.
+  // Show release info, filesizes, checksum links and help links.
   document.write( "<div id='sub_green_box' class='sub-green-sel'>"
-//  + "<div style='float: left; width: 77%;'>"
-    + "<div>"
-      + "<p>"
-        // Error text with hint.
-        + "<img id='dl_err_img'            style='margin: 5px 5px 15px 0px;' 
src='' title='' height='16' width='16' alt='' />"
-        + "<a id='dl_err'          style='text-decoration: none;' 
title=''></a>"
-
-        // Release info.
-        + "<a id='dl_rel_info'      style='text-decoration: none;'></a>"
-        + "<br />"
-
-        // Full installation: Filesize and checksums.
-        + "<a id='dl_f_info'        style='text-decoration: none;'></a>"
-        + "<a id='dl_f_chk_keys'    style='text-decoration: underline;' 
href='' title=''></a>"
-        + "<a id='space1'           style='text-decoration: none;'></a>"
-        + "<a id='dl_f_chk_asc'     style='text-decoration: underline;' 
href='' title=''></a>"
-        + "<a id='space2'           style='text-decoration: none;'></a>"
-        + "<a id='dl_f_chk_md5'     style='text-decoration: underline;' 
href='' title=''></a>"
-        + "<a id='space3'           style='text-decoration: none;'></a>"
-        + "<a id='dl_f_chk_sha256'  style='text-decoration: underline;' 
href='' title=''></a>"
-        + "<br />"
-
-        // Langpack: Filesize and checksums.
-        + "<a id='dl_lp_info'       style='text-decoration: none;'></a>"
-        + "<a id='dl_lp_chk_keys'   style='text-decoration: underline;' 
href='' title=''></a>"
-        + "<a id='space4'           style='text-decoration: none;'></a>"
-        + "<a id='dl_lp_chk_asc'    style='text-decoration: underline;' 
href='' title=''></a>"
-        + "<a id='space5'           style='text-decoration: none;'></a>"
-        + "<a id='dl_lp_chk_md5'    style='text-decoration: underline;' 
href='' title=''></a>"
-        + "<a id='space6'           style='text-decoration: none;'></a>"
-        + "<a id='dl_lp_chk_sha256' style='text-decoration: underline;' 
href='' title=''></a>"
-        + "<br />"
-
-        // Help: What is a language pack?
-        + "<img id='dl_hlp_img'     style='padding: 5px 5px 0px 0px;' src='' 
title='' height='16' width='16' alt='' />"
-        + "<a id='dl_hlp' href='' title='' target='_blank' 
onclick='showWindow( this.href ); return false;'></a>"
-        + "<a style='padding: 0px 0px 0px 30px;'></a>"
-
-        // Help: How to verify the download?
-        + "<img id='dl_chk_img'     style='padding: 5px 5px 0px 0px;' src='' 
title='' height='16' width='16' alt='' />"
-        + "<a id='dl_chk' href='' title='' target='_blank'></a>"
-        + "<a style='padding: 0px 0px 0px 30px;'></a>"
-
-        // Help: Report broken link.
-        + "<img id='dl_rpt_img'     style='padding: 5px 5px 0px 0px;' src='' 
title='' height='16' width='16' alt='' />"
-        + "<a id='dl_rpt' href='' title='' target='_blank'></a>"
-      + "</p>"
+    + "<p>"
+      // Error text with hint.
+      + "<img id='dl_err_img'    style='margin: 5px 5px 15px 0px;' src='' 
title='' height='16' width='16' alt='' />"
+      + "<a id='dl_err'                  style='text-decoration: none;' 
title=''></a>"
+
+      // Release info.
+      + "<a id='dl_rel_info'     style='text-decoration: none;'></a>"
+      + "<br />"
+
+      // Full installation: Filesize and checksums.
+      + "<a id='dl_f_info'       style='text-decoration: none;'></a>"
+      + "<a id='dl_f_chk_keys'   style='text-decoration: underline;' href='' 
title=''></a>"
+      + "<a id='space1'                  style='text-decoration: none;'></a>"
+      + "<a id='dl_f_chk_asc'    style='text-decoration: underline;' href='' 
title=''></a>"
+      + "<a id='space2'                  style='text-decoration: none;'></a>"
+      + "<a id='dl_f_chk_md5'    style='text-decoration: underline;' href='' 
title=''></a>"
+      + "<a id='space3'                  style='text-decoration: none;'></a>"
+      + "<a id='dl_f_chk_sha256'  style='text-decoration: underline;' href='' 
title=''></a>"
+      + "<br />"
+
+      // Langpack: Filesize and checksums.
+      + "<a id='dl_lp_info'      style='text-decoration: none;'></a>"
+      + "<a id='dl_lp_chk_keys'          style='text-decoration: underline;' 
href='' title=''></a>"
+      + "<a id='space4'                  style='text-decoration: none;'></a>"
+      + "<a id='dl_lp_chk_asc'   style='text-decoration: underline;' href='' 
title=''></a>"
+      + "<a id='space5'                  style='text-decoration: none;'></a>"
+      + "<a id='dl_lp_chk_md5'   style='text-decoration: underline;' href='' 
title=''></a>"
+      + "<a id='space6'                  style='text-decoration: none;'></a>"
+      + "<a id='dl_lp_chk_sha256' style='text-decoration: underline;' href='' 
title=''></a>"
+      + "<br />"
+
+      // Help: What is a language pack?
+      + "<img id='dl_hlp_img'    style='padding: 5px 5px 0px 0px;' src='' 
title='' height='16' width='16' alt='' />"
+      + "<a id='dl_hlp' href=''          title='' target='_blank' 
onclick='showWindow( this.href ); return false;'></a>"
+      + "<a                      style='padding: 0px 0px 0px 30px;'></a>"
+
+      // Help: How to verify the download?
+      + "<img id='dl_chk_img'    style='padding: 5px 5px 0px 0px;' src='' 
title='' height='16' width='16' alt='' />"
+      + "<a id='dl_chk' href=''          title='' target='_blank'></a>"
+      + "<a                      style='padding: 0px 0px 0px 30px;'></a>"
+
+      // Help: Report broken link.
+      + "<img id='dl_rpt_img'    style='padding: 5px 5px 0px 0px;' src='' 
title='' height='16' width='16' alt='' />"
+      + "<a id='dl_rpt' href=''          title='' target='_blank'></a>"
+    + "</p>" );
 /*
-    + "<div style='float: right; width: 23%;'>"
-      + "<p>"
-        + "<img id='dl_hlp_img' style='padding: 5px 0px 0px 5px;' src='' 
title='' height='16' width='16' alt='' />"
-//      + "<a style='padding: 0px 0px 0px 3%;'></a>"
-        + "<a id='dl_hlp' href='' title='' target='_blank' 
onclick='showWindow( this.href ); return false;'></a>"
-        + "<br />"
-
-        + "<img id='dl_chk_img' style='padding: 5px 0px 0px 5px;' src='' 
title='' height='16' width='16' alt='' />"
-//      + "<a style='padding: 0px 0px 0px 3%;'></a>"
-        + "<a id='dl_chk' href='' title='' target='_blank'></a>"
-        + "<br />"
-
-        + "<img id='dl_rpt_img' style='padding: 5px 0px 0px 5px;' src='' 
title='' height='16' width='16' alt='' />"
-//      + "<a style='padding: 0px 0px 0px 3%;'></a>"
-        + "<a id='dl_rpt' href='' title='' target='_blank'></a>"
-      + "</p>"
-      + "<div style='clear: both;'></div>"
+    + "<p>"
+      + "<img id='dl_hlp_img'    style='padding: 5px 0px 0px 5px;' src='' 
title='' height='16' width='16' alt='' />"
+//    + "<a                      style='padding: 0px 0px 0px 3%;'></a>"
+      + "<a id='dl_hlp' href=''          title='' target='_blank' 
onclick='showWindow( this.href ); return false;'></a>"
+      + "<br />"
+
+      + "<img id='dl_chk_img'    style='padding: 5px 0px 0px 5px;' src='' 
title='' height='16' width='16' alt='' />"
+//    + "<a                      style='padding: 0px 0px 0px 3%;'></a>"
+      + "<a id='dl_chk' href=''          title='' target='_blank'></a>"
+      + "<br />"
+
+      + "<img id='dl_rpt_img'    style='padding: 5px 0px 0px 5px;' src='' 
title='' height='16' width='16' alt='' />"
+//    + "<a                      style='padding: 0px 0px 0px 3%;'></a>"
+      + "<a id='dl_rpt' href=''          title='' target='_blank'></a>"
+    + "</p>"
 */
-    + "</div>" );
   document.write( "</div>" );
 
 //entourage.initialize();
 
   // Fill the select boxes and wait for the user's choice.
-  init( 1, false );
+  init( 1 );
 
   //-->
   </script>
 
   <!-- Green: Stable release: No JavaScript enabled -->
   <noscript>
-  <div class="button green-sel" id="optionitem2">
+  <div class="first button green-sel" id="optionitem2">
     <h2><a>Download Apache OpenOffice</a></h2>
     <p><a style="cursor: pointer;" 
href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/";
     title="Select from all platforms, languages, language packs to 
download">Your browser does not seem to allow JavaScript
@@ -639,7 +627,7 @@
     <img src="../../images/valid-xhtml10-blue.png"
     alt="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) 
of Web documents" /></a>
   </div>
-</div>
+  </div>
 </div>
 
 


Reply via email to