diff --git a/config/config.php b/config/config.php
index 05f88d22b7..216868a97a 100644
--- a/config/config.php
+++ b/config/config.php
@@ -79,7 +79,7 @@ define('TABLE_TODO',           $config->db->prefix . 'todo');
 define('TABLE_GROUP',          $config->db->prefix . 'group');
 define('TABLE_GROUPPRIV',      $config->db->prefix . 'groupPriv');
 define('TABLE_USERGROUP',      $config->db->prefix . 'userGroup');
-define('TABLE_USERQUERY',      $config->db->prefix . 'userQuery');
+//define('TABLE_USERQUERY',      $config->db->prefix . 'userQuery');
 
 define('TABLE_BUG',            $config->db->prefix . 'bug');
 define('TABLE_CASE',           $config->db->prefix . 'case');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index bb3950dafe..2b32553c3d 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -35,8 +35,9 @@ $lang->copy       = '复制';
 $lang->delete     = '删除';
 $lang->close      = '关闭';
 $lang->activate   = '激活';
-$lang->delete     = '删除';
 $lang->save       = '保存';
+$lang->confirm    = '确认';
+$lang->preview    = '预览';
 $lang->actions    = '操作';
 $lang->comment    = '备注';
 $lang->history    = '历史记录';
@@ -55,7 +56,6 @@ $lang->reverse    = '（切换顺序）';
 $lang->addFiles   = '上传了附件 ';
 $lang->files      = '附件 ';
 $lang->workingHour= '工时';
-$lang->preview    = '预览';
 $lang->showHelp   = '显示帮助';
 
 /* 主导航菜单。*/
diff --git a/module/project/control.php b/module/project/control.php
index 02558361d9..290a0d653e 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -106,7 +106,7 @@ class project extends control
         $this->view->recTotal   = $pager->recTotal;
         $this->view->recPerPage = $pager->recPerPage;
         $this->view->orderBy    = $orderBy;
-        $this->view->browseType = 'list';
+        $this->view->browseType = $status != 'needConfirm' ? 'list' : 'needconfirm';
 
         $this->display();
     }
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 4d28e180cf..22572d02b9 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -94,6 +94,7 @@ $lang->project->groupTaskByConsumed = '按已消耗分组';
 $lang->project->groupTaskByLeft     = '按剩余工时分组';
 $lang->project->groupTaskByType     = '按任务类型分组';
 $lang->project->groupTaskByDeadline = '按截止日期分组';
+$lang->project->listTaskNeedConfrim = '需求有变动的任务';
 
 $lang->project->beginAndEnd  = '起止时间';
 $lang->project->lblStats     = '工时统计';
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index efc027be57..76890604f8 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -68,5 +68,5 @@
     <?php endforeach;?>
   </table>
 </div>  
-<script language='Javascript'>$('#by<?php echo $browseType;?>').addClass('active');</script>
+<script language='Javascript'>$('#<?php echo $browseType;?>').addClass('active');</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 800ea4e8a2..9f93cceaf8 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -80,7 +80,16 @@
       </td>
       <td>
         <?php common::printLink('task', 'edit',   "taskid=$task->id", $lang->edit);?>
-        <?php common::printLink('task', 'delete', "projectID=$task->project&taskid=$task->id", $lang->delete, 'hiddenwin');?>
+        <?php 
+        if($browseType == 'needconfirm')
+        {
+            common::printLink('task', 'confirmStoryChange', "taskid=$task->id", $lang->confirm, 'hiddenwin');
+        }
+        else
+        {
+            common::printLink('task', 'delete', "projectID=$task->project&taskid=$task->id", $lang->delete, 'hiddenwin');
+        }
+        ?>
       </td>
     </tr>
     <?php endforeach;?>
@@ -88,5 +97,5 @@
   </table>
   <div class='a-right'><?php echo $pager;?></div>
 </div>  
-<script language='Javascript'>$('#by<?php echo $browseType;?>').addClass('active');</script>
+<script language='Javascript'>$('#<?php echo $browseType;?>').addClass('active');</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 43d78d643f..96926610ee 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -5,16 +5,17 @@
   <div id='featurebar'>
     <div class='f-left'>
     <?php
