From 156f84da7b1e9e6e4e6aa83c48da2ba28362da24 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Sun, 2 May 2010 14:04:57 +0000
Subject: [PATCH]  * set the help link.  * set the about link.

---
 trunk/config/config.php                  |  1 -
 trunk/lib/front/front.class.php          |  1 -
 trunk/module/common/control.php          |  2 +-
 trunk/module/common/view/header.html.php |  2 +-
 trunk/module/misc/lang/zh-cn.php         | 24 +++++++++++++++++-------
 trunk/module/misc/view/about.html.php    | 18 ++++++++----------
 trunk/www/js/my.js                       |  4 ++--
 7 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/trunk/config/config.php b/trunk/config/config.php
index d007930b34..55262fee41 100644
--- a/trunk/config/config.php
+++ b/trunk/config/config.php
@@ -23,7 +23,6 @@
  */
 /* 基本参数设定。*/
 $config->version     = '1.0.stable';                    // 版本号，切勿修改。
-$config->helpRoot    = 'http://doc.zentao.cn/help/';    // 在线帮助的URI地址。
 $config->encoding    = 'UTF-8';                         // 网站的编码。
 $config->cookiePath  = '/';                             // cookie的有效路径。
 $config->cookieLife  = time() + 2592000;                // cookie的生命周期。
diff --git a/trunk/lib/front/front.class.php b/trunk/lib/front/front.class.php
index b4b6a8c78c..347941e23d 100644
--- a/trunk/lib/front/front.class.php
+++ b/trunk/lib/front/front.class.php
@@ -470,7 +470,6 @@ currentModule  = '$moduleName';
 currentMethod  = '$methodName';
 clientLang     = '$clientLang';
 requiredFields = '$requiredFields';
-zentaoHelpRoot = '$config->helpRoot';
 lblShowAll     = '$lang->showAll';
 lblHideClosed  = '$lang->hideClosed';
 </script>
diff --git a/trunk/module/common/control.php b/trunk/module/common/control.php
index d6c876c0e6..f5aabcdb4d 100644
--- a/trunk/module/common/control.php
+++ b/trunk/module/common/control.php
@@ -127,7 +127,7 @@ EOT;
         {
             echo html::a(helper::createLink('user', 'login'), $lang->login);
         }
-        //echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about'");
+        echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about'");
     }
 
     /* 打印主菜单。*/
diff --git a/trunk/module/common/view/header.html.php b/trunk/module/common/view/header.html.php
index 7a1e6c976e..4204928d07 100644
--- a/trunk/module/common/view/header.html.php
+++ b/trunk/module/common/view/header.html.php
@@ -6,7 +6,7 @@ include 'colorbox.html.php';
 /* 鑷姩鎵ц鐨勪唬鐮併��*/
 $(document).ready(function() 
 {
-    $("a.about").colorbox({width:800, height:330, iframe:true, transition:'elastic', speed:500, scrolling:false});
+    $("a.about").colorbox({width:900, height:330, iframe:true, transition:'elastic', speed:500, scrolling:false});
 });
 </script>
 
diff --git a/trunk/module/misc/lang/zh-cn.php b/trunk/module/misc/lang/zh-cn.php
index 559543a93f..989bbc54d5 100644
--- a/trunk/module/misc/lang/zh-cn.php
+++ b/trunk/module/misc/lang/zh-cn.php
@@ -24,18 +24,25 @@
 $lang->misc->common  = '鏉傞」';
 $lang->misc->ping    = '闃茶秴鏃�';
 
+$lang->misc->zentao->version           = '鐗堟湰%s';
+$lang->misc->zentao->labels['about']   = '鍏充簬绂呴亾';
+$lang->misc->zentao->labels['support'] = '鎶�鏈敮鎸�';
+$lang->misc->zentao->labels['cowin']   = '甯姪鎴戜滑';
+$lang->misc->zentao->labels['service'] = '鏈嶅姟鍒楄〃';
+
 $lang->misc->zentao->about['official']     = "瀹樻柟缃戠珯";
+$lang->misc->zentao->about['project']      = "椤圭洰杩涘睍";
+$lang->misc->zentao->about['preview']      = "鏈�鏂伴瑙�";
 $lang->misc->zentao->about['changelog']    = "鐗堟湰鍘嗗彶";
 $lang->misc->zentao->about['license']      = "鎺堟潈鍗忚";
 $lang->misc->zentao->about['contributors'] = "璐＄尞鑰�";
 $lang->misc->zentao->about['thirdparty']   = "绗笁鏂逛唬鐮�";
 $lang->misc->zentao->about['sourcecode']   = "婧愪唬鐮�";
-$lang->misc->zentao->about['project']      = "椤圭洰杩涘睍";
-$lang->misc->zentao->about['preview']      = "鏈�鏂伴瑙�";
 
 $lang->misc->zentao->support['manual']     = "鐢ㄦ埛鎵嬪唽";
 $lang->misc->zentao->support['faq']        = "甯歌闂";
 $lang->misc->zentao->support['forum']      = "鏀寔璁哄潧";
+$lang->misc->zentao->support['qqgroup']    = "瀹樻柟QQ缇�";
 $lang->misc->zentao->support['howask']     = "濡備綍鎻愰棶";
 $lang->misc->zentao->support['vip']        = "鍟嗕笟鏀寔";
 
