Author: buildbot
Date: Wed Jun 25 22:52:31 2014
New Revision: 913849

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/zh-cn/download/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 25 22:52:31 2014
@@ -1 +1 @@
-1605629
+1605631

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 25 22:52:31 2014
@@ -1 +1 @@
-1605629
+1605631

Modified: websites/staging/ooo-site/trunk/content/zh-cn/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/download/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/download/index.html Wed Jun 
25 22:52:31 2014
@@ -11,22 +11,22 @@
   <meta property="og:description" content="加入OpenOffice革命,å…
è´¹çš„office套件与超过3000万受信任的下载." />
   <meta property="og:image" 
content="http://www.openoffice.org/images/aoo-logo-100x100.png"; />
   <title>Apache OpenOffice - 下载</title>
-  <script type="text/javascript">
-  </script>
-  <script type="text/javascript" src="/download/globalvars.js"></script>
-  <script type="text/javascript" src="/download/download.js"></script>
-  <script type="text/javascript" src="/download/release_matrix.js"></script>
-  <script type="text/javascript" src="/download/languages.js"></script>
+  <script type="text/javascript" src="../../download/globalvars.js"></script>
+  <script type="text/javascript" src="msg_prop_l10n_zh-cn.js"></script>
+  <script type="text/javascript" src="../../download/languages.js"></script>
+  <script type="text/javascript" 
src="../../download/release_matrix.js"></script>
+  <script type="text/javascript" 
src="../../download/boxed_download.js"></script>
+  <script type="text/javascript" src="../../download/download.js"></script>
   <style type="text/css">
   /* <![CDATA[ */
   /*-------------------- Exceptions on standard css -----------------------*/
-  @import "/download/styles.css";
-  @import "/download/exceptions.css";
+  @import "../../download/styles.css";
+  @import "../../download/exceptions.css";
   /* ]]> */
   </style>
   <script>
     if (window.document.referrer.indexOf("shell.windows.com") != -1)
