You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2014/05/03 00:15:11 UTC

svn commit: r1592065 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html

Author: marcus
Date: Fri May  2 22:15:11 2014
New Revision: 1592065

URL: http://svn.apache.org/r1592065
Log:
Updates

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

Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/index_droplist.html?rev=1592065&r1=1592064&r2=1592065&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original)
+++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Fri May  2 22:15:11 2014
@@ -55,25 +55,17 @@ screen reader. -->
   var NL_LANGUAGE = "";
   // Get the download URL for released install files (0 = release mode)
   var LINK        = getLink( 1 );
-/*
-  document.write ( "Language ISO: " + LANG_ISO + " - has MirrorLink()?: " + hasMirrorLink() + "<br />"
-  + "SourceForge: " + SOURCEFORGE + " - Other: " + OTHER + " - Archive: " + ARCHIVE + "<br />"
-  + "UI_PLATFORM: " + UI_PLATFORM + " - URL_PLATFORM: " + URL_PLATFORM + " - EXTENSION: " + EXTENSION + "<br />"
-  + "LINK: " + LINK );
-*/
   if ( hasMirrorLink() ) {
     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;\">"
-        + "<h2><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE
-        + " | Build ID " + BUILD + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>"
-        + "Download Apache OpenOffice " + VERSION + "</a></h2>"
-        + "<p><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE + " | Build ID " + BUILD
-        + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>Click here to download for:<br />"
-        + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | "
-        + "~" + FILESIZE_FULL + "&nbsp;MByte | Released:&nbsp;" + REL_DATE + "<br /></a></p>"
+        + "<h2><a href='" + LINK + "' title='" + LINK + "'>Download Apache OpenOffice " + VERSION + "</a></h2>"
+        + "<p><a href='" + LINK + "' title='" + LINK + "'>Click here to download (hosted by Sourceforge.net) for:"
+        + "<br /><b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>"
+        + "<br />Filesize ~" + FILESIZE_FULL + "&nbsp;MByte | Milestone " + MILESTONE + " | Build ID " + BUILD
+        + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "</a></p>"
       + "</div>" );
     } else if ( OTHER ) {
       // If download URL contains "other" (-> platform, OS or package manager was not recognized),
@@ -89,7 +81,7 @@ screen reader. -->
     } 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','"
+      document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','" 
         + LINK + "');" + "return false;\">"
         + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
         + "Download Apache OpenOffice</a></h2>"
@@ -100,8 +92,8 @@ screen reader. -->
     }
   } else {
     // 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','"
-      + LINK + "');" + "return false;\">"
+    document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','" + LINK + "');"
+      + "return false;\">"
       + "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>"
       + "Download Apache OpenOffice</a></h2>"
       + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>Apache OpenOffice " + VERSION + " for "
@@ -110,32 +102,30 @@ screen reader. -->
     + "</div>" );
   }
   // Show some helpful links for SDK, source, checksums, release notes, legacy version.
