diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index d61bfcb34a..0147853aff 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -296,14 +296,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-            <?php
-            $branchNames = array();
-            foreach($branches as $branchID => $branchName)
-            {
-                $branchNames[] = $branchName;
-            }
-            $branchsPinYin = common::convert2Pinyin($branchNames);
-            ?>
+            <?php $branchsPinYin = common::convert2Pinyin($branches);?>
             <?php else:?>
             <div class="dropdown-menu search-list">
             <?php endif;?>
@@ -331,14 +324,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-              <?php
-              $moduleNames = array();
-              foreach($modules as $moduleId => $module)
-              {
-                  $moduleNames[] = $module;
-              }
-              $modulesPinYin = common::convert2Pinyin($moduleNames);
-              ?>
+              <?php $modulesPinYin = common::convert2Pinyin($modules);?>
             <?php else:?>
             <div class="dropdown-menu search-list">
             <?php endif;?>
@@ -366,15 +352,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-            <?php
-            $memberNames = array();
-            foreach($memberPairs as $memberId => $member)
-            {
-                if(empty($memberId)) continue;
-                $memberNames[] = $member;
-            }
-            $membersPinYin = common::convert2Pinyin($memberNames);
-            ?>
+            <?php $membersPinYin = common::convert2Pinyin($memberPairs);?>
             <?php else:?>
             <div class="dropdown-menu search-list">
             <?php endif;?>
