diff --git a/module/block/control.php b/module/block/control.php
index 1987f4738b..e87ca4efe7 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -442,8 +442,9 @@ class block extends control
                 $this->view->sign = strpos($sso, '?') === false ? '?' : '&';
             }
 
-            $block = $this->block->getByID($id);
-            $this->view->longBlock = $this->block->isLongBlock($block);
+            if($id) $block = $this->block->getByID($id);
+            $this->view->longBlock = $this->block->isLongBlock($id ? $block : $params);
+            $this->view->selfCall  = $this->selfCall;
 
             $this->viewType    = (isset($params->viewType) and $params->viewType == 'json') ? 'json' : 'html';
             $this->params      = $params;
diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php
index 2f0f3182f2..7a89f85c24 100644
--- a/module/block/view/bugblock.html.php
+++ b/module/block/view/bugblock.html.php
@@ -22,10 +22,10 @@
 .block-bugs.block-sm .c-status {text-align: center;}
 </style>
 <div class='panel-body has-table scrollbar-hover'>
-  <table class='table table-borderless table-fixed-head table-hover tablesorter block-bugs <?php if(!$longBlock) echo 'block-sm'?>'>
+  <table class='table table-borderless table-fixed table-fixed-head table-hover tablesorter block-bugs <?php if(!$longBlock) echo 'block-sm'?>'>
     <thead>
       <tr>
-        <th class='c-id-xs'><?php echo $lang->idAB?></th>
+        <th class='c-id'><?php echo $lang->idAB?></th>
         <?php if($longBlock):?>
         <th class='c-pri'><?php echo $lang->priAB?></th>
         <?php endif;?>
diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php
index 26261ab722..4526c1a3fe 100644
--- a/module/block/view/buildblock.html.php
+++ b/module/block/view/buildblock.html.php
@@ -14,7 +14,7 @@
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
 <div class='panel-body has-table scrollbar-hover'>
-  <table class='table table-borderless table-hover table-fixed-head tablesorter block-builds'>
+  <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-builds'>
     <thead>
       <tr>
         <th class='w-id text-center'><?php echo $lang->idAB?></th>
@@ -43,4 +43,4 @@
     </tbody>
   </table>
 </div>
