diff --git a/module/my/control.php b/module/my/control.php
index 627deab26b..77c81bd929 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -79,7 +79,7 @@ class my extends control
      * @access public
      * @return void
      */
-    public function todo($type = 'today', $account = '', $status = 'all', $orderBy = "date_desc,status,begin", $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function todo($type = 'all', $account = '', $status = 'all', $orderBy = "date_desc,status,begin", $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
         $uri = $this->app->getURI(true);
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 46d4065613..c308bf2fe5 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -28,7 +28,7 @@
         ?>
         <?php endforeach;?>
         <div class="input-control has-icon-right space">
-          <input type="text" required="" class="form-control form-date" id="todoDate" name="date" placeholder="2018-02-28">
+          <input type="text" required="" class="form-control form-date" id="todoDate" name="date">
           <label for="inputPasswordExample1" class="input-control-icon-right"><i class="icon icon-delay"></i></label>
         </div>
       </div>
@@ -99,6 +99,7 @@
             <?php endforeach;?>
           </tbody>
         </table>
+        <?php if($todos):?>
         <div class="table-footer">
           <?php if($type != 'cycle'):?>
           <?php if(common::hasPriv('todo', 'batchEdit') or (common::hasPriv('todo', 'import2Today') and $importFuture)):?>
@@ -132,6 +133,7 @@
           <?php endif;?>
           <?php $pager->show('right', 'pagerjs');?>
         </div>
+        <?php endif;?>
       </form>
     </div>
   </div>
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index c8449f68b3..b614364eb3 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -95,9 +95,6 @@ $lang->todo->noTodo         = '该类型没有待办事务';
 $lang->todo->noAssignedTo   = '被指派人不能为空';
 
 $lang->todo->periods['all']        = '所有待办';
-$lang->todo->periods['today']      = '今日';
-$lang->todo->periods['thisWeek']   = '本周';
-$lang->todo->periods['thisMonth']  = '本月';
 $lang->todo->periods['thisYear']   = '本年';
 $lang->todo->periods['future']     = '待定';
 $lang->todo->periods['before']     = '未完';
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 95a15ba1ec..dae108ad72 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -109,7 +109,9 @@ var batchCreateNum = '<?php echo $config->todo->batchCreate;?>';
 <?php if(isonlybody()):?>
 $(function()
 {
-    $('#closeModal').click(function(){parent.$.closeModal();})
+    parent.$('.modal-header').hide();
+    parent.$('.modal-body').css('padding', '0px');
+    $('#closeModal').click(function(){parent.$.closeModal();});
 })
 <?php endif;?>
 </script>
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index feb751f315..9d7566f8e8 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -149,8 +149,13 @@
 <?php if(isonlybody()):?>
 $(function()
 {
-    parent.$('#triggerModal .modal-header').hide();
-    $('#closeModal').click(function(){parent.$.closeModal();})
+    parent.$('.modal-header').hide();
+    parent.$('.modal-body').css('padding', '0px');
+    $('#closeModal').click(function()
+    {
+        parent.$('.modal-backdrop.in').remove();
+        parent.$('.modal.in').remove();
+    })
 })
 <?php endif;?>
 </script>