diff --git a/module/doc/js/view.js b/module/doc/js/view.js
index 562365543a..32336dd778 100644
--- a/module/doc/js/view.js
+++ b/module/doc/js/view.js
@@ -2,14 +2,13 @@ $(function()
 {
     $('#urlIframe').height($('#mainContent').height() - 35);
     $('body').addClass('doc-fullscreen');
-    $('#mainContent .fullscreen-btn').attr('title', reset);
-    setTimeout($.resetToolbarPosition, 50);
     $('#mainContent .fullscreen-btn').click(function()
     {
+        $('.side-col').removeClass('hidden');
         $('body').toggleClass('doc-fullscreen');
         if($('body').hasClass('doc-fullscreen')) 
         {
-            $('#mainContent .fullscreen-btn').attr('title', reset);
+            $('#mainContent .fullscreen-btn').attr('title', retrack);
         }
         else
         {
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 546f756511..26632fecb9 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -60,7 +60,7 @@ $lang->doc->pastEdited     = 'Updated';
 $lang->doc->myDoc          = 'My Doc';
 $lang->doc->myCollection   = 'My Favorite';
 $lang->doc->fullscreen     = 'Full Screen';
-$lang->doc->reset          = 'Reset';
+$lang->doc->retrack        = 'Retrack';
 
 /* 方法列表。*/
 $lang->doc->index            = 'Doc Home';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 6f26f91781..e5d6447eb9 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -47,7 +47,7 @@ $lang->doc->item           = '项';
 $lang->doc->num            = '文档数量';
 $lang->doc->searchResult   = '搜索结果';
 $lang->doc->fullscreen     = '全屏';
-$lang->doc->reset          = '恢复';
+$lang->doc->retrack        = '收起';
 
 $lang->doc->moduleDoc      = '按模块浏览';
 $lang->doc->searchDoc      = '搜索';
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 0f67cdf001..43c428cd23 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -16,7 +16,7 @@
 <?php $browseLink = $this->session->docList ? $this->session->docList : inlink('browse');?>
 <?php
 js::set('fullscreen', $lang->doc->fullscreen);
-js::set('reset', $lang->doc->reset);
+js::set('retrack', $lang->doc->retrack);
 ?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
@@ -129,23 +129,19 @@ js::set('reset', $lang->doc->reset);
     <div class='main-actions'>
       <div class="btn-toolbar">
         <?php common::printBack($browseLink);?>
-        <button type='button' class='btn fullscreen-btn' title='<?php echo $lang->doc->fullscreen?>'><i class='icon icon-fullscreen'></i></button>
+        <div class='divider'></div>
+        <button type='button' class='btn fullscreen-btn' title='<?php echo $lang->doc->retrack;?>'><i class='icon icon-fullscreen'></i></button>
         <?php
         if(!$doc->deleted)
         {
-            echo "<div class='divider'></div>";
             common::printIcon('doc', 'edit', "docID=$doc->id", $doc);
             common::printIcon('doc', 'delete', "docID=$doc->id", $doc, 'button', '', 'hiddenwin');
         }
-        else
-        {
-            common::printRPN($browseLink);
-        }
         ?>
       </div>
     </div>
   </div>
-  <div class="side-col col-4">
+  <div class="side-col col-4 hidden">
     <div class="cell">
       <details class="detail" open>
         <summary class="detail-title"><?php echo $lang->doc->digest;?></summary>
diff --git a/module/extension/model.php b/module/extension/model.php
index a001cebfba..ea02b5bb8c 100644
--- a/module/extension/model.php
+++ b/module/extension/model.php
@@ -57,7 +57,22 @@ class extensionModel extends model
      */
     public function fetchAPI($url)
     {
-        $url .= (strpos($url, '?') === false ? '?' : '&') . 'lang=' . str_replace('-', '_', $this->app->getClientLang()) . '&managerVersion=' . self::EXT_MANAGER_VERSION . '&zentaoVersion=' . $this->config->version;
+        $this->app->loadConfig('upgrade');
+        $version = $this->config->version;
+        if(strpos($version, 'biz') !== false)
+        {
+            $version = str_replace('.', '_', $version);
+            if(isset($this->config->bizVersion[$version])) $version = $this->config->bizVersion[$version];
+            $version = str_replace('_', '.', $version);
+        }
+        if(strpos($version, 'pro') !== false)
+        {
+            $version = str_replace('.', '_', $version);
+            if(isset($this->config->proVersion[$version])) $version = $this->config->proVersion[$version];
+            $version = str_replace('_', '.', $version);
+        }
+
+        $url .= (strpos($url, '?') === false ? '?' : '&') . 'lang=' . str_replace('-', '_', $this->app->getClientLang()) . '&managerVersion=' . self::EXT_MANAGER_VERSION . '&zentaoVersion=' . $version;
         $result = json_decode(common::http($url));
 
         if(!isset($result->status)) return false;
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index a210d909fc..13e5817b86 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -145,13 +145,7 @@
               echo '<label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>';
               echo '<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>';
               echo '</div>';
-              $memberNames = array();
-              foreach($memberPairs as $memberId => $member)
-              {
-                  if(empty($memberId)) continue;
-                  $memberNames[] = $member;
-              }
-              $membersPinYin = common::convert2Pinyin($memberNames);
+              $membersPinYin = common::convert2Pinyin($memberPairs);
           }
           else
           {
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 9b35b4e7c0..ac9adf91b8 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -156,13 +156,7 @@
               echo '<label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>';
               echo '<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>';
               echo '</div>';
-              $memberNames = array();
-              foreach($memberPairs as $memberId => $member)
-              {
-                  if(empty($memberId)) continue;
-                  $memberNames[] = $member;
-              }
-              $membersPinYin = common::convert2Pinyin($memberNames);
+              $usersPinYin = common::convert2Pinyin($users);
           }
           else
           {
@@ -172,7 +166,7 @@
           foreach($users as $key => $value)
           {
               if(empty($key) or $key == 'closed') continue;
-              $searchKey = $withSearch ? ('data-key="' . zget($membersPinYin, $value, '') . " @$key\"") : "data-key='@$key'";
+              $searchKey = $withSearch ? ('data-key="' . zget($usersPinYin, $value, '') . " @$key\"") : "data-key='@$key'";
               echo html::a('javascript:$(".table-actions #assignedTo").val("' . $key . '");setFormAction("' . $actionLink . '")', '<i class="icon icon-person icon-sm"></i> ' . $value, '', $searchKey);
           }
           echo "</div>";
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 1c964a04da..b7bd6c5ea5 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -297,13 +297,7 @@
                 <label for="moduleSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-              <?php
-              $moduleNames = array();
-              foreach($modules as $moduleId => $module)
-              {
-                  $moduleNames[] = $module;
-              }
-              $modulesPinYin = common::convert2Pinyin($moduleNames);
+              <?php $modulesPinYin = common::convert2Pinyin($modules);
               ?>
               <?php endif;?>
               <div class="list-group">
@@ -334,14 +328,7 @@
                 <label for="planSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-              <?php
-              $planNames = array();
-              foreach($plans as $planID => $plan)
-              {
-                  $planNames[] = $plan;
-              }
-              $plansPinYin = common::convert2Pinyin($planNames);
-              ?>
+              <?php $plansPinYin = common::convert2Pinyin($plans);?>
               <?php endif;?>
               <div class="list-group">
                 <?php
@@ -367,15 +354,7 @@
             ?>
             <div class="dropdown-menu search-list<?php if($withSearch) echo ' search-box-sink';?>" data-ride="searchList">
               <?php if($withSearch):?>
-              <?php
-              $memberNames = array();
-              foreach($users as $memberId => $member)
-              {
-                  if(empty($memberId) or $memberId == 'closed') continue;
-                  $memberNames[] = $member;
-              }
-              $membersPinYin = common::convert2Pinyin($memberNames);
-              ?>
+              <?php $usersPinYin = common::convert2Pinyin($users);?>
               <div class="input-control search-box has-icon-left has-icon-right search-example">
                 <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
@@ -386,7 +365,7 @@
               <?php foreach ($users as $key => $value):?>
               <?php
               if(empty($key) or $key == 'closed') continue;
-              $searchKey = $withSearch ? ('data-key="' . zget($membersPinYin, $value, '') . " @$key\"") : "data-key='@$key'";
+              $searchKey = $withSearch ? ('data-key="' . zget($usersPinYin, $value, '') . " @$key\"") : "data-key='@$key'";
               echo html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\", \"hiddenwin\")", $value, '', $searchKey);
               ?>
               <?php endforeach;?>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index b6f6923ced..e572e676ca 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -128,13 +128,7 @@
               echo '<label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>';
               echo '<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>';
               echo '</div>';
-              $memberNames = array();
-              foreach($users as $memberId => $member)
-              {
-                  if(empty($memberId)) continue;
-                  $memberNames[] = $member;
-              }
-              $membersPinYin = common::convert2Pinyin($memberNames);
+              $membersPinYin = common::convert2Pinyin($memberPairs);
           }
           else
           {
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 843a2a1b94..a12f4928f7 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -280,14 +280,7 @@ js::set('browseType', $browseType);
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-            <?php
-            $moduleNames = array();
-            foreach($modules as $moduleId => $module)
-            {
-                $moduleNames[] = $module;
-            }
-            $modulesPinYin = common::convert2Pinyin($moduleNames);
-            ?>
+            <?php $modulesPinYin = common::convert2Pinyin($modules);?>
             <?php else:?>
             <div class="dropdown-menu search-list">
             <?php endif;?>
@@ -320,15 +313,7 @@ js::set('browseType', $browseType);
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-            <?php
-            $memberNames = array();
-            foreach($memberPairs as $memberId => $member)
-            {
-                if(empty($memberId)) continue;
-                $memberNames[] = $member;
-            }
-            $membersPinYin = common::convert2Pinyin($memberNames);
-            ?>
+            <?php $membersPinYin = common::convert2Pinyin($memberPairs);?>
             <?php else:?>
             <div class="dropdown-menu search-list">
             <?php endif;?>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 03fda5d7b2..170fac2c09 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -169,14 +169,7 @@ js::set('suiteID',        $suiteID);
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-            <?php
-            $branchNames = array();
-            foreach($branches as $branchID => $branchName)
-            {
-                $branchNames[] = $branchName;
-            }
-            $branchsPinYin = common::convert2Pinyin($branchNames);
-            ?>
+            <?php $branchsPinYin = common::convert2Pinyin($branches);?>
             <?php else:?>
             <div class="dropdown-menu search-list">
             <?php endif;?>
@@ -204,14 +197,7 @@ js::set('suiteID',        $suiteID);
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-              <?php
-              $moduleNames = array();
-              foreach($modules as $moduleId => $module)
-              {
-                  $moduleNames[] = $module;
-              }
-              $modulesPinYin = common::convert2Pinyin($moduleNames);
-              ?>
+              <?php $modulesPinYin = common::convert2Pinyin($modules);?>
             <?php else:?>
             <div class="dropdown-menu search-list">
             <?php endif;?>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index e4ccf932eb..70a043dc47 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -108,15 +108,7 @@
             ?>
             <div class="dropdown-menu search-list<?php if($withSearch) echo ' search-box-sink';?>" data-ride="searchList">
               <?php if($withSearch):?>
-              <?php
-              $memberNames = array();
-              foreach($assignedTos as $memberId => $member)
-              {
-                  if(empty($memberId) or $memberId == 'closed') continue;
-                  $memberNames[] = $member;
-              }
-              $membersPinYin = common::convert2Pinyin($memberNames);
-              ?>
+              <?php $membersPinYin = common::convert2Pinyin($assignedTos);?>
               <div class="input-control search-box has-icon-left has-icon-right search-example">
                 <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>