Merge branch 'master' of https://github.com/easysoft/zentaopms

module/action/lang/en.php

@@ -34,6 +34,7 @@ $lang->action->original       = 'Original Format';
 $lang->action->confirmHideAll = 'Do you want to hide all the records?';
 $lang->action->needEdit       = '%s that you want to restore exists. Please edit it.';
 $lang->action->historyEdit    = 'The history editor cannot be empty.';
+$lang->action->noDynamic      = 'No dynamic.';
 
 $lang->action->history = new stdclass();
 $lang->action->history->action = 'Link';

module/action/lang/zh-cn.php

@@ -34,6 +34,7 @@ $lang->action->original       = '原始格式';
 $lang->action->confirmHideAll = '您确定要全部隐藏这些记录吗？';
 $lang->action->needEdit       = '要还原%s的名称或代号已经存在，请编辑更改。';
 $lang->action->historyEdit    = '历史记录编辑不能为空。';
+$lang->action->noDynamic      = '暂无动态';
 
 $lang->action->history = new stdclass();
 $lang->action->history->action = '关联日志';

module/my/view/dynamic.html.php

@@ -29,6 +29,7 @@
 </div>
 <div id="mainContent" class="main-content">
   <div id="dynamics">
+    <?php if(!empty($dateGroups)):?>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
@@ -59,6 +60,11 @@
       </ul>
     </div>
     <?php endforeach;?>
+    <?php else:?>
+    <div class="text-center text-muted">
+      <?php echo $lang->action->noDynamic;?>
+    </div>
+    <?php endif;?>
   </div>
   <?php if(!empty($firstAction)):?>
   <?php

module/product/view/dynamic.html.php

@@ -32,6 +32,7 @@
 </div>
 <div id="mainContent" class="main-content">
   <div id="dynamics">
+    <?php if(!empty($dateGroups)):?>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
@@ -62,6 +63,12 @@
       </ul>
     </div>
     <?php endforeach;?>
+    <?php else:?>
+    <div class="text-center text-muted">
+      <?php echo $lang->action->noDynamic;?>
+    </div>
+    <?php endif;?>
+
   </div>
   <?php if(!empty($firstAction)):?>
   <?php

module/project/view/dynamic.html.php

@@ -33,6 +33,7 @@
 
 <div id="mainContent" class="main-content">
   <div id="dynamics">
+    <?php if(!empty($dateGroups)):?>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
@@ -63,6 +64,11 @@
       </ul>
     </div>
     <?php endforeach;?>
+    <?php else:?>
+    <div class="text-center text-muted">
+      <?php echo $lang->action->noDynamic;?>
+    </div>
+    <?php endif;?>
   </div>
   <?php if(!empty($firstAction)):?>
   <?php

module/todo/view/create.html.php

@@ -95,8 +95,8 @@
         <tr>
           <th><?php echo $lang->todo->name;?></th>
           <td colspan='2'>
-            <div class='nameBox'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
             <div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
+            <div class='nameBox required'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
           </td>
         </tr>  
         <tr>

module/user/view/dynamic.html.php

@@ -31,6 +31,7 @@
   </div>
 
   <div id="dynamics" class='main-content'>
+    <?php if(!empty($dateGroups)):?>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
@@ -61,6 +62,11 @@
       </ul>
     </div>
     <?php endforeach;?>
+    <?php else:?>
+    <div class="text-center text-muted">
+      <?php echo $lang->action->noDynamic;?>
+    </div>
+    <?php endif;?>
   </div>
   <?php if(!empty($firstAction)):?>
   <?php