Author: buildbot
Date: Thu Jul 25 21:33:44 2013
New Revision: 871199

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 Thu Jul 25 21:33:44 2013
@@ -1 +1 @@
-1506879
+1507137

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul 25 21:33:44 2013
@@ -1 +1 @@
-1506879
+1507137

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 Thu Jul 
25 21:33:44 2013
@@ -3,75 +3,58 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-
-  
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  
-    <meta itemprop="name" content="下载Apache OpenOffice">
-    <meta itemprop="description" content="加入OpenOffice革命,å…
è´¹çš„office套件与超过3000万受信任的下载.">
-    <meta itemprop="image" 
content="http://www.openoffice.org/images/aoo-logo-100x100.png";>
-
-    <meta property="og:title" content="下载Apache OpenOffice" /> 
-    <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>
-
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta itemprop="name" content="下载Apache OpenOffice" />
+  <meta itemprop="description" content="加入OpenOffice革命,å…
è´¹çš„office套件与超过3000万受信任的下载." />
+  <meta itemprop="image" 
content="http://www.openoffice.org/images/aoo-logo-100x100.png"; />
+  <meta property="og:title" content="下载Apache OpenOffice" />
+  <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">
-    if (window.document.referrer.indexOf("shell.windows.com") != -1)
-               location.href = "/why/why_odf.html";
   </script>
-   
-  <!-- <script type="text/javascript" src="globalvars.js"></script> -->
-  <!-- <script type="text/javascript" src="download.js"></script> -->
-  <!-- <script type="text/javascript" src="download_bouncer.js"></script> -->
-  <!-- <script type="text/javascript" src="globalvars_new_dl.js"></script> -->
-  <!-- <script type="text/javascript" src="download_new_dl.js"></script> -->
-  <!-- <script type="text/javascript" 
src="download_new_mirrorbrain.js"></script> -->
-  <!-- <script type="text/javascript" src="languages_new_dl.js"></script> -->
-       <script type="text/javascript" 
src="/download/globalvars_improved.js"></script>
-       <script type="text/javascript" 
src="/download/download_improved.js"></script>
-       <script type="text/javascript" 
src="/download/download_mirrorbrain_improved.js"></script>
-       <script type="text/javascript" 
src="/download/languages_improved.js"></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/languages.js"></script>
   <script type="text/javascript" src="/scripts/entourage.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";
 
