Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'

# Conflicts:
#   extension/lite/action/ext/lang/zh-cn/lite.php

extension/lite/action/ext/lang/zh-cn/lite.php

@@ -81,6 +81,13 @@ $lang->action->search->label['verified']              = $lang->action->label->ve
 $lang->action->search->label['login']                 = $lang->action->label->login;
 $lang->action->search->label['logout']                = $lang->action->label->logout;
 
+$lang->action->label->createchildrenstory   = "创建子目标";
+$lang->action->label->linkchildstory        = "关联子目标";
+$lang->action->label->unlinkchildrenstory   = "取消关联子目标";
+$lang->action->label->linkparentstory       = "关联到父目标";
+$lang->action->label->unlinkparentstory     = "从父目标取消关联";
+$lang->action->label->deletechildrenstory   = "删除子目标";
+
 $lang->action->desc->createchildrenstory = '$date, 由 <strong>$actor</strong> 创建子目标 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkchildstory      = '$date, 由 <strong>$actor</strong> 关联子目标 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->unlinkchildrenstory = '$date, 由 <strong>$actor</strong> 移除子目标 <strong>$extra</strong>。' . "\n";

extension/lite/datatable/ext/lang/zh-cn/lite.php

@@ -0,0 +1,6 @@
+<?php
+$lang->datatable->moduleSetting          = '目录设置';
+$lang->datatable->showModule             = '列表页是否显示目录名';
+$lang->datatable->showAllModule          = '是否显示完整产品目录';
+$lang->datatable->showModuleList['base'] = '只显示一级目录';
+$lang->datatable->showModuleList['end']  = '只显示最后一级目录';

module/todo/js/common.js

@@ -49,6 +49,18 @@ function loadList(type, id)
     {
         $(divClass).html($(divID).html());
     }
+
+    if(nameBoxLabel)
+    {
+        if(type == 'custom')
+        {
+            $('#nameBoxLabel').text(nameBoxLabel.custom);
+        }
+        else
+        {
+            $('#nameBoxLabel').text(nameBoxLabel.idvalue);
+        }
+    }
 }
 
 function selectNext()

module/todo/view/create.html.php

@@ -16,6 +16,7 @@
 <?php js::set('noTodo', $lang->todo->noTodo);?>
 <?php js::set('moduleList', $config->todo->moduleList)?>
 <?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
+<?php js::set('nameBoxLabel', array('custom' => $lang->todo->name, 'idvalue' => $lang->todo->idvalue));?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -115,7 +116,7 @@
           <td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange="loadList(this.value);" class="form-control"');?></td>
         </tr>
         <tr>
-          <th><?php echo $lang->todo->name;?></th>
+          <th id='nameBoxLabel'><?php echo $lang->todo->name;?></th>
           <td colspan='2'>
             <div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control'");?></div>
             <div class='input-group title-group required'>

module/todo/view/edit.html.php

@@ -16,6 +16,7 @@
 <?php js::set('moduleList', $config->todo->moduleList)?>
 <?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
 <?php js::set('idvalue', $todo->idvalue);?>
+<?php js::set('nameBoxLabel', array('custom' => $lang->todo->name, 'idvalue' => $lang->todo->idvalue));?>
 <?php if(common::checkNotCN()):?>
 <style> label.col-sm-1{width:100px;} </style>
 <?php endif;?>
@@ -127,7 +128,7 @@
       </div>
       <?php endif;?>
       <div class="row form-group">
-        <label class="col-sm-1"><?php echo $lang->todo->name;?></label>
+        <label id='nameBoxLabel' class="col-sm-1"><?php echo $todo->type == 'custom' ? $lang->todo->name : $lang->todo->idvalue;?></label>
         <div class="col-sm-10">
           <div id='nameBox' class='hidden'><?php echo html::input('name', $todo->name, "class='form-control'");?></div>
             <div class='input-group title-group required'>