diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 1a86a067c9..8da6c963c6 100644
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -12,7 +12,7 @@
 .card a, .card:hover a {color: #444}
 .card a:hover {color: #000;}
 
-#notice {margin: -20px -20px 0}
+#notice {margin: -20px -20px 20px}
 #titlebar {margin-top: -20px; border-top: none}
 #notice + #titlebar {margin-top: 0; border-top: 1px solid #e5e5e5}
 #proversion, #zentaotrain{color:#D2322D}
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 22e39c2a18..dff44040ff 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -238,8 +238,8 @@ $lang->project->menu->view     = array('link' => '概况|project|view|projectID=
 $lang->project->subMenu = new stdclass();
 $lang->project->subMenu->list = new stdclass();
 $lang->project->subMenu->list->task      = '任务列表|project|task|projectID=%s';
-$lang->project->subMenu->list->tree      = '树状图|project|tree|projectID=%s';
 $lang->project->subMenu->list->groupTask = '分组视图|project|groupTask|projectID=%s';
+$lang->project->subMenu->list->tree      = '树状图|project|tree|projectID=%s';
 
 $lang->project->subMenu->qa = new stdclass();
 $lang->project->subMenu->qa->bug      = 'Bug|project|bug|projectID=%s';
diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php
index 2dba434084..91cee37d85 100644
--- a/module/doc/view/alllibs.html.php
+++ b/module/doc/view/alllibs.html.php
@@ -12,7 +12,9 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div class="main-row split-row" id="mainRow">
+  <?php if($this->from == 'doc'):?>
   <?php include './side.html.php';?>
+  <?php endif;?>
   <div class="main-col" data-min-width="400">
     <div class="panel block-files block-sm no-margin">
       <div class="panel-heading">
@@ -42,9 +44,9 @@
             </a>
             <?php if($type == 'custom'):?>
             <div class="actions">
-              <?php common::printLink('doc', 'collect', "objectID=$lib->id&objectType=lib", "<i class='icon icon-star-empty'></i>", '', "title='{$lang->doc->collect}' class='btn btn-link'")?>
-              <?php common::printLink('doc', 'editLib', "libID=$lib->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link' data-toggle='modal'")?>
-              <?php common::printLink('doc', 'deleteLib', "libID=$lib->id", "<i class='icon icon-trash'></i>", '', "title='{$lang->delete}' class='btn btn-link'")?>
+              <?php common::printLink('doc', 'collect', "objectID=$lib->id&objectType=lib", "<i class='icon icon-star-empty'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
+              <?php common::printLink('doc', 'editLib', "libID=$lib->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
+              <?php common::printLink('doc', 'deleteLib', "libID=$lib->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
             </div>
             <?php endif;?>
           </div>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 74b4a709e6..80699250e3 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<script language='Javascript'>
+<script>
 var browseType = '<?php echo $browseType;?>';
 </script>
 <?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
@@ -20,7 +20,9 @@ var browseType = '<?php echo $browseType;?>';
 <?php if($this->from != 'doc') js::set('type', 'doc');?>
 
 <div class='main-row split-row' id='mainRow'>
+  <?php if($this->from == 'doc'):?>
   <?php include './side.html.php';?>
+  <?php endif;?>
   <?php if($this->cookie->browseType == 'bygrid'):?>
   <?php include dirname(__FILE__) . '/browsebygrid.html.php';?>
   <?php else:?>
@@ -75,8 +77,8 @@ var browseType = '<?php echo $browseType;?>';
               <td class="c-name"><?php echo html::a(inlink('view', "docID=$doc->id"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title);?></td>
               <td class="c-actions">
                 <?php common::printLink('doc', 'collect', "objectID=$doc->id&objectType=doc", "<i class='icon {$star}'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
-                <?php common::printLink('doc', 'edit', "docID=$doc->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
-                <?php common::printLink('doc', 'delete', "docID=$doc->id", "<i class='icon icon-trash'></i>", '', "title='{$lang->delete}' class='btn btn-link'")?>
+                <?php common::printLink('doc', 'edit', "docID=$doc->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
+                <?php common::printLink('doc', 'delete', "docID=$doc->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
               </td>
               <td class="c-num"></td>
               <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index c0bf4c40e6..511143d5d4 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -12,7 +12,9 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div class="main-row split-row" id="mainRow">
+  <?php if($this->from == 'doc'):?>
   <?php include './side.html.php';?>
+  <?php endif;?>
   <div class="main-col" data-min-width="400">
     <div class="panel block-files block-sm no-margin">
       <div class="panel-heading">
@@ -68,8 +70,8 @@
             <?php if($libID != 'project' and $libID != 'files'):?>
             <div class="actions">
               <?php common::printLink('doc', 'collect', "objectID=$libID&objectType=doclib", "<i class='icon icon-star-empty'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
-              <?php common::printLink('doc', 'editLib', "libID=$libID", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link' data-toggle='modal'")?>
-              <?php common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i>", '', "title='{$lang->delete}' class='btn btn-link'")?>
+              <?php common::printLink('doc', 'editLib', "libID=$libID", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
+              <?php common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
             </div>
             <?php endif;?>
           </div>
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 7dbff5360d..79c234d48e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -30,6 +30,7 @@ class upgradeModel extends model
      */
     public function execute($fromVersion)
     {
+        set_time_limit(0);
         switch($fromVersion)
         {
             case '0_3beta': $this->execSQL($this->getUpgradeFile('0.3'));
@@ -1251,7 +1252,6 @@ class upgradeModel extends model
      */
     public function adjustDocModule()
     {
-        set_time_limit(0);
         $this->app->loadLang('doc');
         $productDocModules = $this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('productdoc')->orderBy('grade,id')->fetchAll('id');
         $allProductIdList  = $this->dao->select('id,name,acl,whitelist,createdBy')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->fetchAll('id');
@@ -2257,7 +2257,7 @@ class upgradeModel extends model
      * @access public
      * @return bool
      */
-    public function  addUniqueKeyToTeam()
+    public function addUniqueKeyToTeam()
     {
         $members = $this->dao->select('root, type, account')->from(TABLE_TEAM)->groupBy('root, type, account')->having('count(*)')->gt(1)->fetchAll();
 
@@ -2279,5 +2279,4 @@ class upgradeModel extends model
         $this->dao->exec("ALTER TABLE " . TABLE_TEAM . " ADD UNIQUE `team` (`root`, `type`, `account`)");
         return !dao::isError();
     }
->>>>>>> zentaopms_9.8
 }