-      location.href = "/why/why_odf.html";
+      location.href = "../../why/why_odf.html";
 
     function shareFacebook() {
       _gaq.push(['_trackEvent','social', 'shareDownload', 'facebook']); 
@@ -75,74 +75,49 @@
 
 <div class="optionset">
 
-<!-- Green: Stable release -->
-  <script type="text/javascript">  
+  <!-- Text above the first colored box -->
+  <script type="text/javascript">
   <!--
-  // Set a specific language ISO code to force to assemble a certain localized 
build as download URL
-  var NL_LANGUAGE = "zh-CN";
-  // Get the download URL
-  var LINK        = getLink();
-
-  if ( hasMirrorLink() ) {
-    // Download directly from a mirror 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 + "'>下载 Apache 
OpenOffice " + VERSION + "</a></h2>"
-    + "<p><a href='" + LINK + "' title='Version " + VERSION + " - Milestone " 
+ MILESTONE
-    + " - Build ID " + BUILD + " - SVN " + SVN_REV + 
"'>点击这里获取最新的 "
-    + "<b>" + UI_PLATFORM + "</b> <b>" + LANG_ARRAY[ 2 ] + "</b> 
版本.</a></p>");
-  } else {
-    // 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 ] + "'>"
-    + "下载 Apache OpenOffice " + VERSION + "</a></h2>"
-    + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>A 
release for "
-    + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> 
不可用.请从下载页选择一种可替代的语言版本.</a></p>" );
-  }
-  document.write( "</div>" );
-
-  // Show some helpful links for SDK, source, checksums, release notes, legacy 
version.
-  document.write( "<div class=\"sub-green\">"
-    + "<p><a href='/download/other.html' 
title='获取所有平台,语言的Apache OpenOffice、语言包
的下载地址'>"
-    + "<b>获取所有平台版本或语言、语言包</b></a> | "
-    + "<a href='/download/other.html#source' title='获取所有源代码包
和SDK下载'>"
-    + "<b>源代码和SDK</b></a> | <br />");
-    if ( CHECKSUM_ASC ) {
-      document.write( "签名和哈希: "
-      + "<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> | 
");
-    }
-    document.write( "<a 
href='https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=34025037'"
-    + "title='Apache OpenOffice " + VERSION + " 
有何更新,有何进步?'>发行说明</a> | "
-    + "获取早先版本: <a href='/download/other-341.html' title='Apache 
OpenOffice 3.4.1'>3.4.1</a> 或 <a href='/download/legacy/index.html' 
title='OpenOffice.org 3.3.0'>3.3.0</a></p>"
-  + "</div>" );
-  
+  // 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;'>" + l10n_download_headline_text 
+ "</h1>" );
+  //-->
+  </script>
+
+  <!-- Green: Stable release -->
+  <!-- Download via select boxes -->
+  <script type="text/javascript">
+  <!--
+
+  // Set a specific language ISO code to force to assemble a certain localized 
build as download link.
+  // Changed: The variable can now be found in the 
"msg_prop_l10n_<ISO_code>.js".
+
+  // Get the download box from a separate file.
+  createDownloadBox();
+
+  // Fill the select boxes and wait for the user's choice.
+  init( 1 );
+
   entourage.initialize();
+
   //-->
   </script>
 
-<!-- Green: Stable release: No JavaScript enabled -->
+  <!-- Green: Stable release: No JavaScript enabled -->
   <noscript>
-  <div class="button green" id="optionitem1" 
onclick="openItem('optionitem1','other.html'); return false;">
-    <h2><a href="/download/other.html" title="选择å…
¶å®ƒå¹³å°ï¼Œè¯­è¨€çš„下载">
-    下载 Apache OpenOffice</a></h2>
-    <p><a href="/download/other.html" title="选择å…
¶å®ƒå¹³å°ï¼Œè¯­è¨€çš„下载">
-    
需要启用JavaScript以获得最好的下载体验.当前似乎没有启用.
-    请点击本文使用替代页以选择最佳的平台和语言。</a></p>
-  </div>
-  <div class="sub-green">
-    <p><a href="/download/other.html" 
title="获取所有平台,语言的OpenOffice、语言包的下载地址">
-    <b>获取所有平台版本或语言、语言包</b></a> |
-    <a href="/download/other.html#source" title="获取所有源代码包
和SDK下载">
-    <b>源代码和SDK</b></a> | <br />
-    <a href="/download/other.html" title="Apache OpenOffice的æ 
¡éªŒå’Œ">签名和哈希</a> |
-    <a href="/development/releases/index.html" title="Apache 
OpenOffice有何更新,有何进步?">
-    发行说明</a> |
-    <a href='/download/legacy/index.html' title='获取遗留版本 
OpenOffice.org 3.3.0'>遗留版本</a></p>
+  <div class="first button green-sel" id="optionitem1">
+    <h2>
+      <a style="cursor: pointer;" 
href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/";
+        title="选择其它平台,语言的下载">下载 Apache OpenOffice
+      </a>
+    </h2>
+    <p>
+      <a style="cursor: pointer;" 
href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/";
+       title="选择其它平台,语言的下载">
+        
需要启用JavaScript以获得最好的下载体验.当前似乎没有启用.
+        请点击本文使用替代页以选择最佳的平台和语言。
+      </a>
+    </p>
   </div>
   </noscript>
 
@@ -180,164 +155,7 @@
    和其他用户一道,在与日俱增的模版库里上传
、下载模版,扩展您的Apache OpenOffice创造力.</a></p>
   </div>
 
-
-<!-- Yellow: Release Candidate online -->
-  <script type="text/javascript">
-  /*
-  <!--
-  if ( RC_ACTIVE == 1 ) {
-    document.write( "<div class=\"button yellow\" id=\"optionitem4\" 
onclick=\"openItem('optionitem4',"
-      + "'all_rc.html#untested-full');"
-      + "return false;\">"
-      + "<h2><a href='all_rc.html#untested-full' title='Select from other 
platforms and languages to download'>"
-      + "Get OpenOffice.org Release Candidates</a></h2>"
-      + "<p><a href='all_rc.html#untested-full' title='Select from other 
platforms and languages to download'>"
-      + "<b>Most recent: OOo " + RC_NAME + " " + RC_NUMBER + "</b></a></p>"
-    + "</div>" );
-    document.write( "<div class=\"sub-yellow\">"
-      + "<p><a href='all_rc.html' title='Get all platforms, languages, 
language packs to download'>"
-      + "Get all platforms, languages, language packs</a> | "
-      + "<a href='http://www.openoffice.org/development/releases/"; + RC_BUILD 
+ ".html'"
-      + "title='What is new, what has been improved in OpenOffice.org " + 
RC_NAME + RC_NUMBER + "?'>Release Notes</a> | "
-      + "<a href='next/md5sums/" + RC_BUILD + "_md5sums.txt' title='MD5 
checksums for OpenOffice.org " + RC_NAME + RC_NUMBER
-      + "'>MD5 checksums</a></p>"
-    + "</div>" );
-  } else if ( RC_ACTIVE == 0 ) {
-  // Yellow: Release Candidate coming soon
-    document.write( "<div class=\"button yellow\" id=\"optionitem4\">"
-      + "<h2><a>Get OpenOffice.org Release Candidate <small>(" + RC_NAME + 
RC_NUMBER + " coming soon)</small></a></h2>"
-      + "<p><a>A wide range of platforms and languages will be available."
-      + "<br /><b>Important:</b> These builds are nearly ready but needs to be 
finally tested and are therefore not "
-      + "released.</a></p>"
-    + "</div>" );
-  }
-  //-->
-  */
-  </script>
-
-<!-- Yellow: Release Candidate: No JavaScript enabled -->
-  <!--
-  <noscript>
-  <div class="button yellow" id="optionitem4" 
onclick="openItem('optionitem4','all_rc.html#untested-full'); return false;">
-    <h2><a href="all_rc.html" title="Select from all platforms, languages, 
language packs to download">
-    Get OpenOffice.org Release Candidate</a></h2>
-    <p><a href="all_rc.html" title="Select from other platforms, languages, 
language packs to download">
-    JavaScript needs to be enabled to take full advantage of this download 
section. Currently it does not seem to be enabled.
-    Please click on this text to use the alternative webpage to select the 
favorite platform and language.</a></p>
-  </div>
-  <div class="sub-yellow">
-    <p><a href="all_rc.html" title="Get all platforms, languages, language 
packs to download">
-    Get all platforms, languages, language packs</a> |
-    <a href="http://www.openoffice.org/development/releases/dev_index.html";
-    title="What is new, what has been improved in OpenOffice.org?">Release 
Notes</a> |
-    <a href="next/md5sums/index.html" title="MD5 checksums for 
OpenOffice.org">MD5 checksums</a></p>
-  </div>
-  </noscript>
-  //-->
-
-<!-- Yellow: Beta Release online -->
-  <script type="text/javascript">
-  /*
-  <!--
-  if ( BETA_ACTIVE == 1 ) {
-    document.write( "<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'\">"
-      + "Get OpenOffice.org Beta Release</a></h2>"
-      + "<p><a href='all_beta.html' title='Select from all platforms, 
languages, language packs to download'\">"
-      + "<b>Most recent: OOo-Dev " + BETA_NAME + " " + BETA_NUMBER + 
"</b></a></p>"
-    + "</div>" );
-    document.write( "<div class=\"sub-yellow\">"
-      + "<p><a href='all_beta.html' title='Get all platforms, languages, 
language packs to download'>"
-      + "Get all platforms, languages, language packs</a> | "
-      + "<a href='http://www.openoffice.org/development/releases/"; + 
BETA_BUILD + ".html'"
-      + "title='What is new, what has been improved in OpenOffice.org " + 
BETA_NAME + BETA_NUMBER + "?'>Release Notes</a> | "
-      + "<a href='next/md5sums/index.html" + BETA_BUILD + "_md5sums.txt' 
title='MD5 checksums for OpenOffice.org "
-      + BETA_NAME + BETA_NUMBER + "'>MD5 checksums</a></p>"
-    + "</div>" );
-  } else if ( BETA_ACTIVE == 0 ) {
-  // Yellow: Beta Release coming soon
-    document.write( "<div class=\"button yellow\" id=\"optionitem2\">"
-      + "<h2><a>Get OpenOffice.org Beta Release <small>(" + BETA_NAME + 
BETA_NUMBER + " coming soon)</small></a></h2>"
-      + "<p><a>A wide range of platforms and languages will be available."
-      + "<br /><b>Important:</b> The Beta is feature complete but can contain 
issues and detailed tests needs to be done."
-      + "</a></p>"
-    + "</div>" );
-  }
-  //-->
-  */
-  </script>
-
-<!-- Yellow: Beta: No JavaScript enabled -->
-  <!--
-  <noscript>
-  <div class="button yellow" id="optionitem2" 
onclick="openItem('optionitem2','all_beta.html#untested-full'); return false;">
-    <h2><a href="all_beta.html" title="Select from all platforms, languages, 
language packs to download">
-    Get OpenOffice.org Beta Release</a></h2>
-    <p><a href="all_beta.html" title="Select from all platforms, languages, 
language packs to download">
-    JavaScript needs to be enabled to take full advantage of this download 
section. Currently it does not seem to be enabled.
-    Please click on this text to use the alternative webpage to select the 
favorite platform and language.</a></p>
-  </div>
-  <div class="sub-yellow">
-    <p><a href="all_beta.html" title="Get all platforms, languages, language 
packs to download">
-    Get all platforms, languages, language packs</a> |
-    <a href="http://www.openoffice.org/development/releases/dev_index.html";
-    title="What is new, what has been improved in OpenOffice.org?">Release 
Notes</a> |
-    <a href="next/md5sums/index.html" title="MD5 checksums for 
OpenOffice.org">MD5 checksums</a></p>
-  </div>
-  </noscript>
-  //-->
-
-<!-- Red: Developer Snapshots online -->
-  <script type="text/javascript">
-  /*
-  <!--
-  document.write( "<div class=\"button orange\" id=\"optionitem5\" 
onclick=\"openItem('optionitem5','next/index.html');"
-    + "return false;\">"
-    + "<h2><a href='next/index.html' title='Select from the most recent 
OpenOffice.org Developer Snapshots'>"
-    + "Get OpenOffice.org Developer Snapshots</a></h2>" );
-    document.write( "<p><a href='next/index.html' title='Select from the most 
recent OpenOffice.org Developer "
-    + "Snapshots'><b>" );
-    if ( DEV1_VERSION != "" ) {
-      document.write( "Most recent: " + DEV1_VERSION + " (" + DEV1_BUILD + ") 
and " + DEV2_VERSION + " (" + DEV2_BUILD
-        + ")" );
-    } else {
-      document.write( "Most recent: " + DEV2_VERSION + " (" + DEV2_BUILD + ")" 
);
-    }
-    document.write( "</b></a></p>"
-  + "</div>" );
-  document.write( "<div class=\"sub-orange\">"
-    + "<p><a href='next/other.html' title='Get all platforms, languages, SDK 
builds, source tarballs to download'>"
-    + "Get all platforms, languages, SDK builds, source tarballs</a> | "
-    + "<a href='http://www.openoffice.org/development/releases/dev_index.html'"
-    + "title='What is new, what has been improved in OpenOffice.org?'>Release 
Notes</a> | "
-    + "<a href='next/md5sums/index.html' title='MD5 checksums for 
OpenOffice.org'>MD5 checksums</a></p>"
-  + "</div>" );
-  //-->
-  */
-  </script>
-
-<!-- Red: Developer Snapshots: No JavaScript enabled -->
-  <!--
-  <noscript>
-  <div class="button orange" id="optionitem5" 
onclick="openItem('optionitem5','next/index.html'); return false;">
-    <h2><a href="next/other.html" title="Select from the most recent 
OpenOffice.org Developer Snapshots">
-    Get OpenOffice.org Developer Snapshots</a></h2>
-    <p><a href="next/other.html" title="Select from the most recent 
OpenOffice.org Developer Snapshots">
-    JavaScript needs to be enabled to take full advantage of this download 
section. Currently it does not seem to be enabled.
-    Please click on this text to use the alternative webpage to select the 
favorite platform and language.</a></p>
-  </div>
-  <div class="sub-orange">
-    <p><a href="next/other.html" title="Get all platforms, languages, language 
packs, SDK builds, source tarballs to
-    download">
-    Get all platforms, languages, language packs, SDK builds, source 
tarballs</a> |
-    <a href="http://www.openoffice.org/development/releases/dev_index.html"; 
title="What is new, what has been improved in
-    OpenOffice.org?">
-    Release Notes</a> | <a href="next/md5sums/index.html" title="MD5 checksums 
for OpenOffice.org">MD5 checksums</a></p>
-  </div>
-  </noscript>
-  //-->
-</div>
+</div> <!-- class "optionset" -->
 
 <div class="additionalinformation">
 
@@ -399,6 +217,8 @@
     -->
   </ul>
 
+  <br /><br />
+
   <div id="SupportedAndSupporters">
     <a 
href="http://validator.w3.org/check?uri=http://www.openoffice.org/download/index.html";
     title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) 
of Web documents">


Reply via email to