-    <script>
-       function shareFacebook() {
-               _gaq.push(['_trackEvent','social', 'shareDownload', 
'facebook']); 
-               
window.open('https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
   
-       }
-       
-       function shareTwitter(){
-               _gaq.push(['_trackEvent','social', 'shareDownload', 
'twitter']); 
-               
window.open('https://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F&text=%C3%E2%B7%D1%B5%C4office%CC%D7%BC%FE&hashtags=openoffice','_blank','toolbar=0,status=0,width=580,height=325');
-       }
-       
-       function shareGooglePlus(){
-               _gaq.push(['_trackEvent','social', 'shareDownload', 
'google+']); 
-               
window.open('https://plus.google.com/share?url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
-       }
-       function shareQzone(){
-               _gaq.push(['_trackEvent','social', 'shareDownload', 'Qzone']); 
-               
window.open('http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
-       }
-       function shareSinaWeibo(){
-               _gaq.push(['_trackEvent','social', 'shareDownload', 
'SinaWeibo']); 
-               
window.open('http://service.weibo.com/share/share.php?url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
-       }
-       function shareTencentWeibo(){
-               _gaq.push(['_trackEvent','social', 'shareDownload', 
'TencentWeibo']); 
-               
window.open('http://share.v.t.qq.com/index.php?c=share&a=index&url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F&title=Apache%20OpenOffice%20-%20%C3%E2%B7%D1%B5%C4office%CC%D7%BC%FE','_blank','toolbar=0,status=0,width=580,height=325');
-       }
+    function shareFacebook() {
+      _gaq.push(['_trackEvent','social', 'shareDownload', 'facebook']); 
+      
window.open('https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
    
+    }
+
+    function shareTwitter(){
+      _gaq.push(['_trackEvent','social', 'shareDownload', 'twitter']); 
+      
window.open('https://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F&text=%C3%E2%B7%D1%B5%C4office%CC%D7%BC%FE&hashtags=openoffice','_blank','toolbar=0,status=0,width=580,height=325');
+    }
+
+    function shareGooglePlus(){
+      _gaq.push(['_trackEvent','social', 'shareDownload', 'google+']); 
+      
window.open('https://plus.google.com/share?url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
+    }
+    function shareQzone(){
+      _gaq.push(['_trackEvent','social', 'shareDownload', 'Qzone']); 
+      
window.open('http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
+    }
+    function shareSinaWeibo(){
+      _gaq.push(['_trackEvent','social', 'shareDownload', 'SinaWeibo']); 
+      
window.open('http://service.weibo.com/share/share.php?url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
+    }
+    function shareTencentWeibo(){
+      _gaq.push(['_trackEvent','social', 'shareDownload', 'TencentWeibo']); 
+      
window.open('http://share.v.t.qq.com/index.php?c=share&a=index&url=http%3A%2F%2Fwww.openoffice.org%2Fzh-cn%2Fdownload%2F&title=Apache%20OpenOffice%20-%20%C3%E2%B7%D1%B5%C4office%CC%D7%BC%FE','_blank','toolbar=0,status=0,width=580,height=325');
+    }
   </script>
- 
-       
 
 <!--#include virtual="/google-analytics.js" -->
 </head>
@@ -88,51 +71,53 @@
     
     
     
-       
+
 <div class="optionset">
 
 <!-- Green: Stable release -->
   <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";
-  // Set some variables
-  var LINK        = getLink( VERSION, NL_LANGUAGE, MIRROR, SCHEMA );
-  var LANG_ARRAY  = getArray( NL_LANGUAGE );
-  var LANG_ISO    = getLanguageISO( NL_LANGUAGE );
-  var PLATFORM    = getPlatform( SCHEMA );
+  var NL_LANGUAGE = "zh-CN";
+  // Get the download URL
+  var LINK        = getLink();
 
-  if ( hasMirrorLink( NL_LANGUAGE ) ) {
+  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='" + LINK + "'>Download 
Apache OpenOffice " + VERSION + "</a></h2>"
-    + "<p><a href='" + LINK + "' title='" + LINK + "'>Click to start 
downloading the most recent version for "
-    + PLATFORM + " and " + LANG_ARRAY[ 2 ] + "."
-    + "<br /></p>" );
+    document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION + " 
- Milestone " + MILESTONE
+    + " - Build ID " + BUILD + " - SVN " + SVN_REV + "'>Download Apache 
OpenOffice " + VERSION + "</a></h2>"
+    + "<p><a href='" + LINK + "' title='Version " + VERSION + " - Milestone " 
+ MILESTONE
+    + " - Build ID " + BUILD + " - SVN " + SVN_REV + "'>Click here for the 
most recent version for "
+    + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + 
"</b>.</a></p>");
   } else {
-    // dump SF download and redirect to NL webpage (see URLs in 
"languages.js") if no mirror link (hasMirrorLink() == false)
-    // Get first the array data for NL_LANGUAGE and then the redirect link 
from the array data
+    // 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[ 3 ] + "' title='" + 
LANG_ARRAY[ 3 ] + "'>下载 Apache OpenOffice "
-    + VERSION + "</a></h2>"
-    + "<p><a href='" + LANG_ARRAY[ 3 ] + "' title='" + LANG_ARRAY[ 3 ] + "'>A 
release for " + LANG_ARRAY[ 2 ]
-    + " 
不可用.请从下载页选择一种可替代的语言版本.</a></p>" );
+    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='other.html' 
title='获取所有平台,语言的OpenOffice、语言包的下载地址'>"
+    + "<p><a href='/download/other.html' 
title='获取所有平台,语言的Apache OpenOffice、语言包
的下载地址'>"
     + "<b>获取所有平台版本或语言、语言包</b></a> | "
-    + "<a href='other.html#tested-sdk' title='获取所有源代码包
和SDK下载'>"
-    + "<b>源代码和SDK</b></a> | <br />"
-    + "签名和哈希: "
-    + "<a href='" + apache_getChecksum( VERSION, NL_LANGUAGE, SCHEMA, "asc" )  
  + "' + title='ASC signature'>ASC</a> , "
-    + "<a href='" + apache_getChecksum( VERSION, NL_LANGUAGE, SCHEMA, "md5" )  
  + "' + title='MD5 hash'>MD5</a> , "
-    + "<a href='" + apache_getChecksum( VERSION, NL_LANGUAGE, SCHEMA, "sha256" 
) + "' + title='SHA256 hash'>SHA256</a> | "
-    + "<a href='../development/releases/" + VERSION + ".html'"
+    + "<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=33296035'"
     + "title='Apache OpenOffice有何更新,有何进步?" + VERSION + 
"?'>发行说明</a> | "
-    + "<a href='legacy/index.html' title='获取遗留版本 OpenOffice.org 
3.3.0'>遗留版本</a></p>"
+    + "<a href='/download/legacy/index.html' title='获取遗留版本 
OpenOffice.org 3.3.0'>遗留版本</a></p>"
   + "</div>" );
   
   entourage.initialize();
@@ -141,22 +126,22 @@
 
 <!-- Green: Stable release: No JavaScript enabled -->
   <noscript>
-  <div class="button green" id="optionitem1" 
onclick="openItem('optionitem1','other.html#tested-full'); return false;">
-    <h2><a href="other.html" title="选择其它平台,语言的下载">
+  <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="other.html" title="选择其它平台,语言的下载">
+    <p><a href="/download/other.html" title="选择å…
¶å®ƒå¹³å°ï¼Œè¯­è¨€çš„下载">
     
需要启用JavaScript以获得最好的下载体验.当前似乎没有启用.
     请点击本文使用替代页以选择最佳的平台和语言。</a></p>
   </div>
   <div class="sub-green">
-    <p><a href="other.html" 
title="获取所有平台,语言的OpenOffice、语言包的下载地址">
+    <p><a href="/download/other.html" 
title="获取所有平台,语言的OpenOffice、语言包的下载地址">
     <b>获取所有平台版本或语言、语言包</b></a> |
-    <a href="other.html#tested-sdk" title="获取所有源代码包
和SDK下载">
+    <a href="/download/other.html#source" title="获取所有源代码包
和SDK下载">
     <b>源代码和SDK</b></a> | <br />
-    <a href="checksums/3.4.1_checksums.html" title="Apache OpenOffice的æ 
¡éªŒå’Œ">签名和哈希</a> |
-    <a href="../development/releases/index.html" title="Apache 
OpenOffice有何更新,有何进步?">
+    <a href="/download/other.html" title="Apache OpenOffice的æ 
¡éªŒå’Œ">签名和哈希</a> |
+    <a href="/development/releases/index.html" title="Apache 
OpenOffice有何更新,有何进步?">
     发行说明</a> |
-    <a href='legacy/index.html' title='获取遗留版本 OpenOffice.org 
3.3.0'>遗留版本</a></p>
+    <a href='/download/legacy/index.html' title='获取遗留版本 
OpenOffice.org 3.3.0'>遗留版本</a></p>
   </div>
   </noscript>
 


Reply via email to