Merge branch 'sprint/189_hufangzhou_issue' into 'master'

* Resolve issue #634.

See merge request easycorp/zentaopms!3369

module/action/view/trash.html.php

@@ -63,16 +63,6 @@
 </div>
 
 <div id='mainContent' class="main-row">
-  <div class='side-col' id='sidebar'>
-    <div class='cell'>
-      <div class='list-group'>
-        <?php
-        echo html::a($this->createLink('backup', 'index'), $lang->backup->common);
-        echo html::a($this->createLink('action', 'trash'), $lang->action->trash, '', "class='active'");
-        ?>
-      </div>
-    </div>
-  </div>
   <div class='main-table' data-ride='table'>
     <table class='table has-sort-head'>
       <?php $vars = "browseType=$currentObjectType&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>

module/backup/view/index.html.php

@@ -20,16 +20,6 @@
   <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
 </div>
 <div id='mainContent' class="main-row">
-  <div class='side-col' id='sidebar'>
-    <div class='cell'>
-      <div class='list-group'>
-        <?php
-        echo html::a($this->inLink('index'), $lang->backup->common, '', "class='active'");
-        echo html::a($this->createLink('action', 'trash'), $lang->action->trash);
-        ?>
-      </div>
-    </div>
-  </div>
   <div class="main-col main-content">
     <div class='main-header'>
       <h2>

module/common/lang/en.php

@@ -192,6 +192,8 @@ $lang->stage->common      = 'Stage';
 $lang->stage->list        = 'Stage List';
 $lang->execution->list    = "{$lang->executionCommon} List";
 $lang->kanban->common     = 'Kanban';
+$lang->backup->common     = 'Backup';
+$lang->action->trash      = 'Recycle';
 
 $lang->personnel->common     = 'Member';
 $lang->personnel->invest     = 'Investment';

module/common/lang/menu.php

@@ -536,7 +536,8 @@ $lang->admin->menu->dev['menuOrder'][15] = 'editor';
 $lang->admin->menu->dev['menuOrder'][20] = 'entry';
 
 $lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
+$lang->admin->menu->system['subMenu']->backup      = array('link' => "{$lang->backup->common}|backup|index");
+$lang->admin->menu->system['subMenu']->trash       = array('link' => "{$lang->action->trash}|action|trash");
 $lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
 $lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
 $lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");

module/common/lang/zh-cn.php

@@ -192,6 +192,8 @@ $lang->stage->common      = '阶段';
 $lang->stage->list        = '阶段列表';
 $lang->execution->list    = "{$lang->executionCommon}列表";
 $lang->kanban->common     = '看板';
+$lang->backup->common     = '备份';
+$lang->action->trash      = '回收站';
 
 $lang->personnel->common     = '人员';
 $lang->personnel->invest     = '投入人员';