-<?php endif;?>
\ No newline at end of file
+<?php endif;?>
diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php
index f7d0f2cfe8..cd531ac5d8 100644
--- a/module/block/view/caseblock.html.php
+++ b/module/block/view/caseblock.html.php
@@ -22,7 +22,7 @@
   .case-status-blocked { color: #a6aab8; }
   .case-status-investigate {color: #a6aab8;}
   </style>
-  <table class='table table-borderless table-hover table-fixed-head tablesorter block-cases <?php if(!$longBlock) echo 'block-sm';?>'>
+  <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-cases <?php if(!$longBlock) echo 'block-sm';?>'>
     <thead>
       <tr class='text-center'>
         <?php if($longBlock):?>
diff --git a/module/block/view/planblock.html.php b/module/block/view/planblock.html.php
index af0ce9bb65..0e8bead272 100644
--- a/module/block/view/planblock.html.php
+++ b/module/block/view/planblock.html.php
@@ -14,7 +14,7 @@
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
 <div class='panel-body has-table scrollbar-hover'>
-  <table class='table table-borderless table-hover table-fixed-head tablesorter block-plan'>
+  <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-plan'>
     <thead>
     <tr>
       <?php if($longBlock):?>
diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php
index f6a03e92fd..d5a78aae97 100644
--- a/module/block/view/productblock.html.php
+++ b/module/block/view/productblock.html.php
@@ -17,7 +17,7 @@
 .block-products.block-sm .c-project {display: none;}
 </style>
 <div class="panel-body has-table scrollbar-hover block-products">
-  <table class='table table-borderless table-hover table-fixed-head tablesorter table-fixed'>
+  <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter table-fixed'>
     <thead>
       <tr>
         <th class='c-name'><?php echo $lang->product->name;?></th>
diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php
index 624f7d82e4..25a1fa73c3 100644
--- a/module/block/view/projectblock.html.php
+++ b/module/block/view/projectblock.html.php
@@ -14,7 +14,7 @@
 <div class='empty-tip'><?php common::printLink('project', 'create', '', "<i class='icon-plus'></i> " . $lang->project->create, '', "class='btn btn-primary'")?></div>
 <?php else:?>
 <div class="panel-body has-table scrollbar-hover">
-  <table class='table table-borderless table-hover table-fixed-head tablesorter block-projects tablesorter'>
+  <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-projects tablesorter'>
     <thead>
       <tr class='text-center'>
         <th class='c-name text-left'><?php echo $lang->project->name;?></th>
diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php
index 82230d6762..2c886ac075 100644
--- a/module/block/view/storyblock.html.php
+++ b/module/block/view/storyblock.html.php
@@ -24,11 +24,11 @@
 .block-stories.block-sm .c-status {text-align: center;}
 </style>
 <div class='panel-body has-table scrollbar-hover'>
-  <table class='table table-borderless table-hover table-fixed-head tablesorter block-stories <?php if(!$longBlock) echo 'block-sm'?>'>
+  <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-stories <?php if(!$longBlock) echo 'block-sm'?>'>
     <thead>
       <tr>
         <?php if($longBlock):?>
-        <th class="c-id-xs"><?php echo $lang->idAB?></th>
+        <th class="c-id"><?php echo $lang->idAB?></th>
         <?php endif;?>
         <th class="c-pri"><?php echo $lang->priAB?></th>
         <th class="c-name"><?php echo $lang->story->title;?></th>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 166fac91ea..c23489bc0a 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -22,10 +22,10 @@
 .block-tasks.block-sm .c-status {text-align: center;}
 </style>
 <div class='panel-body has-table scrollbar-hover'>
-  <table class='table table-borderless table-hover table-fixed-head tablesorter block-tasks <?php if(!$longBlock) echo 'block-sm';?>'>
+  <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-tasks <?php if(!$longBlock) echo 'block-sm';?>'>
     <thead>
       <tr>
-        <th class='c-id-xs'><?php echo $lang->idAB;?></th>
+        <th class='c-id'><?php echo $lang->idAB;?></th>
         <th class='c-pri'><?php echo $lang->priAB?></th>
         <th class='c-name'> <?php echo $lang->task->name;?></th>
         <?php if($longBlock):?>
diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php
index 80c6fee86d..178b02a977 100644
--- a/module/block/view/testtaskblock.html.php
+++ b/module/block/view/testtaskblock.html.php
@@ -14,7 +14,7 @@
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
 <div class='panel-body has-table scrollbar-hover'>
-  <table class='table table-borderless table-hover table-fixed-head tablesorter block-testtask table-fixed'>
+  <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-testtask table-fixed'>
     <thead>
       <tr class='text-center'>
         <?php if($longBlock):?>
diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index a439bfabb6..5a84f7afc6 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -9,6 +9,7 @@
  * @version     $Id$
  * @link        http://www.ranzhi.org
  */
+if(!$selfCall) die(include('./todolist.html.php'));
 ?>
 <style>
 .block-todoes .panel-body {position: relative; padding-top: 42px; overflow: visible !important; padding-bottom: 0;}
diff --git a/module/block/view/todolist.html.php b/module/block/view/todolist.html.php
new file mode 100644
index 0000000000..69c8e6ca09
--- /dev/null
+++ b/module/block/view/todolist.html.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * The story block view file of block module of RanZhi.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     block
+ * @version     $Id$
+ * @link        http://www.ranzhi.org
+ */
+?>
+<style>
+.block-todoes .c-date {width: 100px;}
+.block-todoes .c-pri {width: 45px;text-align: center;}
+.block-todoes .c-status {width: 80px;}
+</style>
+<div class='panel-body has-table scrollbar-hover'>
+  <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-todoes'>
+    <thead>
+      <tr>
+        <th class='c-date'><?php echo $lang->todo->date;?></th>
+        <th class="c-pri"><?php echo $lang->priAB?></th>
+        <th class="c-name"><?php echo $lang->todo->name;?></th>
+        <th class="c-status"><?php echo $lang->statusAB;?></th>
+      </tr>
+    </thead>
+    <tbody>
+      <?php foreach($todos as $todo):?>
+      <?php
+      $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
+      $viewLink = $this->createLink('todo', 'view', "todo={$todo->id}");
+      ?>
+      <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+        <td class='c-date'>
+          <?php if ($todo->date == '2030-01-01') :?>
+          <?php echo $lang->todo->periods['future'];?>
+          <?php else:?>
+          <?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?>
+          <?php endif;?>
+        </td>
+        <td class="c-pri"><span class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></span></td>
+        <td class="c-name" title='<?php echo $todo->name;?>'><?php echo $todo->name;?></td>
+        <td class='c-status'><?php echo zget($lang->todo->statusList, $todo->status);?></td>
+      </tr>
+      <?php endforeach;?>
+    </tbody>
+  </table>
+</div>