-  document.write( "<div class=\"sub-green\">" );
-  document.write( "<p>" );
-  if ( CHECKSUM_ASC_FULL ) {
-    document.write( "Signatures and hashes: "
-    + "<a href='" + CHECKSUM_KEYS	 + "' + title='KEYS signature'>KEYS</a> , "
-    + "<a href='" + CHECKSUM_ASC_FULL	 + "' + title='ASC signature'>ASC</a> , "
-    + "<a href='" + CHECKSUM_MD5_FULL	 + "' + title='MD5 hash'>MD5</a> , "
-    + "<a href='" + CHECKSUM_SHA256_FULL + "' + title='SHA256 hash'>SHA256</a> , "
-    + "<a href='../checksums.html' title='How to verify the download with checksums?'>How to verify?</a> | " );
-  }
-  if ( ARCHIVE ) {
-    VERSION = PRE_VERSION;
-  }
-  document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+" + VERSION + "+Release+Notes'"
-    + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'><b>Release Notes</b></a> | <br />"
-    + "<a href='other.html' title='Get all platforms, languages, language packs to download'>"
-    + "<b>Get all platforms, languages, language packs</b></a> | "
-    + "<a href='other.html#source' title='Get the source code and SDK to download'>Source code and SDK</a> | <br />"
-    + "<a href='../../porting/index.html'"
-    + "title='Get Apache OpenOffice software packaged as portable USB versions and third-party ports'>"
-    + "<b>Portable USB versions</b> and third-party ports</a> | "
-    + "Old and legacy version: <a href='../other-341.html' title='Get the old version of Apache OpenOffice "
-    + OLDVERSION + "'><b>" + OLDVERSION + "</b></a> + "
-    + "<a href='../legacy/index.html' title='Get the legacy version of OpenOffice.org "
-    + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a></p>"
+  document.write( "<div class='sub-green'>"
+    + "<p>" );
+    if ( CHECKSUM_ASC_FULL ) {
+      document.write( "Signatures and hashes: "
+      + "<a href='" + CHECKSUM_KEYS	 + "' + title='KEYS signature'>KEYS</a> , "
+      + "<a href='" + CHECKSUM_ASC_FULL	 + "' + title='ASC signature'>ASC</a> , "
+      + "<a href='" + CHECKSUM_MD5_FULL	 + "' + title='MD5 hash'>MD5</a> , "
+      + "<a href='" + CHECKSUM_SHA256_FULL + "' + 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+" + VERSION_SHORT + "+Release+Notes'"
+      + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'><b>Release Notes</b></a> | <br />"
+      + "<a href='other.html' title='Get all platforms, languages, language packs to download'>"
+      + "<b>Get all platforms, languages, language packs</b></a> | "
+      + "<a href='other.html#source' title='Get the source code and SDK to download'>Source code and SDK</a> | <br />"
+      + "<a href='../../porting/index.html'"
+      + "title='Get Apache OpenOffice software packaged as portable USB versions and third-party ports'>"
+      + "<b>Portable USB versions</b> and third-party ports</a> | "
+      + "Old and legacy version: <a href='../other-341.html' title='Get the old version of Apache OpenOffice "
+      + OLDVERSION + "'><b>" + OLDVERSION + "</b></a> + "
+      + "<a href='../legacy/index.html' title='Get the legacy version of OpenOffice.org "
+      + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a></p>"
   + "</div>" );
+
   entourage.initialize();
   //-->
   </script>
@@ -164,54 +154,62 @@ screen reader. -->
   <!-- Grey: Listboxes -->
   <script type="text/javascript">
   <!--
-/*
-  document.write ( "Language ISO: " + LANG_ISO + "<br />"
-  + "SourceForge: " + SOURCEFORGE + " - Other: " + OTHER + " - Archive: " + ARCHIVE + "<br />"
-  + "UI_PLATFORM: " + UI_PLATFORM + " - URL_PLATFORM: " + URL_PLATFORM + " - EXTENSION: " + EXTENSION + "<br />"
-  + "LINK: " + LINK );
-*/
   document.write( "<div class='button grey' id='optionitem2'>"
-    + "<h2><a>Need " + VERSION + " but for another OS or language?</a></h2>"
+    + "<h2><a>Looking for another OS, language or version?</a></h2>"
     + "<p style='padding-bottom: 0px; '>"
-    + "<a>Select from all available full installation sets and language packs to download your favorite version:</a></p>"
+    + "<a>Select your favorite installation from the following choice:</a></p>"
     + "<div>"
       + "<form name='download'>"
-      + "<select id='os'   name='os'   onchange='getLinkAlt( 1 )'>"
-      + "</select>"
-      + "<select id='lang' name='lang' onchange='getLinkAlt( 1 )'>"
-      + "</select>"
-/*
-      + "<select id='ver'  name='ver'  onchange='getLinkAlt( 1 )'>"
-      + "</select>"
-*/
-      + "<input type='button' name='reset_select' value='Reset' onclick='resetSel()'>"
+        + "<select id='os'      name='os'   onchange='getLinkSel( 1 )'></select>"
+        + "<select id='lang'    name='lang' onchange='getLinkSel( 1 )'></select>"
+        + "<select id='ver'     name='ver'  onchange='getLinkSel( 1 )'></select>"
+        + "<input type='button' name='reset_select' value='Reset' onclick='resetSel()'>"
       + "</form>"
 
-      + "<h3 style='display: block';>"
-      + "<a id='dl_full_link' href='#' title=''></a>"
-      + "<a id='dl_lp_link' href='#' title=''></a></h3><br />"
-      + "<p><a style='cursor: pointer'; id='dl_help' href='#' title=''></a></p>"
+      + "<h3 style='display: inline';>"
+        + "<a id='dl_full_link' href='' title=''></a><a id='dl_lp_link' href='' title=''></a>"
+      + "</h3>"
+
+      + "<a style='cursor: pointer'; id='dl_help' title='' target='_blank' href='' "
+        + "onclick='showPopup( this.href ); return false; '>"
+        + "<img id='dl_help_img' src='' title='' alt='' />"
+      + "</a>"
+/*
+      + "<a style='cursor: pointer'; id='dl_help' target='_blank' href='' title=''>"
+        + "<img id='dl_help_img' src='' title='' alt='' />"
+      + "</a>"
+*/
+      + "<br /><br />"
+      + "<p><a id='dl_rel_data' title=''></a></p>"
     + "</div>"
   + "</div>" );
-/*
-  // Show some helpful links for SDK, source, checksums, release notes, legacy version.
-  document.write( "<div class=\"sub-grey\">" );
-  document.write( "<p>"
-    + "<a id='dl_full_chk_headline'></a>"
-    + "<a id='dl_full_chk_keys'   href='' title=''></a><a id='space1'></a>"
-    + "<a id='dl_full_chk_asc'    href='' title=''></a><a id='space2'></a>"
-    + "<a id='dl_full_chk_md5'    href='' title=''></a><a id='space3'></a>"
-    + "<a id='dl_full_chk_sha256' href='' title=''></a><a id='space4'></a>"
-    + "<a id='dl_chk_verify'      href='' title=''></a><br />"
-    + "<a id='dl_lp_chk_headline'></a>"
-    + "<a id='dl_lp_chk_keys'     href='' title=''></a><a id='space5'></a>"
-    + "<a id='dl_lp_chk_asc'      href='' title=''></a><a id='space6'></a>"
-    + "<a id='dl_lp_chk_md5'      href='' title=''></a><a id='space7'></a>"
-    + "<a id='dl_lp_chk_sha256'   href='' title=''></a>" );
+
+  // Show some helpful data for filesizes and checksums.
+  document.write( "<div class='sub-grey'>"
+    + "<p>"
+    + "<a id='dl_full_hl'         style='font-weight: bold; text-decoration: none'; >Full installation: </a>"
+    + "<a id='dl_full_size_hl'    style='text-decoration: none'; ></a>"
+    + "<a id='dl_full_size'       style='text-decoration: none'; ></a>                       <a id='space1'></a>"
+    + "<a id='dl_full_chk_hl'     style='text-decoration: none'; >Signatures and hashes: </a>"
+    + "<a id='dl_full_chk_keys'   style='text-decoration: link'; href='' title=''></a>       <a id='space2'></a>"
+    + "<a id='dl_full_chk_asc'    style='text-decoration: link'; href='' title=''></a>       <a id='space3'></a>"
+    + "<a id='dl_full_chk_md5'    style='text-decoration: link'; href='' title=''></a>       <a id='space4'></a>"
+    + "<a id='dl_full_chk_sha256' style='text-decoration: link'; href='' title=''></a>       <a id='space5'></a>"
+    + "<a id='dl_chk_verify'      style='text-decoration: link'; href='' title=''></a>"
+    + "<br />"
+
+    + "<a id='dl_lp_hl'           style='font-weight: bold; text-decoration: none'; >Language pack: </a>"
+    + "<a id='dl_lp_size_hl'      style='text-decoration: none'; ></a>"
+    + "<a id='dl_lp_size'         style='text-decoration: none'; ></a>                       <a id='space6'></a>"
+    + "<a id='dl_lp_chk_hl'       style='text-decoration: none'; >Signatures and hashes: </a>"
+    + "<a id='dl_lp_chk_keys'     style='text-decoration: link'; href='' title=''></a>       <a id='space7'></a>"
+    + "<a id='dl_lp_chk_asc'      style='text-decoration: link'; href='' title=''></a>       <a id='space8'></a>"
+    + "<a id='dl_lp_chk_md5'      style='text-decoration: link'; href='' title=''></a>       <a id='space9'></a>"
+    + "<a id='dl_lp_chk_sha256'   style='text-decoration: link'; href='' title=''></a>"
+    + "<p>" );
   document.write( "</div>" );
-*/
-  fillSelOS();
 
+  init();
   //-->
   </script>
 
@@ -235,12 +233,6 @@ screen reader. -->
     var NL_LANGUAGE = "";
     // Get the download URL for Beta releases (>0 = beta mode)
     var LINK        = getLink( 1 );
-/*
-    document.write ( "Language ISO: " + LANG_ISO + " - has MirrorLink()?: " + hasMirrorLink() + "<br />"
-    + "SourceForge: " + SOURCEFORGE + " - Other: " + OTHER + " - Archive: " + ARCHIVE + "<br />"
-    + "UI_PLATFORM: " + UI_PLATFORM + " - URL_PLATFORM: " + URL_PLATFORM + " - EXTENSION: " + EXTENSION + "<br />"
-    + "LINK: " + LINK );
-*/
     if ( hasMirrorLink() ) {
       if ( SOURCEFORGE ) {
         // If a Beta Release is available for download, then download from Sourceforge with displayed platform and language.
@@ -292,17 +284,18 @@ screen reader. -->
       + "</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( "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> | " );
-    }
-    document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes'"
+    document.write( "<div class='sub-yellow'>"
+      + "<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> | " );
+      }
+      document.write( ""
+      + "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+" + VERSION_SHORT + "+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> | "
@@ -325,8 +318,8 @@ screen reader. -->
   }
   //-->
   </script>
-
   <!-- Yellow: Beta: No JavaScript enabled -->
+<!--
   <noscript>
   <div class="button yellow" id="optionitem3" onclick="openItem('optionitem3','all_beta.html'); return false;">
     <h2><a href="all_beta.html" title="Select from all platforms, languages, language packs to download">
@@ -344,7 +337,7 @@ screen reader. -->
     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="optionitem4">
     <h2><a style="cursor: default;" title="Help spread the word and tell your friends about Apache OpenOffice">
@@ -567,6 +560,10 @@ screen reader. -->
 
   <div id="SupportedAndSupporters">
     <p>&nbsp;</p>
+    <a href="http://www.sourceforge.net" title="Sourceforge - Download, Develop and Publish Free Open Source Software">
+    <img src="../../images/sourceforge.png" width="160" height="34"
+    alt="Sourceforge - Download, Develop and Publish Free Open Source Software"/></a>
+    <br /><br />
     <a href="http://validator.w3.org/check?uri=referer" target="_blank"
     title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents">
     <img src="../../images/valid-xhtml10-blue.png"