* set the help link.

* set the about link.

trunk/config/config.php

@@ -23,7 +23,6 @@
  */
 /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>趨<EFBFBD><E8B6A8>*/
 $config->version     = '1.0.stable';                    // <20>汾<EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸ġ<DEB8>
-$config->helpRoot    = 'http://doc.zentao.cn/help/';    // <20><><EFBFBD>߰<EFBFBD><DFB0><EFBFBD><EFBFBD><EFBFBD>URI<52><49>ַ<EFBFBD><D6B7>
 $config->encoding    = 'UTF-8';                         // <20><>վ<EFBFBD>ı<EFBFBD><C4B1>롣
 $config->cookiePath  = '/';                             // cookie<69><65><EFBFBD><EFBFBD>Ч·<D0A7><C2B7><EFBFBD><EFBFBD>
 $config->cookieLife  = time() + 2592000;                // cookie<69><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD>

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>

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'");
     }
 
     /* <20><>ӡ<EFBFBD><D3A1><EFBFBD>˵<EFBFBD><CBB5><EFBFBD>*/

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>
 

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>";

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>

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分钟之后开始ping。