@@ -45,15 +52,18 @@ $lang->misc->zentao->cowin['devcode']      = "鎻愪氦浠ｇ爜";
 $lang->misc->zentao->cowin['doc']          = "瀹屽杽鏂囨。";
 $lang->misc->zentao->cowin['recommend']    = "鎺ㄨ崘缁欐湅鍙�";
 $lang->misc->zentao->cowin['addlink']      = "娣诲姞鍙嬫儏閾炬帴";
-$lang->misc->zentao->cowin['shop']         = "璐拱鎴戜滑鐨勫晢搴�";
+$lang->misc->zentao->cowin['shop']         = "閫涢�涙垜浠殑鍟嗗簵";
 $lang->misc->zentao->cowin['donate']       = "鎹愬姪鎴戜滑";
+$lang->misc->zentao->cowin['cowinmore']    = "鏇村鏂瑰紡...";
 
-$lang->misc->zentao->service['idc']        = '绂呴亾鍦ㄧ嚎鎵樼';
+$lang->misc->zentao->service['install']    = '绂呴亾瀹夎鏈嶅姟';
+$lang->misc->zentao->service['fixissue']   = '绂呴亾闂瑙ｅ喅';
 $lang->misc->zentao->service['zentaotrain']= '绂呴亾浣跨敤鍩硅';
+$lang->misc->zentao->service['idc']        = '绂呴亾鍦ㄧ嚎鎵樼';
+$lang->misc->zentao->service['custom']     = '绂呴亾瀹氬埗寮�鍙�';
+$lang->misc->zentao->service['review']     = '绂呴亾鐐硅瘎鏈嶅姟';
 $lang->misc->zentao->service['scrumtrain'] = 'scrum鍩硅';
 $lang->misc->zentao->service['fwtrain']    = '绂呴亾PHP妗嗘灦鍩硅';
-$lang->misc->zentao->service['autotesting']= 'linux鑷姩鍖栨祴璇曞煿璁�';
-$lang->misc->zentao->service['custom']     = '瀹氬埗寮�鍙�';
-$lang->misc->zentao->service['review']     = '绂呴亾鐐硅瘎鏈嶅姟';
+$lang->misc->zentao->service['servicemore']= '鏇村鏈嶅姟...';
 
 $lang->misc->copyright = "鐗堟潈鎵�鏈� &copy;2009-2010 <a href='http://www.cnezsoft.com' target='_blank'>闈掑矝鏄撹蒋澶╁垱缃戠粶绉戞妧鏈夐檺鍏徃</a>";
diff --git a/trunk/module/misc/view/about.html.php b/trunk/module/misc/view/about.html.php
index 01e517b1c6..34c376d341 100644
--- a/trunk/module/misc/view/about.html.php
+++ b/trunk/module/misc/view/about.html.php
@@ -3,26 +3,24 @@
 <div class='yui-d0 yui-t1'>
   <div class='yui-b a-center'>
    <img src='theme/default/images/main/logo2.png' /><br />
-   <h3>鐗堟湰1.0rc1</h3>
+   <h3><?php printf($lang->misc->zentao->version, $config->version);?></h3>
   </div>
   <div class='yui-main'>
   <div class='yui-b'>
   <table class='table-1'>
     <tr class='colhead'>
-      <?php
-      $groups = array_keys((array)$lang->misc->zentao);
-      foreach($groups as $group)
-      {
-          echo "<th class='w-p25'>鍏充簬绂呴亾</th>";
-      }
-      ?>
+      <?php foreach($lang->misc->zentao->labels as $label) echo "<th class='w-p25'>$label</th>";?>
     </tr>
+    <?php
+    unset($lang->misc->zentao->version);
+    unset($lang->misc->zentao->labels);
+    ?>
     <tr class='a-left' valign='top'>
       <?php foreach($lang->misc->zentao as $groupItems):?>
       <td>
         <ul>
-          <?php foreach($groupItems as $item):?>
-          <li><?php echo $item;?></li>
+          <?php foreach($groupItems as $item => $label):?>
+          <li><?php echo html::a("http://www.zentaoms.com/goto.php?item=$item", $label, '_blank');;?></li>
           <?php endforeach;?>
         </ul>
       </td>
diff --git a/trunk/www/js/my.js b/trunk/www/js/my.js
index a05a60130d..2099f4aa26 100644
--- a/trunk/www/js/my.js
+++ b/trunk/www/js/my.js
@@ -196,7 +196,7 @@ function setHelpLink()
             if(currentFieldName == 'submit' || currentFieldName == 'reset') return;
             if(currentFieldName.indexOf('[') > 0) currentFieldName = currentFieldName.substr(0, currentFieldName.indexOf('['));
             currentFieldName = currentFieldName.toLowerCase();
-            $(this).after(' <a class="helplink" href=' + zentaoHelpRoot + '?lang=' + clientLang + '&module=' + currentModule + '&method=' + currentMethod + '&field=' + currentFieldName + '>?</a> ');
+            $(this).after(' <a class="helplink" href=http://www.zentaoms.com/goto.php?item=fieldref&extra=lang=' + clientLang + ',module=' + currentModule + ',method=' + currentMethod + ',field=' + currentFieldName + ' target="_blank">?</a> ');
         }
     );
 }
@@ -209,7 +209,7 @@ $(document).ready(function()
 {
     setNowrapObjTitle();
     setRequiredFields();
-    //setHelpLink();
+    setHelpLink();
     setProductSwitcher();
     setProjectSwitcher();
     if(needPing) setTimeout('setPing()', 1000 * 60 * 5);  // 5鍒嗛挓涔嬪悗寮�濮媝ing銆