-    echo "<span id='bylist'>"    ; common::printLink('project', 'task',      "project=$project->id",                 $lang->project->listTask);            echo  '</span>' ;
-    echo "<span id='bystory'>"   ; common::printLink('project', 'groupTask', "project=$project->id&groupby=story",   $lang->project->groupTaskByStory);    echo  '</span>' ;
-    echo "<span id='bystatus'>"  ; common::printLink('project', 'groupTask', "project=$project->id&groupby=status",  $lang->project->groupTaskByStatus);   echo  '</span>' ;
-    echo "<span id='bypri'>"     ; common::printLink('project', 'groupTask', "project=$project->id&groupby=pri",     $lang->project->groupTaskByPri);      echo  '</span>' ;
-    echo "<span id='byowner'>"   ; common::printLink('project', 'groupTask', "project=$project->id&groupby=owner",   $lang->project->groupTaskByOwner);    echo  '</span>' ;
-    echo "<span id='byestimate'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=estimate",$lang->project->groupTaskByEstimate); echo  '</span>' ;
-    echo "<span id='byconsumed'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=consumed",$lang->project->groupTaskByConsumed); echo  '</span>' ;
-    echo "<span id='byleft'>"    ; common::printLink('project', 'groupTask', "project=$project->id&groupby=left",    $lang->project->groupTaskByLeft);     echo  '</span>' ;
-    echo "<span id='bytype'>"    ; common::printLink('project', 'groupTask', "project=$project->id&groupby=type",    $lang->project->groupTaskByType);     echo  '</span>' ;
-    echo "<span id='bydeadline'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=deadline",$lang->project->groupTaskByDeadline); echo  '</span>' ;
+    echo "<span id='list'>"    ; common::printLink('project', 'task',      "project=$project->id",                   $lang->project->listTask);            echo  '</span>' ;
+    echo "<span id='story'>"   ; common::printLink('project', 'groupTask', "project=$project->id&groupby=story",     $lang->project->groupTaskByStory);    echo  '</span>' ;
+    echo "<span id='status'>"  ; common::printLink('project', 'groupTask', "project=$project->id&groupby=status",    $lang->project->groupTaskByStatus);   echo  '</span>' ;
+    echo "<span id='pri'>"     ; common::printLink('project', 'groupTask', "project=$project->id&groupby=pri",       $lang->project->groupTaskByPri);      echo  '</span>' ;
+    echo "<span id='owner'>"   ; common::printLink('project', 'groupTask', "project=$project->id&groupby=owner",     $lang->project->groupTaskByOwner);    echo  '</span>' ;
+    echo "<span id='estimate'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=estimate",  $lang->project->groupTaskByEstimate); echo  '</span>' ;
+    echo "<span id='consumed'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=consumed",  $lang->project->groupTaskByConsumed); echo  '</span>' ;
+    echo "<span id='left'>"    ; common::printLink('project', 'groupTask', "project=$project->id&groupby=left",      $lang->project->groupTaskByLeft);     echo  '</span>' ;
+    echo "<span id='type'>"    ; common::printLink('project', 'groupTask', "project=$project->id&groupby=type",      $lang->project->groupTaskByType);     echo  '</span>' ;
+    echo "<span id='deadline'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=deadline",  $lang->project->groupTaskByDeadline); echo  '</span>' ;
+    echo "<span id='needconfirm'>" ; common::printLink('project', 'task',  "project=$project->id&status=needConfirm",$lang->project->listTaskNeedConfrim); echo  '</span>' ;
     ?>
     </div>
     <div class='f-right'>
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 4d1ff43869..4ad7ab99ff 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -25,7 +25,6 @@ $lang->story->browse    = "需求列表";
 $lang->story->create    = "新增需求";
 $lang->story->change    = "变更";
 $lang->story->changed   = '需求变更';
-$lang->story->confirm   = '确认';
 $lang->story->review    = '评审';
 $lang->story->edit      = "编辑需求";
 $lang->story->close     = '关闭';
diff --git a/module/task/model.php b/module/task/model.php
index dc2f8535aa..827a1992fb 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -123,7 +123,8 @@ class taskModel extends model
             ->leftJoin(TABLE_USER)->alias('t3')
             ->on('t1.owner = t3.account')
             ->where('t1.project')->eq((int)$projectID)
-            ->onCaseOf($status != 'all')->andWhere('t1.status')->in($status)->endCase()
+            ->onCaseOf($status == 'needConfirm')->andWhere('t2.version > t1.storyVersion')->andWhere('t2.status = "active"')->endCase()
+            ->onCaseOf($status != 'all' and $status != 'needConfirm')->andWhere('t1.status')->in($status)->endCase()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll();
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 94616d246b..fa6863a7ba 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -83,7 +83,7 @@
             if($task->needConfirm)
             {
                 echo "(<span class='warning'>{$lang->story->changed}</span> ";
-                echo html::a($this->createLink('task', 'confirmStoryChange', "taskID=$task->id"), $lang->story->confirm, 'hiddenwin');
+                echo html::a($this->createLink('task', 'confirmStoryChange', "taskID=$task->id"), $lang->confirm, 'hiddenwin');
                 echo ")";
             }
             ?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index b89c91a70b..0d46bcaee1 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -163,12 +163,13 @@ caption       {border:1px solid #e4e4e4; background:#efefef; margin:0; padding:5
 .bg-gray   {background-color:#efefef;}
 
 /*-----------------------COLOR SETTING----------------------------*/
-.red    {color:red;}
-.blue   {color:blue}
-.yellow {color:yellow;}
-.gray   {color:gray;}
-.green  {color:green;}
-.star   {color:red; font-size:14px; font-weight:bold}
+.red     {color:red;}
+.blue    {color:blue}
+.yellow  {color:yellow;}
+.gray    {color:gray;}
+.green   {color:green;}
+.star    {color:red; font-size:14px; font-weight:bold}
+.warning {background:yellow; color:red; font-weight:bold}
 
 /*-----------------------SPECIAL PART SETTING--------------------*/