diff --git a/Makefile b/Makefile
index 2d2a9657fc..bcb84bcb74 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ tgz:
 	# create the restart file for svn.
 	# touch zentaopms/module/svn/restart
 	# delee the unused files.
-	find zentaopms -name .svn |xargs rm -fr
+	find zentaopms -name .gitkeep |xargs rm -fr
 	find zentaopms -name tests |xargs rm -fr
 	# notify.zip.
 	mkdir zentaopms/www/data/notify/
diff --git a/module/bug/view/browse.custom.html.php b/module/bug/view/browse.custom.html.php
index b1f3177b41..9c54c6195c 100644
--- a/module/bug/view/browse.custom.html.php
+++ b/module/bug/view/browse.custom.html.php
@@ -12,7 +12,77 @@
     <td class='divider'></td>
     <td>
       <form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
-      <?php include './buglist.custom.html.php'?>
+        <table class='table-1 colored tablesorter datatable' id='bugList'>
+          <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+          <thead>
+          <tr class='colhead'>
+            <?php foreach($customFields as $fieldName):?>
+            <th><nobr><?php common::printOrderLink($fieldName, $orderBy, $vars, $lang->bug->$fieldName);?></nobr></th>
+            <?php endforeach;?>
+            <th class='w-70px {sorter:false}'><nobr><?php echo $lang->actions;?></nobr></th>
+          </tr>
+          </thead>
+          <tbody>
+          <?php foreach($bugs as $bug):?>
+          <?php $bugLink = inlink('view', "bugID=$bug->id");?>
+          <tr>
+            <?php $i = 0;?>
+            <?php foreach($customFields as $fieldName):?>
+            <?php $i ++;?>
+            <td><nobr>
+               <?php if($i == 1):?>
+               <input type='checkbox' name='bugIDList[]'  value='<?php echo $bug->id;?>'/> 
+               <?php endif;?>
+              <?php 
+              if(preg_match('/^(id|title)$/i', $fieldName))
+              {
+                  echo html::a($bugLink, $bug->$fieldName);
+              }
+              elseif(preg_match('/assignedTo|by/i', $fieldName))
+              {
+                  echo $users[$bug->$fieldName];
+              }
+              elseif(preg_match('/^(severity|pri|resolution|os|type|browse|status|confirmed)$/i', $fieldName))
+              {
+                  $key = $fieldName . 'List';
+                  $list = $lang->bug->$key;
+                  echo $list[$bug->$fieldName];
+              }
+              else
+              {
+                  echo !($bug->$fieldName == '0') ? $bug->$fieldName : '';
+              }
+              ?>
+            </nobr></td>
+            <?php endforeach;?>
+            <td class='a-center'><nobr>
+              <?php
+              $params = "bugID=$bug->id";
+              common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true);
+              common::printIcon('bug', 'close',   $params, $bug, 'list', '', '', 'iframe', true);
+              common::printIcon('bug', 'edit',    $params, $bug, 'list');
+              ?>
+              </nobr>
+            </td>
+          </tr>
+          <?php endforeach;?>
+          </tbody>
+          <tfoot>
+          <tr>
+            <td colspan='<?php echo count($customFields) + 1?>'>
+              <?php if(!empty($bugs)):?>
+              <div class='f-left'>
+                <?php 
+                echo html::selectAll() . html::selectReverse(); 
+                if(common::hasPriv('bug', 'batchEdit') and $bugs) echo html::submitButton($lang->edit);
+               ?>
+              </div>
+              <?php endif?>
+              <div class='f-right'><?php $pager->show();?></div>
+            </td>
+          </tr>
+          </tfoot>
+        </table>
       </form>
     </td>
   </tr>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index b6acdf60f9..5fd617edc9 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -11,13 +11,6 @@
  */
 ?>
 <?php
-if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes')
-{
-    if($customed) die(include './buglist.custom.html.php');
-    die(include './buglist.html.php');
-}
-?>
-<?php
 include '../../common/view/header.html.php';
 include '../../common/view/treeview.html.php';
 include '../../common/view/colorize.html.php';
@@ -80,7 +73,116 @@ js::set('customed', $customed);
       </td>
       <td class='divider <?php echo $treeClass;?>'></td>
       <td>
-        <?php include './buglist.html.php'?>
+        <table class='table-1 fixed colored tablesorter datatable' id='bugList'>
+          <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+          <thead>
+          <tr class='colhead'>
+            <th class='w-id'>       <?php common::printOrderLink('id',          $orderBy, $vars, $lang->idAB);?></th>
+            <th class='w-severity'> <?php common::printOrderLink('severity',    $orderBy, $vars, $lang->bug->severityAB);?></th>
+            <th class='w-pri'>      <?php common::printOrderLink('pri',         $orderBy, $vars, $lang->priAB);?></th>
+
+            <th>                    <?php common::printOrderLink('title',       $orderBy, $vars, $lang->bug->title);?></th>
+
+            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+            <th class='w-80px'><?php common::printOrderLink('status',           $orderBy, $vars, $lang->bug->statusAB);?></th>
+            <?php endif;?>
+
+            <?php if($browseType == 'needconfirm'):?>
+            <th class='w-200px'><?php common::printOrderLink('story',           $orderBy, $vars, $lang->bug->story);?></th>
+            <th class='w-50px'><?php echo $lang->actions;?></th>
+            <?php else:?>
+            <th class='w-user'><?php common::printOrderLink('openedBy',         $orderBy, $vars, $lang->openedByAB);?></th>
+
+            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+            <th class='w-date'><?php common::printOrderLink('openedDate',       $orderBy, $vars, $lang->bug->openedDateAB);?></th>
+            <?php endif;?>
+
+            <th class='w-user'><?php common::printOrderLink('assignedTo',       $orderBy, $vars, $lang->assignedToAB);?></th>
+            <th class='w-user'><?php common::printOrderLink('resolvedBy',       $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
+            <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
+
+            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+            <th class='w-date'><?php common::printOrderLink('resolvedDate',     $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
+            <?php endif;?>
+
+            <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
+            <?php endif;?>
+          </tr>
+          </thead>
+          <tbody>
+          <?php $canBatchEdit = common::hasPriv('bug', 'batchEdit');?>
+          <?php foreach($bugs as $bug):?>
+          <?php $bugLink = inlink('view', "bugID=$bug->id");?>
+          <tr class='a-center'>
+            <td class='<?php echo $bug->status;?>' style="font-weight:bold">
+              <?php if($canBatchEdit):?>
+              <input type='checkbox' name='bugIDList[]'  value='<?php echo $bug->id;?>'/> 
+              <?php endif;?>
+              <?php echo html::a($bugLink, sprintf('%03d', $bug->id));?>
+            </td>
+            <td><span class='<?php echo 'severity' . $bug->severity;?>'><?php echo $bug->severity;?></span></td>
+            <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri];?>'><?php echo $lang->bug->priList[$bug->pri];?></span></td>
+
+            <?php $class = 'confirm' . $bug->confirmed;?>
+            <td class='a-left' title="<?php echo $bug->title?>"><?php echo "<span class='$class'>[{$lang->bug->confirmedList[$bug->confirmed]}] </span>" . html::a($bugLink, $bug->title);?></td>
+
+            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+            <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+            <?php endif;?>
+
+            <?php if($browseType == 'needconfirm'):?>
+            <td class='a-left' title="<?php echo $bug->storyTitle?>"><?php echo html::a($this->createLink('story', 'view', "stoyID=$bug->story"), $bug->storyTitle, '_blank');?></td>
+            <td><?php $lang->bug->confirmStoryChange = $lang->confirm; common::printIcon('bug', 'confirmStoryChange', "bugID=$bug->id", '', 'list', '', 'hiddenwin')?></td>
+            <?php else:?>
+            <td><?php echo $users[$bug->openedBy];?></td>
+
+            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+            <td><?php echo substr($bug->openedDate, 5, 11)?></td>
+            <?php endif;?>
+
+            <td <?php if($bug->assignedTo == $this->app->user->account) echo 'class="red"';?>><?php echo $users[$bug->assignedTo];?></td>
+            <td><?php echo $users[$bug->resolvedBy];?></td>
+            <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
+
+            <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
+            <td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
+            <?php endif;?>
+
+            <td class='a-right'>
+              <?php
+              $params = "bugID=$bug->id";
+              common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
+              common::printIcon('bug', 'assignTo',   $params, '',   'list', '', '', 'iframe', true);
+              common::printIcon('bug', 'resolve',    $params, $bug, 'list', '', '', 'iframe', true);
+              common::printIcon('bug', 'close',      $params, $bug, 'list', '', '', 'iframe', true);
+              common::printIcon('bug', 'edit',       $params, $bug, 'list');
+              common::printIcon('bug', 'create',     "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy');
+              ?>
+            </td>
+            <?php endif;?>
+          </tr>
+          <?php endforeach;?>
+          </tbody>
+          <tfoot>
+            <tr>
+              <?php
+              $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 12 : 9;
+              if($browseType == 'needconfirm') $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 7 : 6; 
+              ?>
+              <td colspan='<?php echo $columns;?>'>
+                <?php if(!empty($bugs) and $canBatchEdit):?>
+                <div class='f-left'>
+                  <?php 
+                  echo html::selectAll() . html::selectReverse(); 
+                  echo html::submitButton($lang->edit);
+                 ?>
+                </div>
+                <?php endif?>
+                <div class='f-right'><?php $pager->show();?></div>
+              </td>
+            </tr>
+          </tfoot>
+        </table>
       </td>
     </tr>
   </table>  
diff --git a/module/bug/view/buglist.custom.html.php b/module/bug/view/buglist.custom.html.php
deleted file mode 100644
index c07c6b86ed..0000000000
--- a/module/bug/view/buglist.custom.html.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<table class='table-1 colored tablesorter datatable' id='bugList'>
-  <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-  <thead>
-  <tr class='colhead'>
-    <?php foreach($customFields as $fieldName):?>
-    <th><nobr><?php common::printOrderLink($fieldName, $orderBy, $vars, $lang->bug->$fieldName);?></nobr></th>
-    <?php endforeach;?>
-    <th class='w-70px {sorter:false}'><nobr><?php echo $lang->actions;?></nobr></th>
-  </tr>
-  </thead>
-  <tbody>
-  <?php foreach($bugs as $bug):?>
-  <?php $bugLink = inlink('view', "bugID=$bug->id");?>
-  <tr>
-    <?php $i = 0;?>
-    <?php foreach($customFields as $fieldName):?>
-    <?php $i ++;?>
-    <td><nobr>
-       <?php if($i == 1):?>
-       <input type='checkbox' name='bugIDList[]'  value='<?php echo $bug->id;?>'/> 
-       <?php endif;?>
-      <?php 
-      if(preg_match('/^(id|title)$/i', $fieldName))
-      {
-          echo html::a($bugLink, $bug->$fieldName);
-      }
-      elseif(preg_match('/assignedTo|by/i', $fieldName))
-      {
-          echo $users[$bug->$fieldName];
-      }
-      elseif(preg_match('/^(severity|pri|resolution|os|type|browse|status|confirmed)$/i', $fieldName))
-      {
-          $key = $fieldName . 'List';
-          $list = $lang->bug->$key;
-          echo $list[$bug->$fieldName];
-      }
-      else
-      {
-          echo !($bug->$fieldName == '0') ? $bug->$fieldName : '';
-      }
-      ?>
-    </nobr></td>
-    <?php endforeach;?>
-    <td class='a-center'><nobr>
-      <?php
-      $params = "bugID=$bug->id";
-      common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'close',   $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'edit',    $params, $bug, 'list');
-      ?>
-      </nobr>
-    </td>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <tfoot>
-  <tr>
-    <td colspan='<?php echo count($customFields) + 1?>'>
-      <?php if(!empty($bugs)):?>
-      <div class='f-left'>
-        <?php 
-        echo html::selectAll() . html::selectReverse(); 
-        if(common::hasPriv('bug', 'batchEdit') and $bugs) echo html::submitButton($lang->edit);
-       ?>
-      </div>
-      <?php endif?>
-      <div class='f-right'><?php $pager->show();?></div>
-    </td>
-  </tr>
-  </tfoot>
-</table>
diff --git a/module/bug/view/buglist.html.php b/module/bug/view/buglist.html.php
deleted file mode 100644
index 3a99b44e3e..0000000000
--- a/module/bug/view/buglist.html.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<table class='table-1 fixed colored tablesorter datatable' id='bugList'>
-  <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-  <thead>
-  <tr class='colhead'>
-    <th class='w-id'>       <?php common::printOrderLink('id',          $orderBy, $vars, $lang->idAB);?></th>
-    <th class='w-severity'> <?php common::printOrderLink('severity',    $orderBy, $vars, $lang->bug->severityAB);?></th>
-    <th class='w-pri'>      <?php common::printOrderLink('pri',         $orderBy, $vars, $lang->priAB);?></th>
-
-    <th>                    <?php common::printOrderLink('title',       $orderBy, $vars, $lang->bug->title);?></th>
-
-    <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-    <th class='w-80px'><?php common::printOrderLink('status',           $orderBy, $vars, $lang->bug->statusAB);?></th>
-    <?php endif;?>
-
-    <?php if($browseType == 'needconfirm'):?>
-    <th class='w-200px'><?php common::printOrderLink('story',           $orderBy, $vars, $lang->bug->story);?></th>
-    <th class='w-50px'><?php echo $lang->actions;?></th>
-    <?php else:?>
-    <th class='w-user'><?php common::printOrderLink('openedBy',         $orderBy, $vars, $lang->openedByAB);?></th>
-
-    <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-    <th class='w-date'><?php common::printOrderLink('openedDate',       $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-    <?php endif;?>
-
-    <th class='w-user'><?php common::printOrderLink('assignedTo',       $orderBy, $vars, $lang->assignedToAB);?></th>
-    <th class='w-user'><?php common::printOrderLink('resolvedBy',       $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
-    <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
-
-    <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-    <th class='w-date'><?php common::printOrderLink('resolvedDate',     $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
-    <?php endif;?>
-
-    <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
-    <?php endif;?>
-  </tr>
-  </thead>
-  <tbody>
-  <?php $canBatchEdit = common::hasPriv('bug', 'batchEdit');?>
-  <?php foreach($bugs as $bug):?>
-  <?php $bugLink = inlink('view', "bugID=$bug->id");?>
-  <tr class='a-center'>
-    <td class='<?php echo $bug->status;?>' style="font-weight:bold">
-      <?php if($canBatchEdit):?>
-      <input type='checkbox' name='bugIDList[]'  value='<?php echo $bug->id;?>'/> 
-      <?php endif;?>
-      <?php echo html::a($bugLink, sprintf('%03d', $bug->id));?>
-    </td>
-    <td><span class='<?php echo 'severity' . $bug->severity;?>'><?php echo $bug->severity;?></span></td>
-    <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri];?>'><?php echo $lang->bug->priList[$bug->pri];?></span></td>
-
-    <?php $class = 'confirm' . $bug->confirmed;?>
-    <td class='a-left' title="<?php echo $bug->title?>"><?php echo "<span class='$class'>[{$lang->bug->confirmedList[$bug->confirmed]}] </span>" . html::a($bugLink, $bug->title);?></td>
-
-    <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-    <td><?php echo $lang->bug->statusList[$bug->status];?></td>
-    <?php endif;?>
-
-    <?php if($browseType == 'needconfirm'):?>
-    <td class='a-left' title="<?php echo $bug->storyTitle?>"><?php echo html::a($this->createLink('story', 'view', "stoyID=$bug->story"), $bug->storyTitle, '_blank');?></td>
-    <td><?php $lang->bug->confirmStoryChange = $lang->confirm; common::printIcon('bug', 'confirmStoryChange', "bugID=$bug->id", '', 'list', '', 'hiddenwin')?></td>
-    <?php else:?>
-    <td><?php echo $users[$bug->openedBy];?></td>
-
-    <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-    <td><?php echo substr($bug->openedDate, 5, 11)?></td>
-    <?php endif;?>
-
-    <td <?php if($bug->assignedTo == $this->app->user->account) echo 'class="red"';?>><?php echo $users[$bug->assignedTo];?></td>
-    <td><?php echo $users[$bug->resolvedBy];?></td>
-    <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
-
-    <?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
-    <td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
-    <?php endif;?>
-
-    <td class='a-right'>
-      <?php
-      $params = "bugID=$bug->id";
-      common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'assignTo',   $params, '',   'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'resolve',    $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'close',      $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'edit',       $params, $bug, 'list');
-      common::printIcon('bug', 'create',     "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy');
-      ?>
-    </td>
-    <?php endif;?>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <tfoot>
-    <tr>
-      <?php
-      $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 12 : 9;
-      if($browseType == 'needconfirm') $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 7 : 6; 
-      ?>
-      <td colspan='<?php echo $columns;?>'>
-        <?php if(!empty($bugs) and $canBatchEdit):?>
-        <div class='f-left'>
-          <?php 
-          echo html::selectAll() . html::selectReverse(); 
-          echo html::submitButton($lang->edit);
-         ?>
-        </div>
-        <?php endif?>
-        <div class='f-right'><?php $pager->show();?></div>
-      </td>
-    </tr>
-  </tfoot>
-</table>
diff --git a/module/build/control.php b/module/build/control.php
index 944ede73ed..c6dc5970d0 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -153,9 +153,17 @@ class build extends control
         }
         else
         {
+            $response['result']  = 'success';
+            $response['message'] = '';
+
             $build = $this->build->getById($buildID);
             $this->build->delete(TABLE_BUILD, $buildID);
-            die(js::locate($this->createLink('project', 'build', "projectID=$build->project"), 'parent'));
+            if(dao::isError())
+            {
+                $response['result']  = 'fail';
+                $response['message'] = dao::getError();
+            }
+            $this->send($response);
         }
     }
 
diff --git a/module/common/view/tablesorter.html.php b/module/common/view/tablesorter.html.php
index 2f68b1e1b6..ffdbc37e1b 100644
--- a/module/common/view/tablesorter.html.php
+++ b/module/common/view/tablesorter.html.php
@@ -4,8 +4,12 @@ js::import($jsRoot . 'jquery/tablesorter/min.js');
 js::import($jsRoot . 'jquery/tablesorter/metadata.js');
 ?>
 <script language='javascript'>
-$(function() {
 
+/* sort table after page load. */
+$(function() { sortTable(); } );
+
+function sortTable()
+{
     $('.tablesorter').tablesorter(
         {
             widgets: ['zebra'], 
@@ -32,5 +36,5 @@ $(function() {
             }
         }
     );
-});
+}
 </script>
diff --git a/module/doc/control.php b/module/doc/control.php
index 8b55c04b76..841c6f8ae8 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -417,8 +417,16 @@ class doc extends control
         }
         else
         {
+            $response['result']  = 'success';
+            $response['message'] = '';
+
             $this->doc->delete(TABLE_DOC, $docID);
-            die(js::locate($this->session->docList, 'parent'));
+            if(dao::isError())
+            {
+                $response['result']  = 'fail';
+                $response['message'] = dao::getError();
+            }
+            $this->send($response);
         }
     }
 }
diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js
index b6a7404ab5..8e37fb28db 100644
--- a/module/doc/js/browse.js
+++ b/module/doc/js/browse.js
@@ -27,3 +27,35 @@ $(function(){
         browseBySearch();
     }
 });
+
+/**
+ * Delete doc. 
+ * 
+ * @param  int    $docID 
+ * @access public
+ * @return void
+ */
+function deleteDoc(docID)
+{
+    if(confirm(confirmDelete))
+    {
+        url = createLink('doc', 'delete','docID=' + docID + '&confrim=yes');
+        $.ajax(
+        {
+            type:     'GET', 
+            url:      url,
+            dataType: 'json', 
+            success:  function(data) 
+            {
+                if(data.result == 'success') 
+                {
+                    $('#docbox').load(request + ' #doclist', function()
+                    {
+                        $('.colored').colorize();
+                        $('tfoot td').css('background', 'white').unbind('click').unbind('hover');
+                    });
+                }
+            }
+        });
+    }
+}
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 4b90f11ef8..117e664434 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -14,6 +14,8 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/treeview.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
+<?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
+<?php js::set('request', $this->app->getURI(true))?>
 <script language='Javascript'>
 var browseType = '<?php echo $browseType;?>';
 </script>
@@ -41,8 +43,8 @@ var browseType = '<?php echo $browseType;?>';
       </div>
     </td>
     <td class='divider'></td>
-    <td>
-      <table class='table-1 fixed colored tablesorter datatable'>
+    <td id='docbox'>
+      <table class='table-1 fixed colored tablesorter datatable' id='doclist'>
         <thead>
           <tr class='colhead'>
             <?php $vars = "libID=$libID&module=$moduleID&productID=$productID&projectID=$projectID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
@@ -70,7 +72,7 @@ var browseType = '<?php echo $browseType;?>';
               <?php 
               $vars = "doc={$doc->id}";
               common::printIcon('doc', 'edit',   $vars, '', 'list');
-              common::printIcon('doc', 'delete', $vars, '', 'list', '', 'hiddenwin');
+              echo html::a("javascript:deleteDoc($doc->id)", '&nbsp;', '', "class='icon-green-common-delete' title='{$lang->doc->delete}'");
               ?>
             </td>
           </tr>
diff --git a/module/my/js/todo.js b/module/my/js/todo.js
index a3a789eb21..9ce579181e 100644
--- a/module/my/js/todo.js
+++ b/module/my/js/todo.js
@@ -20,4 +20,37 @@ function changeAction(formName, actionName, actionLink)
     $('#' + formName).attr('action', actionLink).submit();
 }
 
+/**
+ * Delete todo. 
+ * 
+ * @param  int    todoID 
+ * @access public
+ * @return void
+ */
+function deleteTodo(todoID)
+{
+    if(confirm(confirmDelete))
+    {
+        url = createLink('todo', 'delete','todoID=' + todoID + '&confrim=yes');
+        $.ajax(
+        {
+            type:     'GET', 
+            url:      url,
+            dataType: 'json', 
+            success:  function(data) 
+            {
+                if(data.result == 'success') 
+                {
+                    url = createLink('my', 'todo');
+                    $('#todo').load(url + ' #todoList', function()
+                    {
+                        $('.colored').colorize();
+                        $('tfoot td').css('background', 'white').unbind('click').unbind('hover');
+                    });
+                }
+            }
+        });
+    }
+}
+
 $(".colorbox").colorbox({width:960, height:550, iframe:true, transition:'none'});
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index ed0665daa7..cc65a51666 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes') die(include "./buglist.html.php")?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
 <div id='featurebar'>
@@ -24,7 +23,60 @@
   </div>
 </div>
 <form method='post' action='<?php echo $this->createLink('bug', 'batchEdit', "productID=0");?>'>
-<?php include "./buglist.html.php"?>
+  <table class='table-1 fixed tablesorter colored' id='bugList'>
+    <?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+    <thead>
+    <tr class='colhead'>
+      <th class='w-id'>        <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
+      <th class='w-severity'>  <?php common::printOrderLink('severity',   $orderBy, $vars, $lang->bug->severityAB);?></th>
+      <th class='w-pri'>       <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+      <th class='w-type'>      <?php common::printOrderLink('type',       $orderBy, $vars, $lang->typeAB);?></th>
+      <th>                     <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
+      <th class='w-user'>      <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+      <th class='w-user'>      <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
+      <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
+      <th class='w-140px'><?php echo $lang->actions;?></th>
+    </tr>
+    </thead>
+    <tbody>
+    <?php $canBatchEdit  = common::hasPriv('bug', 'batchEdit');?>
+    <?php foreach($bugs as $bug):?>
+    <tr class='a-center'>
+      <td class='a-left'>
+        <?php if($canBatchEdit):?><input type='checkbox' name='bugIDList[]' value='<?php echo $bug->id;?>' /><?php endif;?>
+        <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?>
+      </td>
+      <td><span class='<?php echo 'severity' . $lang->bug->severityList[$bug->severity]?>'><?php echo isset($lang->bug->severityList[$bug->severity]) ? $lang->bug->severityList[$bug->severity] : $bug->severity;?></span></td>
+      <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri]?>'><?php echo isset($lang->bug->priList[$bug->pri]) ? $lang->bug->priList[$bug->pri] : $bug->pri?></span></td>
+      <td><?php echo $lang->bug->typeList[$bug->type]?></td>
+      <td class='a-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+      <td><?php echo $users[$bug->openedBy];?></td>
+      <td><?php echo $users[$bug->resolvedBy];?></td>
+      <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
+      <td class='a-right'>
+        <?php
+        $params = "bugID=$bug->id";
+        common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
+        common::printIcon('bug', 'assignTo',   $params, '', 'list', '', '', 'iframe', true);
+        common::printIcon('bug', 'resolve',    $params, $bug, 'list', '', '', 'iframe', true);
+        common::printIcon('bug', 'close',      $params, $bug, 'list', '', '', 'iframe', true);
+        common::printIcon('bug', 'edit',       $params, '', 'list');
+        ?>
+      </td>
+    </tr>
+    <?php endforeach;?>
+    </tbody>
+    <tfoot>
+      <tr><td colspan='9'>
+      <?php if($bugs and $canBatchEdit):?>
+      <div class='f-left'>
+      <?php echo html::selectAll() . html::selectReverse() . html::submitButton($lang->edit);?>
+      </div>
+      <?php endif;?>
+      <?php $pager->show();?>
+      </td></tr>
+    </tfoot>
+  </table>
 </form>
 <?php js::set('listName', 'bugList')?>
 <script language='javascript'>$("#<?php echo $type;?>Tab").addClass('active');</script>
diff --git a/module/my/view/buglist.html.php b/module/my/view/buglist.html.php
deleted file mode 100644
index 36728068b9..0000000000
--- a/module/my/view/buglist.html.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<table class='table-1 fixed tablesorter colored' id='bugList'>
-  <?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
-  <thead>
-  <tr class='colhead'>
-    <th class='w-id'>        <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
-    <th class='w-severity'>  <?php common::printOrderLink('severity',   $orderBy, $vars, $lang->bug->severityAB);?></th>
-    <th class='w-pri'>       <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
-    <th class='w-type'>      <?php common::printOrderLink('type',       $orderBy, $vars, $lang->typeAB);?></th>
-    <th>                     <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
-    <th class='w-user'>      <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-    <th class='w-user'>      <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
-    <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
-    <th class='w-140px'><?php echo $lang->actions;?></th>
-  </tr>
-  </thead>
-  <tbody>
-  <?php $canBatchEdit  = common::hasPriv('bug', 'batchEdit');?>
-  <?php foreach($bugs as $bug):?>
-  <tr class='a-center'>
-    <td class='a-left'>
-      <?php if($canBatchEdit):?><input type='checkbox' name='bugIDList[]' value='<?php echo $bug->id;?>' /><?php endif;?>
-      <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?>
-    </td>
-    <td><span class='<?php echo 'severity' . $lang->bug->severityList[$bug->severity]?>'><?php echo isset($lang->bug->severityList[$bug->severity]) ? $lang->bug->severityList[$bug->severity] : $bug->severity;?></span></td>
-    <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri]?>'><?php echo isset($lang->bug->priList[$bug->pri]) ? $lang->bug->priList[$bug->pri] : $bug->pri?></span></td>
-    <td><?php echo $lang->bug->typeList[$bug->type]?></td>
-    <td class='a-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
-    <td><?php echo $users[$bug->openedBy];?></td>
-    <td><?php echo $users[$bug->resolvedBy];?></td>
-    <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
-    <td class='a-right'>
-      <?php
-      $params = "bugID=$bug->id";
-      common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'assignTo',   $params, '', 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'resolve',    $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'close',      $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'edit',       $params, '', 'list');
-      ?>
-    </td>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <tfoot>
-    <tr><td colspan='9'>
-    <?php if($bugs and $canBatchEdit):?>
-    <div class='f-left'>
-    <?php echo html::selectAll() . html::selectReverse() . html::submitButton($lang->edit);?>
-    </div>
-    <?php endif;?>
-    <?php $pager->show();?>
-    </td></tr>
-  </tfoot>
-</table>
diff --git a/module/my/view/caselist.html.php b/module/my/view/caselist.html.php
deleted file mode 100644
index c01e1eac45..0000000000
--- a/module/my/view/caselist.html.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<table class='table-1 fixed tablesorter colored' id='caseList'>
-  <?php 
-    $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
-    $this->app->loadLang('testtask');
-  ?>
-  <thead>
-    <tr class='colhead'>
-      <th class='w-id'>    <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
-      <th class='w-pri'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
-      <th>                 <?php common::printOrderLink('title',    $orderBy, $vars, $lang->testcase->title);?></th>
-      <th class='w-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
-      <th class='w-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-      <th class='w-80px'>  <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
-      <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
-      <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
-      <th class='w-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
-      <th class='w-140px'><?php echo $lang->actions;?></th>
-    </tr>
-  </thead>
-  <tbody>
-    <?php
-    $canBatchEdit = common::hasPriv('testcase', 'batchEdit');
-    $canBatchRun  = common::hasPriv('testtask', 'batchRun');
-    ?>
-    <?php foreach($cases as $case):?>
-    <tr class='a-center'>
-      <td>
-        <?php if($canBatchEdit or $canBatchRun):?><input type='checkbox' name='caseIDList[]'  value='<?php echo $case->id;?>'/><?php endif;?>
-        <?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
-      </td>
-      <td><span class='<?php echo 'pri' . $case->pri?>'><?php echo $case->pri?></span</td>
-      <td class='a-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?></td>
-      <td><?php echo $lang->testcase->typeList[$case->type];?></td>
-      <td><?php echo $users[$case->openedBy];?></td>
-      <td><?php echo $users[$case->lastRunner];?></td>
-      <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
-      <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
-      <td class='<?php echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
-      <td>
-      <?php
-      common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', '', '', 'iframe');
-      common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'iframe');
-      common::printIcon('testcase', 'edit',    "caseID=$case->id", $case, 'list');
-      common::printIcon('testcase', 'create',  "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $case, 'list', 'copy');
-      common::printIcon('testcase', 'delete',  "caseID=$case->id", '', 'list', '', 'hiddenwin');
-      common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug');
-      ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
-  </tbody> 
-  <tfoot>
-    <tr>
-      <td colspan='10'>
-        <?php if($cases):?>
-        <div class='f-left'>
-        <?php
-        if($canBatchEdit or $canBatchRun) echo html::selectAll() . html::selectReverse(); 
-        if($canBatchEdit) 
-        {
-            $actionLink = $this->createLink('testcase', 'batchEdit');
-            echo html::submitButton($lang->edit, "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
-        }
-        if($canBatchRun) 
-        {
-            $actionLink = $this->createLink('testtask', 'batchRun', "productID=0&orderBy=$orderBy&from=testcase");
-            echo html::submitButton($lang->testtask->runCase,  "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
-        }
-        ?>
-        </div>
-        <?php endif?>
-        <?php $pager->show();?>
-      </td>
-    </tr>
-  </tfoot>
-</table>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 5df9859f9b..06b02715a9 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes') die(include "./tasklist.html.php");?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
 <script language="Javascript">var type='<?php echo $type;?>';</script>
@@ -26,7 +25,79 @@
   </div>
 </div>
 <form method='post' id='myTaskForm'>
-<?php include "./tasklist.html.php";?>
+  <table class='table-1 tablesorter fixed colored' id='tasktable'>
+    <?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+    <thead>
+    <tr class='colhead'>
+      <th class='w-id'>    <?php common::printOrderLink('id',          $orderBy, $vars, $lang->idAB);?></th>
+      <th class='w-pri'>   <?php common::printOrderLink('pri',         $orderBy, $vars, $lang->priAB);?></th>
+      <th class='w-150px'> <?php common::printOrderLink('project',     $orderBy, $vars, $lang->task->project);?></th>
+      <th>                 <?php common::printOrderLink('name',        $orderBy, $vars, $lang->task->name);?></th>
+      <th class='w-hour'>  <?php common::printOrderLink('estimate',    $orderBy, $vars, $lang->task->estimateAB);?></th>
+      <th class='w-hour'>  <?php common::printOrderLink('consumed',    $orderBy, $vars, $lang->task->consumedAB);?></th>
+      <th class='w-hour'>  <?php common::printOrderLink('left',        $orderBy, $vars, $lang->task->leftAB);?></th>
+      <th class='w-date'>  <?php common::printOrderLink('deadline',    $orderBy, $vars, $lang->task->deadlineAB);?></th>
+      <th class='w-status'><?php common::printOrderLink('status',      $orderBy, $vars, $lang->statusAB);?></th>
+      <th class='w-user'>  <?php common::printOrderLink('openedBy',    $orderBy, $vars, $lang->openedByAB);?></th>
+      <th class='w-140px'> <?php echo $lang->actions;?></th>
+    </tr>
+    </thead>   
+    <tbody>
+    <?php $canBatchEdit  = common::hasPriv('task', 'batchEdit');?>
+    <?php $canBatchClose = (common::hasPriv('task', 'batchClose') and $type != 'closedBy');?>
+    <?php foreach($tasks as $task):?>
+    <tr class='a-center'>
+      <td class='a-left'>
+        <?php if($canBatchEdit or $canBatchClose):?><input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>' /><?php endif;?>
+        <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>
+      </td>
+      <td><span class='<?php echo 'pri' . $lang->task->priList[$task->pri];?>'><?php echo isset($lang->task->priList[$task->pri]) ? $lang->task->priList[$task->pri] : $task->pri;?></span></td>
+      <td class='nobr a-left'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></th>
+      <td class='a-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
+      <td><?php echo $task->estimate;?></td>
+      <td><?php echo $task->consumed;?></td>
+      <td><?php echo $task->left;?></td>
+      <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
+      <td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
+      <td><?php echo $users[$task->openedBy];?></td>
+      <td class='a-right'>
+        <?php 
+        common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+        common::printIcon('task', 'start',    "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+        common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+        common::printIcon('task', 'finish',   "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+        common::printIcon('task', 'close',    "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+        common::printIcon('task', 'edit', "taskID=$task->id", '', 'list');
+        ?>
+      </td>
+    </tr>
+    <?php endforeach;?>
+    </tbody>
+    <tfoot>
+      <tr>
+        <td colspan='11'>
+        <?php if(count($tasks)):?>
+        <div class='f-left'>
+        <?php 
+        if($canBatchEdit or $canBatchClose) echo html::selectAll() . html::selectReverse();
+        if($canBatchEdit)
+        {
+            $actionLink = $this->createLink('task', 'batchEdit', "projectID=0&orderBy=$orderBy");
+            echo html::commonButton($lang->edit, "onclick=\"changeAction('myTaskForm', 'batchEdit', '$actionLink')\"");
+        }
+        if($canBatchClose)
+        {
+            $actionLink = $this->createLink('task', 'batchClose');
+            echo html::commonButton($lang->close, "onclick=\"changeAction('myTaskForm', 'batchClose', '$actionLink')\"");
+        }
+         ?>
+        </div> 
+        <?php endif;?>
+        <?php $pager->show();?>
+        </td>
+      </tr>
+    </tfoot>
+  </table> 
 </form>
 <?php js::set('listName', 'tasktable')?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/tasklist.html.php b/module/my/view/tasklist.html.php
deleted file mode 100644
index 8f09c1578e..0000000000
--- a/module/my/view/tasklist.html.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<table class='table-1 tablesorter fixed colored' id='tasktable'>
-  <?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
-  <thead>
-  <tr class='colhead'>
-    <th class='w-id'>    <?php common::printOrderLink('id',          $orderBy, $vars, $lang->idAB);?></th>
-    <th class='w-pri'>   <?php common::printOrderLink('pri',         $orderBy, $vars, $lang->priAB);?></th>
-    <th class='w-150px'> <?php common::printOrderLink('project',     $orderBy, $vars, $lang->task->project);?></th>
-    <th>                 <?php common::printOrderLink('name',        $orderBy, $vars, $lang->task->name);?></th>
-    <th class='w-hour'>  <?php common::printOrderLink('estimate',    $orderBy, $vars, $lang->task->estimateAB);?></th>
-    <th class='w-hour'>  <?php common::printOrderLink('consumed',    $orderBy, $vars, $lang->task->consumedAB);?></th>
-    <th class='w-hour'>  <?php common::printOrderLink('left',        $orderBy, $vars, $lang->task->leftAB);?></th>
-    <th class='w-date'>  <?php common::printOrderLink('deadline',    $orderBy, $vars, $lang->task->deadlineAB);?></th>
-    <th class='w-status'><?php common::printOrderLink('status',      $orderBy, $vars, $lang->statusAB);?></th>
-    <th class='w-user'>  <?php common::printOrderLink('openedBy',    $orderBy, $vars, $lang->openedByAB);?></th>
-    <th class='w-140px'> <?php echo $lang->actions;?></th>
-  </tr>
-  </thead>   
-  <tbody>
-  <?php $canBatchEdit  = common::hasPriv('task', 'batchEdit');?>
-  <?php $canBatchClose = (common::hasPriv('task', 'batchClose') and $type != 'closedBy');?>
-  <?php foreach($tasks as $task):?>
-  <tr class='a-center'>
-    <td class='a-left'>
-      <?php if($canBatchEdit or $canBatchClose):?><input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>' /><?php endif;?>
-      <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>
-    </td>
-    <td><span class='<?php echo 'pri' . $lang->task->priList[$task->pri];?>'><?php echo isset($lang->task->priList[$task->pri]) ? $lang->task->priList[$task->pri] : $task->pri;?></span></td>
-    <td class='nobr a-left'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></th>
-    <td class='a-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
-    <td><?php echo $task->estimate;?></td>
-    <td><?php echo $task->consumed;?></td>
-    <td><?php echo $task->left;?></td>
-    <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-    <td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
-    <td><?php echo $users[$task->openedBy];?></td>
-    <td class='a-right'>
-      <?php 
-      common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-      common::printIcon('task', 'start',    "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-      common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-      common::printIcon('task', 'finish',   "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-      common::printIcon('task', 'close',    "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-      common::printIcon('task', 'edit', "taskID=$task->id", '', 'list');
-      ?>
-    </td>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <tfoot>
-    <tr>
-      <td colspan='11'>
-      <?php if(count($tasks)):?>
-      <div class='f-left'>
-      <?php 
-      if($canBatchEdit or $canBatchClose) echo html::selectAll() . html::selectReverse();
-      if($canBatchEdit)
-      {
-          $actionLink = $this->createLink('task', 'batchEdit', "projectID=0&orderBy=$orderBy");
-          echo html::commonButton($lang->edit, "onclick=\"changeAction('myTaskForm', 'batchEdit', '$actionLink')\"");
-      }
-      if($canBatchClose)
-      {
-          $actionLink = $this->createLink('task', 'batchClose');
-          echo html::commonButton($lang->close, "onclick=\"changeAction('myTaskForm', 'batchClose', '$actionLink')\"");
-      }
-       ?>
-      </div> 
-      <?php endif;?>
-      <?php $pager->show();?>
-      </td>
-    </tr>
-  </tfoot>
-</table> 
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index 538eada6c9..ef75d92a12 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes') die(include "./caselist.html.php");?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
 <div id='featurebar'>
@@ -25,7 +24,82 @@
 </div>
 
 <form method='post' id='myCaseForm'>
-<?php include './caselist.html.php';?>
+  <table class='table-1 fixed tablesorter colored' id='caseList'>
+    <?php 
+      $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
+      $this->app->loadLang('testtask');
+    ?>
+    <thead>
+      <tr class='colhead'>
+        <th class='w-id'>    <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
+        <th class='w-pri'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+        <th>                 <?php common::printOrderLink('title',    $orderBy, $vars, $lang->testcase->title);?></th>
+        <th class='w-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
+        <th class='w-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+        <th class='w-80px'>  <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
+        <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
+        <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
+        <th class='w-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
+        <th class='w-140px'><?php echo $lang->actions;?></th>
+      </tr>
+    </thead>
+    <tbody>
+      <?php
+      $canBatchEdit = common::hasPriv('testcase', 'batchEdit');
+      $canBatchRun  = common::hasPriv('testtask', 'batchRun');
+      ?>
+      <?php foreach($cases as $case):?>
+      <tr class='a-center'>
+        <td>
+          <?php if($canBatchEdit or $canBatchRun):?><input type='checkbox' name='caseIDList[]'  value='<?php echo $case->id;?>'/><?php endif;?>
+          <?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
+        </td>
+        <td><span class='<?php echo 'pri' . $case->pri?>'><?php echo $case->pri?></span</td>
+        <td class='a-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?></td>
+        <td><?php echo $lang->testcase->typeList[$case->type];?></td>
+        <td><?php echo $users[$case->openedBy];?></td>
+        <td><?php echo $users[$case->lastRunner];?></td>
+        <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
+        <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
+        <td class='<?php echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
+        <td>
+        <?php
+        common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', '', '', 'iframe');
+        common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'iframe');
+        common::printIcon('testcase', 'edit',    "caseID=$case->id", $case, 'list');
+        common::printIcon('testcase', 'create',  "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $case, 'list', 'copy');
+        common::printIcon('testcase', 'delete',  "caseID=$case->id", '', 'list', '', 'hiddenwin');
+        common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug');
+        ?>
+        </td>
+      </tr>
+      <?php endforeach;?>
+    </tbody> 
+    <tfoot>
+      <tr>
+        <td colspan='10'>
+          <?php if($cases):?>
+          <div class='f-left'>
+          <?php
+          if($canBatchEdit or $canBatchRun) echo html::selectAll() . html::selectReverse(); 
+          if($canBatchEdit) 
+          {
+              $actionLink = $this->createLink('testcase', 'batchEdit');
+              echo html::submitButton($lang->edit, "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
+          }
+          if($canBatchRun) 
+          {
+              $actionLink = $this->createLink('testtask', 'batchRun', "productID=0&orderBy=$orderBy&from=testcase");
+              echo html::submitButton($lang->testtask->runCase,  "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
+          }
+          ?>
+          </div>
+          <?php endif?>
+          <?php $pager->show();?>
+        </td>
+      </tr>
+    </tfoot>
+  </table>
 </form>
 <?php js::set('listName', 'caseList')?>
 <script language="Javascript">$("#<?php echo $type;?>Tab").addClass('active'); </script>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index b09db9ac73..cf223b6350 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -10,10 +10,10 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes') die(include "./todolist.html.php")?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php js::set('confirmDelete', $lang->todo->confirmDelete)?>
 <form method='post' id='todoform'>
   <div id='featurebar'>
     <div class='f-left'>
@@ -48,7 +48,83 @@
       ?>
     </div>
   </div>
-  <?php include "./todolist.html.php"?>
+  <table class='table-1 tablesorter colored' id='todoList'>
+    <?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+    <thead>
+    <tr class='colhead'>
+      <th class='w-id'>    <?php common::printOrderLink('id',     $orderBy, $vars, $lang->idAB);?></th>
+      <th class='w-date'>  <?php common::printOrderLink('date',   $orderBy, $vars, $lang->todo->date);?></th>
+      <th class='w-type'>  <?php common::printOrderLink('type',   $orderBy, $vars, $lang->todo->type);?></th>
+      <th class='w-pri'>   <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
+      <th>                 <?php common::printOrderLink('name',   $orderBy, $vars, $lang->todo->name);?></th>
+      <th class='w-hour'>  <?php common::printOrderLink('begin',  $orderBy, $vars, $lang->todo->beginAB);?></th>
+      <th class='w-hour'>  <?php common::printOrderLink('end',    $orderBy, $vars, $lang->todo->endAB);?></th>
+      <th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
+      <th class='w-80px {sorter:false}'><?php echo $lang->actions;?></th>
+    </tr>
+    </thead>
+    <tbody>
+    <?php foreach($todos as $todo):?>
+    <tr class='a-center'>
+      <td class='a-left'>
+        <?php if(common::hasPriv('todo', 'batchEdit') or (common::hasPriv('todo', 'import2Today') and $importFuture)):?>
+        <input type='checkbox' name='todoIDList[<?php echo $todo->id;?>]' value='<?php echo $todo->id;?>' />         
+        <?php endif;?>
+        <?php echo $todo->id; ?>
+      </td>
+      <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
+      <td><?php echo $lang->todo->typeList[$todo->type];?></td>
+      <td><span class='<?php echo 'pri' . $todo->pri;?>'><?php echo $todo->pri?></span></td>
+      <td class='a-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "class='colorbox'");?></td>
+      <td><?php echo $todo->begin;?></td>
+      <td><?php echo $todo->end;?></td>
+      <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
+      <td class='a-right'>
+        <?php 
+        common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', '', 'hiddenwin');
+        common::printIcon('todo', 'edit',   "id=$todo->id", '', 'list', '', '', 'iframe', true);
+        common::printIcon('todo', 'delete', "id=$todo->id", '', 'list', '', 'hiddenwin');
+        ?>
+      </td>
+    </tr>
+    <?php endforeach;?>
+    </tbody>
+    <?php if(count($todos)):?>
+    <tfoot>
+      <tr>
+        <td colspan='9' align='left'>
+        <div class='f-left'>
+        <?php 
+        if(common::hasPriv('todo', 'batchEdit') or (common::hasPriv('todo', 'import2Today') and $importFuture))
+        {
+            echo html::selectAll() . html::selectReverse();
+        }
+        if(common::hasPriv('todo', 'batchEdit'))
+        {
+            $actionLink = $this->createLink('todo', 'batchEdit', "from=myTodo&type=$type&account=$account&status=$status");
+            echo html::commonButton($lang->edit, "onclick=\"changeAction('todoform', 'batchEdit', '$actionLink')\"");
+
+        }
+        if(common::hasPriv('todo', 'batchFinish'))
+        {
+            $actionLink = $this->createLink('todo', 'batchFinish');
+            echo html::commonButton($lang->todo->finish, "onclick=\"changeAction('todoform', 'batchFinish', '$actionLink')\"");
+
+        }
+        if(common::hasPriv('todo', 'import2Today') and $importFuture)
+        {
+            $actionLink = $this->createLink('todo', 'import2Today');
+            echo html::commonButton($lang->todo->import, "onclick=\"changeAction('todoform', 'import2Today', '$actionLink')\"");
+            echo html::input('date', date('Y-m-d'), "class='date w-80px'");
+        }
+        ?>
+        </div>
+        <?php $pager->show();?>
+        </td>
+      </tr>
+    </tfoot>
+    <?php endif;?>
+  </table>
 </form>
 <?php js::set('listName', 'todoList')?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/todolist.html.php b/module/my/view/todolist.html.php
deleted file mode 100644
index 3c4881f51b..0000000000
--- a/module/my/view/todolist.html.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<table class='table-1 tablesorter colored' id='todoList'>
-  <?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
-  <thead>
-  <tr class='colhead'>
-    <th class='w-id'>    <?php common::printOrderLink('id',     $orderBy, $vars, $lang->idAB);?></th>
-    <th class='w-date'>  <?php common::printOrderLink('date',   $orderBy, $vars, $lang->todo->date);?></th>
-    <th class='w-type'>  <?php common::printOrderLink('type',   $orderBy, $vars, $lang->todo->type);?></th>
-    <th class='w-pri'>   <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
-    <th>                 <?php common::printOrderLink('name',   $orderBy, $vars, $lang->todo->name);?></th>
-    <th class='w-hour'>  <?php common::printOrderLink('begin',  $orderBy, $vars, $lang->todo->beginAB);?></th>
-    <th class='w-hour'>  <?php common::printOrderLink('end',    $orderBy, $vars, $lang->todo->endAB);?></th>
-    <th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
-    <th class='w-80px {sorter:false}'><?php echo $lang->actions;?></th>
-  </tr>
-  </thead>
-  <tbody>
-  <?php foreach($todos as $todo):?>
-  <tr class='a-center'>
-    <td class='a-left'>
-      <?php if(common::hasPriv('todo', 'batchEdit') or (common::hasPriv('todo', 'import2Today') and $importFuture)):?>
-      <input type='checkbox' name='todoIDList[<?php echo $todo->id;?>]' value='<?php echo $todo->id;?>' />         
-      <?php endif;?>
-      <?php echo $todo->id; ?>
-    </td>
-    <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
-    <td><?php echo $lang->todo->typeList[$todo->type];?></td>
-    <td><span class='<?php echo 'pri' . $todo->pri;?>'><?php echo $todo->pri?></span></td>
-    <td class='a-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "class='colorbox'");?></td>
-    <td><?php echo $todo->begin;?></td>
-    <td><?php echo $todo->end;?></td>
-    <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
-    <td class='a-right'>
-      <?php 
-      common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', '', 'hiddenwin');
-      common::printIcon('todo', 'edit',   "id=$todo->id", '', 'list', '', '', 'iframe', true);
-      common::printIcon('todo', 'delete', "id=$todo->id", '', 'list', '', 'hiddenwin');
-      ?>
-    </td>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <?php if(count($todos)):?>
-  <tfoot>
-    <tr>
-      <td colspan='9' align='left'>
-      <div class='f-left'>
-      <?php 
-      if(common::hasPriv('todo', 'batchEdit') or (common::hasPriv('todo', 'import2Today') and $importFuture))
-      {
-          echo html::selectAll() . html::selectReverse();
-      }
-      if(common::hasPriv('todo', 'batchEdit'))
-      {
-          $actionLink = $this->createLink('todo', 'batchEdit', "from=myTodo&type=$type&account=$account&status=$status");
-          echo html::commonButton($lang->edit, "onclick=\"changeAction('todoform', 'batchEdit', '$actionLink')\"");
-
-      }
-      if(common::hasPriv('todo', 'batchFinish'))
-      {
-          $actionLink = $this->createLink('todo', 'batchFinish');
-          echo html::commonButton($lang->todo->finish, "onclick=\"changeAction('todoform', 'batchFinish', '$actionLink')\"");
-
-      }
-      if(common::hasPriv('todo', 'import2Today') and $importFuture)
-      {
-          $actionLink = $this->createLink('todo', 'import2Today');
-          echo html::commonButton($lang->todo->import, "onclick=\"changeAction('todoform', 'import2Today', '$actionLink')\"");
-          echo html::input('date', date('Y-m-d'), "class='date w-80px'");
-      }
-      ?>
-      </div>
-      <?php $pager->show();?>
-      </td>
-    </tr>
-  </tfoot>
-  <?php endif;?>
-</table>
diff --git a/module/product/control.php b/module/product/control.php
index b2a6e759d1..15e425b522 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -183,9 +183,9 @@ class product extends control
         $this->view->title      = $this->lang->product->create;
         $this->view->position[] = $this->view->title;
         $this->view->groups     = $this->loadModel('group')->getPairs();
-        $this->view->poUsers    = $this->loadModel('user')->getPairs('nodeleted|pofirst');
-        $this->view->qdUsers    = $this->loadModel('user')->getPairs('nodeleted|qdfirst');
-        $this->view->rdUsers    = $this->loadModel('user')->getPairs('nodeleted|devfirst');
+        $this->view->poUsers    = $this->loadModel('user')->getPairs('nodeleted|pofirst|noclosed');
+        $this->view->qdUsers    = $this->loadModel('user')->getPairs('nodeleted|qdfirst|noclosed');
+        $this->view->rdUsers    = $this->loadModel('user')->getPairs('nodeleted|devfirst|noclosed');
         $this->display();
     }
 
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index c6881fa941..6e4d9fba04 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -87,5 +87,4 @@ function toggleSubMenu(currentID, position, menuIndex)
 $(function()
 {
     if(browseType == 'bysearch') ajaxGetSearchForm();
-    setModal4List('iframe', 'storyList');
 })
diff --git a/module/product/js/doc.js b/module/product/js/doc.js
new file mode 100644
index 0000000000..e9df54bd07
--- /dev/null
+++ b/module/product/js/doc.js
@@ -0,0 +1,28 @@
+/**
+ * Delete doc. 
+ * 
+ * @param  int    $docID 
+ * @access public
+ * @return void
+ */
+function deleteDoc(docID)
+{
+    if(confirm(confirmDelete))
+    {
+        url = createLink('doc', 'delete','docID=' + docID + '&confrim=yes');
+        $.ajax(
+        {
+            type:     'GET', 
+            url:      url,
+            dataType: 'json', 
+            success:  function(data) 
+            {
+                if(data.result == 'success') 
+                {
+                    url = createLink('product', 'doc', 'productID=' + productID);
+                    $('.outer').load(url + ' #doclist', function(){sortTable();});
+                }
+            }
+        });
+    }
+}
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index e3bc3b6292..d1101de867 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes') die(include './storylist.html.php'); ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/treeview.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
@@ -56,7 +55,175 @@ var browseType = '<?php echo $browseType;?>';
       </td>
       <td class='divider <?php echo $treeClass;?>'></td>
       <td>
-        <?php include "./storylist.html.php";?>
+        <table class='table-1 fixed colored tablesorter datatable' id='storyList'>
+          <thead>
+          <tr class='colhead'>
+            <?php $vars = "productID=$productID&browseType=$browseType&param=$moduleID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
+            <th class='w-id'>  <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
+            <th class='w-pri'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+            <th class='w-p30'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
+            <th>               <?php common::printOrderLink('plan',       $orderBy, $vars, $lang->story->planAB);?></th>
+            <th>               <?php common::printOrderLink('source',     $orderBy, $vars, $lang->story->source);?></th>
+            <th>               <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+            <th>               <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+            <th class='w-hour'><?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
+            <th>               <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
+            <th>               <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
+            <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
+          </tr>
+          </thead>
+          <tbody>
+          <?php foreach($stories as $key => $story):?>
+          <?php
+          $viewLink = $this->createLink('story', 'view', "storyID=$story->id");
+          $canView  = common::hasPriv('story', 'view');
+          ?>
+          <tr class='a-center'>
+            <td>
+              <input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' /> 
+              <?php if($canView) echo html::a($viewLink, sprintf('%03d', $story->id)); else printf('%03d', $story->id);?>
+            </td>
+            <td><span class='<?php echo 'pri' . $lang->story->priList[$story->pri];?>'><?php echo $lang->story->priList[$story->pri]?></span></td>
+            <td class='a-left' title="<?php echo $story->title?>"><nobr><?php echo html::a($viewLink, $story->title);?></nobr></td>
+            <td title="<?php echo $story->planTitle?>"><?php echo $story->planTitle;?></td>
+            <td><?php echo $lang->story->sourceList[$story->source];?></td>
+            <td><?php echo $users[$story->openedBy];?></td>
+            <td><?php echo $users[$story->assignedTo];?></td>
+            <td><?php echo $story->estimate;?></td>
+            <td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
+            <td><?php echo $lang->story->stageList[$story->stage];?></td>
+            <td class='a-right'>
+              <?php 
+              $vars = "story={$story->id}";
+              common::printIcon('story', 'change',     $vars, $story, 'list');
+              common::printIcon('story', 'review',     $vars, $story, 'list');
+              common::printIcon('story', 'close',      $vars, $story, 'list');
+              common::printIcon('story', 'edit',       $vars, $story, 'list');
+              common::printIcon('story', 'createCase', "productID=$story->product&module=0&from=&param=0&$vars", $story, 'list', 'createCase');
+              ?>
+            </td>
+          </tr>
+          <?php endforeach;?>
+          </tbody>
+          <tfoot>
+          <tr>
+            <td colspan='11' class='a-right'>
+              <div class='f-left'>
+              <?php
+              if(count($stories))
+              {
+                  echo "<div class='groupButton'>";
+                  echo html::selectAll() . html::selectReverse();
+                  echo "</div>";
+
+                  $canBatchEdit  = common::hasPriv('story', 'batchEdit');
+                  $disabled   = $canBatchEdit ? '' : "disabled='disabled'";
+                  $actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=0");
+
+                  echo "<div class='groupButton'>";
+                  echo html::commonButton($lang->edit, "onclick=\"changeAction('$actionLink')\" $disabled");
+                  echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
+                  echo "</div>";
+              }
+
+              echo $summary;
+              ?>
+              </div>
+              <?php $pager->show();?>
+            </td>
+          </tr>
+          </tfoot>
+        </table>
+
+        <div id='moreActionMenu' class='listMenu hidden'>
+          <ul>
+          <?php 
+          $class = "class='disabled'";
+
+          $canBatchClose = common::hasPriv('story', 'batchClose') and strtolower($browseType) != 'closedbyme' and strtolower($browseType) != 'closedstory';
+          $actionLink    = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0");
+          $misc = $canBatchClose ? "onclick=changeAction('$actionLink')" : $class;
+          echo "<li>" . html::a('#', $lang->close, '', $misc) . "</li>";
+
+          $misc = common::hasPriv('story', 'batchReview') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='reviewItem'" : $class;
+          echo "<li>" . html::a('#', $lang->story->review,  '', $misc) . "</li>";
+
+          $misc = common::hasPriv('story', 'batchChangePlan') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='planItem'" : $class;
+          echo "<li>" . html::a('#', $lang->story->planAB,  '', $misc) . "</li>";
+
+          $misc = common::hasPriv('story', 'batchChangeStage') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='stageItem'" : $class;
+          echo "<li>" . html::a('#', $lang->story->stageAB, '', $misc) . "</li>";
+          ?>
+          </ul>
+        </div>
+
+        <div id='reviewItemMenu' class='hidden listMenu'>
+          <ul>
+          <?php
+          unset($lang->story->reviewResultList['']);
+          unset($lang->story->reviewResultList['revert']);
+          foreach($lang->story->reviewResultList as $key => $result)
+          {
+              $actionLink = $this->createLink('story', 'batchReview', "result=$key");
+              echo "<li>";
+              if($key == 'reject')
+              {
+                  echo html::a('#', $result, '', "onmouseover='toggleSubMenu(this.id, \"right\", 2)' id='rejectItem'");
+              }
+              else
+              {
+                  echo html::a('#', $result, '', "onclick=\"changeAction('$actionLink',true)\"");
+              }
+              echo "</li>";
+          }
+          ?>
+          </ul>
+        </div>
+
+        <div id='rejectItemMenu' class='hidden listMenu'>
+          <ul>
+          <?php
+          unset($lang->story->reasonList['']);
+          unset($lang->story->reasonList['subdivided']);
+          unset($lang->story->reasonList['duplicate']);
+
+          foreach($lang->story->reasonList as $key => $reason)
+          {
+              $actionLink = $this->createLink('story', 'batchReview', "result=reject&reason=$key");
+              echo "<li>";
+              echo html::a('#', $reason, '', "onclick=\"changeAction('$actionLink',true)\"");
+              echo "</li>";
+          }
+          ?>
+          </ul>
+        </div>
+
+        <div id='planItemMenu' class='hidden listMenu'>
+          <ul>
+          <?php
+          unset($plans['']);
+          $plans = array(0 => $lang->null) + $plans;
+          foreach($plans as $planID => $plan)
+          {
+              $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID");
+              echo "<li>" . html::a('#', $plan, '', "onclick=\"changeAction('$actionLink',true)\"") . "</li>";
+          }
+          ?>
+          </ul>
+        </div>
+
+        <div id='stageItemMenu' class='hidden listMenu'>
+          <ul>
+          <?php
+          $lang->story->stageList[''] = $lang->null;
+          foreach($lang->story->stageList as $key => $stage)
+          {
+              $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
+              echo "<li>" . html::a('#', $stage, '', "onclick=\"changeAction('$actionLink',true)\"") . "</li>";
+          }
+          ?>
+          </ul>
+        </div>
       </td>              
     </tr>
   </table>
diff --git a/module/product/view/doc.html.php b/module/product/view/doc.html.php
index b197c81106..6a59a7d046 100644
--- a/module/product/view/doc.html.php
+++ b/module/product/view/doc.html.php
@@ -13,9 +13,11 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
+<?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
+<?php js::set('productID', $product->id)?>
 <div class='yui-d0'>
 
-  <table class='table-1 fixed colored tablesorter' align='center'>
+  <table class='table-1 fixed colored tablesorter' align='center' id='doclist'>
     <caption class='caption-tr'><?php common::printIcon('doc', 'create', "libID=product&moduleID=0&productID={$product->id}&projectID=0&from=product");?></caption>
     <thead>
       <tr class='colhead'>
@@ -41,9 +43,8 @@
         <td><?php echo $doc->addedDate;?></td>
         <td>
           <?php 
-          $vars = "doc={$doc->id}";
-          common::printIcon('doc', 'edit',   $vars);
-          common::printIcon('doc', 'delete', $vars, '', 'button', '', 'hiddenwin');
+          common::printIcon('doc', 'edit',   "doc={$doc->id}");
+          echo html::a("javascript:deleteDoc($doc->id)", '&nbsp;', '', "class='icon-green-common-delete' title='{$lang->doc->delete}'");
           ?>
         </td>
       </tr>
diff --git a/module/product/view/storylist.html.php b/module/product/view/storylist.html.php
deleted file mode 100644
index 7c51aa6a0c..0000000000
--- a/module/product/view/storylist.html.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<table class='table-1 fixed colored tablesorter datatable' id='storyList'>
-  <thead>
-  <tr class='colhead'>
-    <?php $vars = "productID=$productID&browseType=$browseType&param=$moduleID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
-    <th class='w-id'>  <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
-    <th class='w-pri'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
-    <th class='w-p30'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
-    <th>               <?php common::printOrderLink('plan',       $orderBy, $vars, $lang->story->planAB);?></th>
-    <th>               <?php common::printOrderLink('source',     $orderBy, $vars, $lang->story->source);?></th>
-    <th>               <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-    <th>               <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-    <th class='w-hour'><?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
-    <th>               <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
-    <th>               <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
-    <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
-  </tr>
-  </thead>
-  <tbody>
-  <?php foreach($stories as $key => $story):?>
-  <?php
-  $viewLink = $this->createLink('story', 'view', "storyID=$story->id");
-  $canView  = common::hasPriv('story', 'view');
-  ?>
-  <tr class='a-center'>
-    <td>
-      <input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' /> 
-      <?php if($canView) echo html::a($viewLink, sprintf('%03d', $story->id)); else printf('%03d', $story->id);?>
-    </td>
-    <td><span class='<?php echo 'pri' . $lang->story->priList[$story->pri];?>'><?php echo $lang->story->priList[$story->pri]?></span></td>
-    <td class='a-left' title="<?php echo $story->title?>"><nobr><?php echo html::a($viewLink, $story->title);?></nobr></td>
-    <td title="<?php echo $story->planTitle?>"><?php echo $story->planTitle;?></td>
-    <td><?php echo $lang->story->sourceList[$story->source];?></td>
-    <td><?php echo $users[$story->openedBy];?></td>
-    <td><?php echo $users[$story->assignedTo];?></td>
-    <td><?php echo $story->estimate;?></td>
-    <td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
-    <td><?php echo $lang->story->stageList[$story->stage];?></td>
-    <td class='a-right'>
-      <?php 
-      $vars = "story={$story->id}";
-      common::printIcon('story', 'change',     $vars, $story, 'list');
-      common::printIcon('story', 'review',     $vars, $story, 'list');
-      common::printIcon('story', 'close',      $vars, $story, 'list');
-      common::printIcon('story', 'edit',       $vars, $story, 'list');
-      common::printIcon('story', 'createCase', "productID=$story->product&module=0&from=&param=0&$vars", $story, 'list', 'createCase');
-      ?>
-    </td>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <tfoot>
-  <tr>
-    <td colspan='11' class='a-right'>
-      <div class='f-left'>
-      <?php
-      if(count($stories))
-      {
-          echo "<div class='groupButton'>";
-          echo html::selectAll() . html::selectReverse();
-          echo "</div>";
-
-          $canBatchEdit  = common::hasPriv('story', 'batchEdit');
-          $disabled   = $canBatchEdit ? '' : "disabled='disabled'";
-          $actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=0");
-
-          echo "<div class='groupButton'>";
-          echo html::commonButton($lang->edit, "onclick=\"changeAction('$actionLink')\" $disabled");
-          echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
-          echo "</div>";
-      }
-
-      echo $summary;
-      ?>
-      </div>
-      <?php $pager->show();?>
-    </td>
-  </tr>
-  </tfoot>
-</table>
-
-<div id='moreActionMenu' class='listMenu hidden'>
-  <ul>
-  <?php 
-  $class = "class='disabled'";
-
-  $canBatchClose = common::hasPriv('story', 'batchClose') and strtolower($browseType) != 'closedbyme' and strtolower($browseType) != 'closedstory';
-  $actionLink    = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0");
-  $misc = $canBatchClose ? "onclick=changeAction('$actionLink')" : $class;
-  echo "<li>" . html::a('#', $lang->close, '', $misc) . "</li>";
-
-  $misc = common::hasPriv('story', 'batchReview') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='reviewItem'" : $class;
-  echo "<li>" . html::a('#', $lang->story->review,  '', $misc) . "</li>";
-
-  $misc = common::hasPriv('story', 'batchChangePlan') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='planItem'" : $class;
-  echo "<li>" . html::a('#', $lang->story->planAB,  '', $misc) . "</li>";
-
-  $misc = common::hasPriv('story', 'batchChangeStage') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='stageItem'" : $class;
-  echo "<li>" . html::a('#', $lang->story->stageAB, '', $misc) . "</li>";
-  ?>
-  </ul>
-</div>
-
-<div id='reviewItemMenu' class='hidden listMenu'>
-  <ul>
-  <?php
-  unset($lang->story->reviewResultList['']);
-  unset($lang->story->reviewResultList['revert']);
-  foreach($lang->story->reviewResultList as $key => $result)
-  {
-      $actionLink = $this->createLink('story', 'batchReview', "result=$key");
-      echo "<li>";
-      if($key == 'reject')
-      {
-          echo html::a('#', $result, '', "onmouseover='toggleSubMenu(this.id, \"right\", 2)' id='rejectItem'");
-      }
-      else
-      {
-          echo html::a('#', $result, '', "onclick=\"changeAction('$actionLink',true)\"");
-      }
-      echo "</li>";
-  }
-  ?>
-  </ul>
-</div>
-
-<div id='rejectItemMenu' class='hidden listMenu'>
-  <ul>
-  <?php
-  unset($lang->story->reasonList['']);
-  unset($lang->story->reasonList['subdivided']);
-  unset($lang->story->reasonList['duplicate']);
-
-  foreach($lang->story->reasonList as $key => $reason)
-  {
-      $actionLink = $this->createLink('story', 'batchReview', "result=reject&reason=$key");
-      echo "<li>";
-      echo html::a('#', $reason, '', "onclick=\"changeAction('$actionLink',true)\"");
-      echo "</li>";
-  }
-  ?>
-  </ul>
-</div>
-
-<div id='planItemMenu' class='hidden listMenu'>
-  <ul>
-  <?php
-  unset($plans['']);
-  $plans = array(0 => $lang->null) + $plans;
-  foreach($plans as $planID => $plan)
-  {
-      $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID");
-      echo "<li>" . html::a('#', $plan, '', "onclick=\"changeAction('$actionLink',true)\"") . "</li>";
-  }
-  ?>
-  </ul>
-</div>
-
-<div id='stageItemMenu' class='hidden listMenu'>
-  <ul>
-  <?php
-  $lang->story->stageList[''] = $lang->null;
-  foreach($lang->story->stageList as $key => $stage)
-  {
-      $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
-      echo "<li>" . html::a('#', $stage, '', "onclick=\"changeAction('$actionLink',true)\"") . "</li>";
-  }
-  ?>
-  </ul>
-</div>
diff --git a/module/productplan/control.php b/module/productplan/control.php
index ed356dbc7b..b1750059d5 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -94,9 +94,17 @@ class productplan extends control
         }
         else
         {
+            $response['result']  = 'success';
+            $response['message'] = '';
+
             $plan = $this->productplan->getById($planID);
             $this->productplan->delete(TABLE_PRODUCTPLAN, $planID);
-            die(js::locate(inlink('browse', "productID=$plan->product"), 'parent'));
+            if(dao::isError())
+            {
+                $response['result']  = 'fail';
+                $response['message'] = dao::getError();
+            }
+            $this->send($response);
         }
     }
 
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
new file mode 100644
index 0000000000..7f00434452
--- /dev/null
+++ b/module/productplan/js/browse.js
@@ -0,0 +1,21 @@
+function deletePlan(planID)
+{
+    if(confirm(confirmDelete))
+    {
+        url = createLink('productplan', 'delete','planID=' + planID + '&confrim=yes');
+        $.ajax(
+        {
+            type:     'GET', 
+            url:      url,
+            dataType: 'json', 
+            success:  function(data) 
+            {
+                if(data.result == 'success') 
+                {
+                    url = createLink('productplan', 'browse', 'productID=' + productID);
+                    $('.outer').load(url + ' #productplan');
+                }
+            }
+        });
+    }
+}
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index bf0858418c..b7a1066347 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -11,6 +11,8 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php js::set('confirmDelete', $lang->productplan->confirmDelete)?>
+<?php js::set('productID', $productID)?>
 <table class='table-1 tablesorter fixed' id="productplan">
   <caption class='caption-tr'>
     <div class='f-left'><?php echo $lang->productplan->browse;?></div>
@@ -40,7 +42,7 @@
       common::printIcon('productplan', 'linkStory', "planID=$plan->id", '', 'list');
       common::printIcon('productplan', 'linkBug', "planID=$plan->id", '', 'list');
       common::printIcon('productplan', 'edit', "planID=$plan->id", '', 'list');
-      common::printIcon('productplan', 'delete', "planID=$plan->id", '', 'list', '', 'hiddenwin');
+      echo html::a("javascript:deletePlan($plan->id)", '&nbsp;', '', "class='icon-green-common-delete' title='{$lang->productplan->delete}'");
       ?>
     </td>
   </tr>
diff --git a/module/project/control.php b/module/project/control.php
index 92ccbfeb0a..5973c5bb3f 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1349,8 +1349,16 @@ class project extends control
         }
         else
         {
+            $response['result']  = 'success';
+            $response['message'] = '';
+
             $this->project->unlinkMember($projectID, $account);
-            die(js::locate($this->inlink('team', "projectID=$projectID"), 'parent'));
+            if(dao::isError())
+            {
+                $response['result']  = 'fail';
+                $response['message'] = dao::getError();
+            }
+            $this->send($response);
         }
     }
 
@@ -1441,9 +1449,16 @@ class project extends control
         }
         else
         {
+            $response['result']  = 'success';
+            $response['message'] = '';
+
             $this->project->unlinkStory($projectID, $storyID);
-            echo js::locate($this->app->session->storyList, 'parent');
-            exit;
+            if(dao::isError())
+            {
+                $response['result']  = 'fail';
+                $response['message'] = dao::getError();
+            }
+            $this->send($response);
         }
     }
 
diff --git a/module/project/js/bug.js b/module/project/js/bug.js
index e46b1e5912..e69de29bb2 100644
--- a/module/project/js/bug.js
+++ b/module/project/js/bug.js
@@ -1,26 +0,0 @@
-function setModal4List(colorboxClass, replaceID)
-{
-    replaceID = 'bugList';
-    $('.' + colorboxClass).colorbox(
-    {
-        width:900,
-        height:500,
-        iframe:true,
-        transition:'none',
-
-        onCleanup:function()
-        {
-            saveWindowSize();
-
-            var link = self.location.href;
-            $.get(link, {ajax: "yes"}, function(data)
-            {
-                $('#' + replaceID).replaceWith(data)
-                setModal4List(colorboxClass, replaceID)
-
-                $('.colored').colorize();
-                $('tfoot td').css('background', 'white').unbind('click').unbind('hover');
-            });
-        }
-    });
-}
diff --git a/module/project/js/build.js b/module/project/js/build.js
new file mode 100644
index 0000000000..3eb813f637
--- /dev/null
+++ b/module/project/js/build.js
@@ -0,0 +1,28 @@
+/**
+ * Delete build. 
+ * 
+ * @param  int    buildID 
+ * @access public
+ * @return void
+ */
+function deleteBuild(buildID)
+{
+    if(confirm(confirmDelete))
+    {
+        url = createLink('build', 'delete','buildID=' + buildID + '&confrim=yes');
+        $.ajax(
+        {
+            type:     'GET', 
+            url:      url,
+            dataType: 'json', 
+            success:  function(data) 
+            {
+                if(data.result == 'success') 
+                {
+                    url = createLink('project', 'build', 'projectID=' + projectID);
+                    $('.outer').load(url + ' #buildlist', function(){sortTable();});
+                }
+            }
+        });
+    }
+}
diff --git a/module/project/js/common.js b/module/project/js/common.js
index e0bcf39255..53723c0cfc 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -113,7 +113,7 @@ function computeEndDate(delta)
 $(function() 
 {
     $(".chosenBox select").chosen({no_results_text: noResultsMatch});
-    setModal4List('iframe', 'taskList');
+    if(typeof(replaceID) != 'undefined') setModal4List('iframe', replaceID);
     $(".date").bind('dateSelected', function()
     {
         computeWorkDays(this.id);
diff --git a/module/project/js/doc.js b/module/project/js/doc.js
new file mode 100644
index 0000000000..ff602015bb
--- /dev/null
+++ b/module/project/js/doc.js
@@ -0,0 +1,28 @@
+/**
+ * Delete doc. 
+ * 
+ * @param  int    $docID 
+ * @access public
+ * @return void
+ */
+function deleteDoc(docID)
+{
+    if(confirm(confirmDelete))
+    {
+        url = createLink('doc', 'delete','docID=' + docID + '&confrim=yes');
+        $.ajax(
+        {
+            type:     'GET', 
+            url:      url,
+            dataType: 'json', 
+            success:  function(data) 
+            {
+                if(data.result == 'success') 
+                {
+                    url = createLink('project', 'doc', 'projectID=' + projectID);
+                    $('.outer').load(url + ' #doclist', function(){sortTable();});
+                }
+            }
+        });
+    }
+}
diff --git a/module/project/js/story.js b/module/project/js/story.js
index 3eee9acf9b..dae22c74ba 100644
--- a/module/project/js/story.js
+++ b/module/project/js/story.js
@@ -16,3 +16,33 @@ function changeAction(formName, actionName, actionLink)
 {
     $('#' + formName).attr('action', actionLink).submit();
 }
+
+/**
+ * unlink story.
+ * 
+ * @param  int    $projectID 
+ * @param  int    $storyID 
+ * @access public
+ * @return void
+ */
+function unlink(projectID, storyID)
+{
+    if(confirm(confirmUnlinkStory))
+    {
+        url = createLink('project', 'unlinkStory','projectID=' + projectID + '&storyID=' + storyID + '&confrim=yes');
+        $.ajax(
+        {
+            type:     'GET', 
+            url:      url,
+            dataType: 'json', 
+            success:  function(data) 
+            {
+                if(data.result == 'success') 
+                {
+                    url = createLink('project', 'story', 'projectID=' + projectID);
+                    $('#projectStoryForm').load(url + ' #storyList', function(){sortTable();});
+                }
+            }
+        });
+    }
+}
diff --git a/module/project/js/team.js b/module/project/js/team.js
new file mode 100644
index 0000000000..a9bb828a7a
--- /dev/null
+++ b/module/project/js/team.js
@@ -0,0 +1,29 @@
+/**
+ * unlink member.
+ * 
+ * @param  int    projectID 
+ * @param  string account 
+ * @access public
+ * @return void
+ */
+function unlinkMember(projectID, account)
+{
+    if(confirm(confirmUnlinkMember))
+    {
+        url = createLink('project', 'unlinkMember','projectID=' + projectID + '&account=' + account + '&confrim=yes');
+        $.ajax(
+        {
+            type:     'GET', 
+            url:      url,
+            dataType: 'json', 
+            success:  function(data) 
+            {
+                if(data.result == 'success')
+                {
+                    url = createLink('project', 'team', 'projectID=' + projectID);
+                    $('.outer').load(url + ' #memberlist', function(){sortTable();});
+                }
+            }
+        });
+    }
+}
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 67255201d6..281224620f 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -193,6 +193,7 @@ $lang->project->setTeam               = 'Set team';
 $lang->project->linkStory             = 'Link story';
 $lang->project->createTask            = 'Create task';
 $lang->project->goback                = 'Go back（Automatically after 5 seconds）';
+$lang->project->linkProduct           = 'Select product to link...';
 
 /* Report. */
 $lang->project->charts = new stdclass();
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 49ccbcf0a8..5682955c6c 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -193,6 +193,7 @@ $lang->project->setTeam               = '设置团队';
 $lang->project->linkStory             = '关联需求';
 $lang->project->createTask            = '添加任务';
 $lang->project->goback                = '返回项目首页（5秒后将自动跳转）';
+$lang->project->linkProduct           = '选择产品关联...';
 
 /* 统计。*/
 $lang->project->charts = new stdclass();
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 55a98d5b53..e1af1bab9d 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -10,8 +10,58 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes') die(include './buglist.html.php')?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
-<?php include './buglist.html.php'?>
+<table class='table-1 fixed colored tablesorter' id='bugList'>
+  <caption class='caption-tl pb-10px'>
+    <div class='f-left'>
+      <?php 
+      echo $lang->project->bug;
+      if($build) echo '<span class="red">(Build:' . $build->name . ')</span>';
+      ?>
+    </div>
+    <div class='f-right'><?php common::printIcon('bug', 'create', "productID=$productID&extra=projectID=$project->id");?></div>
+  </caption>
+  <thead>
+  <tr class='colhead'>
+    <?php $vars = "projectID={$project->id}&orderBy=%s&build=$buildID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+    <th class='w-id'>      <?php common::printOrderLink('id',           $orderBy, $vars, $lang->idAB);?></th>
+    <th class='w-severity'><?php common::printOrderLink('severity',     $orderBy, $vars, $lang->bug->severityAB);?></th>
+    <th class='w-pri'>     <?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
+    <th>                   <?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
+    <th class='w-user'>    <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
+    <th class='w-user'>    <?php common::printOrderLink('assignedTo',   $orderBy, $vars, $lang->assignedToAB);?></th>
+    <th class='w-user'>    <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
+    <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
+    <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
+  </tr>
+  </thead>
+  <tbody>
+  <?php foreach($bugs as $bug):?>
+  <tr class='a-center'>
+    <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
+    <td><span class='<?php echo 'severity' . $lang->bug->severityList[$bug->severity]?>'><?php echo $lang->bug->severityList[$bug->severity]?></span></td>
+    <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri]?>'><?php echo $lang->bug->priList[$bug->pri]?></span></td>
+    <td class='a-left' title="<?php echo $bug->title?>"><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+    <td><?php echo $users[$bug->openedBy];?></td>
+    <td><?php echo $users[$bug->assignedTo];?></td>
+    <td><?php echo $users[$bug->resolvedBy];?></td>
+    <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
+    <td class='a-right'>
+      <?php
+      $params = "bugID=$bug->id";
+      common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
+      common::printIcon('bug', 'assignTo',   $params, '',   'list', '', '', 'iframe', true);
+      common::printIcon('bug', 'resolve',    $params, $bug, 'list', '', '', 'iframe', true);
+      common::printIcon('bug', 'close',      $params, $bug, 'list', '', '', 'iframe', true);
+      common::printIcon('bug', 'edit',       $params, $bug, 'list');
+      common::printIcon('bug', 'create',     "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy');
+      ?>
+    </td>
+  </tr>
+  <?php endforeach;?>
+  </tbody>
+  <tfoot><tr><td colspan='9'><?php $pager->show();?></td></tr></table>
+</table>
+<?php js::set('replaceID', 'bugList')?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/buglist.html.php b/module/project/view/buglist.html.php
deleted file mode 100644
index fe00c40c51..0000000000
--- a/module/project/view/buglist.html.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<table class='table-1 fixed colored tablesorter' id='bugList'>
-  <caption class='caption-tl pb-10px'>
-    <div class='f-left'>
-      <?php 
-      echo $lang->project->bug;
-      if($build) echo '<span class="red">(Build:' . $build->name . ')</span>';
-      ?>
-    </div>
-    <div class='f-right'><?php common::printIcon('bug', 'create', "productID=$productID&extra=projectID=$project->id");?></div>
-  </caption>
-  <thead>
-  <tr class='colhead'>
-    <?php $vars = "projectID={$project->id}&orderBy=%s&build=$buildID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-    <th class='w-id'>      <?php common::printOrderLink('id',           $orderBy, $vars, $lang->idAB);?></th>
-    <th class='w-severity'><?php common::printOrderLink('severity',     $orderBy, $vars, $lang->bug->severityAB);?></th>
-    <th class='w-pri'>     <?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
-    <th>                   <?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
-    <th class='w-user'>    <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
-    <th class='w-user'>    <?php common::printOrderLink('assignedTo',   $orderBy, $vars, $lang->assignedToAB);?></th>
-    <th class='w-user'>    <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
-    <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
-    <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
-  </tr>
-  </thead>
-  <tbody>
-  <?php foreach($bugs as $bug):?>
-  <tr class='a-center'>
-    <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
-    <td><span class='<?php echo 'severity' . $lang->bug->severityList[$bug->severity]?>'><?php echo $lang->bug->severityList[$bug->severity]?></span></td>
-    <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri]?>'><?php echo $lang->bug->priList[$bug->pri]?></span></td>
-    <td class='a-left' title="<?php echo $bug->title?>"><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
-    <td><?php echo $users[$bug->openedBy];?></td>
-    <td><?php echo $users[$bug->assignedTo];?></td>
-    <td><?php echo $users[$bug->resolvedBy];?></td>
-    <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
-    <td class='a-right'>
-      <?php
-      $params = "bugID=$bug->id";
-      common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'assignTo',   $params, '',   'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'resolve',    $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'close',      $params, $bug, 'list', '', '', 'iframe', true);
-      common::printIcon('bug', 'edit',       $params, $bug, 'list');
-      common::printIcon('bug', 'create',     "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy');
-      ?>
-    </td>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <tfoot><tr><td colspan='9'><?php $pager->show();?></td></tr></table>
-</table>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index d59b83fe10..bc066c1293 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -12,7 +12,9 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<table class='table-1 tablesorter fixed'>
+<?php js::set('confirmDelete', $lang->build->confirmDelete)?>
+<?php js::set('projectID', $projectID)?>
+<table class='table-1 tablesorter fixed' id='buildlist'>
   <caption class='caption-tl pb-10px'>
     <div class='f-left'><?php echo $lang->project->build;?></div>
     <div class='f-right'><?php common::printIcon('build', 'create', "project=$project->id");?></div>
@@ -45,7 +47,7 @@
       $lang->project->bug = $lang->project->viewBug;
       common::printIcon('project', 'bug',  "project=$project->id&orderBy=status&build=$build->id", '', 'list');
       common::printIcon('build', 'edit',   "buildID=$build->id");
-      common::printIcon('build', 'delete', "buildID=$build->id", '', 'list', '', 'hiddenwin');
+      echo html::a("javascript:deleteBuild($build->id)", '&nbsp;', '', "class='icon-green-common-delete' title='{$lang->build->delete}'");
       ?>
     </td>
   </tr>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 9c7c3804a8..8da31c40a2 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -78,7 +78,7 @@ $(document).ready(function()
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
-      <td class='a-left chosenBox' id='productsBox'><?php echo html::select("products[]", $allProducts, $products, "class='select-1' multiple");?></td>
+      <td class='a-left chosenBox' id='productsBox'><?php echo html::select("products[]", $allProducts, $products, "class='select-1' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->project->goal;?></th>
diff --git a/module/project/view/doc.html.php b/module/project/view/doc.html.php
index 742396fb68..a71ffadb29 100644
--- a/module/project/view/doc.html.php
+++ b/module/project/view/doc.html.php
@@ -13,7 +13,9 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
-<table class='table-1 fixed colored tablesorter' align='center'>
+<?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
+<?php js::set('projectID', $project->id)?>
+<table class='table-1 fixed colored tablesorter' align='center' id='doclist'>
   <caption class='caption-tl pb-10px'>
     <div class='f-left'> <?php echo $lang->project->doc;?></div>
     <div class='f-right'><?php common::printIcon('doc', 'create', "libID=project&moduleID=0&productID=0&projectID=$project->id&from=project");?></div>
@@ -42,9 +44,8 @@
       <td><?php echo $doc->addedDate;?></td>
       <td>
         <?php 
-        $vars = "doc={$doc->id}";
-        common::printIcon('doc', 'edit',   $vars);
-        common::printIcon('doc', 'delete', $vars, '', 'list', '','hiddenwin');
+        common::printIcon('doc', 'edit',   "doc=$doc->id");
+        echo html::a("javascript:deleteDoc($doc->id)", '&nbsp;', '', "class='icon-green-common-delete' title='{$lang->doc->delete}'");
         ?>
       </td>
     </tr>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 8868b52d60..ff56d06463 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -67,7 +67,7 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
-      <td class='a-left chosenBox' id='productsBox'><?php echo html::select("products[]", $allProducts, $linkedProducts, "class='select-1' multiple");?></td>
+      <td class='a-left chosenBox' id='productsBox'><?php echo html::select("products[]", $allProducts, $linkedProducts, "class='select-1' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->project->goal;?></th>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index dc2707f599..d251cd3d4f 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -12,8 +12,9 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
+<?php js::set('confirmUnlinkStory', $lang->project->confirmUnlinkStory)?>
 <form method='post' id='projectStoryForm'>
-  <table class='table-1 fixed colored tablesorter datatable'>
+  <table class='table-1 fixed colored tablesorter datatable' id='storyList'>
     <caption class='caption-tl pb-10px'>
       <div class='f-left'><?php echo $lang->project->story;?></div>
       <div class='f-right'>
@@ -53,7 +54,7 @@
       $storyLink      = $this->createLink('story', 'view', "storyID=$story->id");
       $totalEstimate += $story->estimate;
       ?>
-      <tr class='a-center'>
+      <tr class='a-center' id="story<?php echo $story->id?>">
         <td>
           <?php if($canBatchEdit or $canBatchClose):?>
           <input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' /> 
@@ -87,7 +88,7 @@
           if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list');
 
           $lang->project->unlinkStory = $lang->unlink;
-          common::printIcon('project', 'unlinkStory', $param, '', 'list', '', 'hiddenwin');
+          echo html::a("javascript:unlink($project->id,$story->id)", '&nbsp;', '', "class='icon-green-project-unlinkStory' title='$lang->unlink'");
           ?>
         </td>
       </tr>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index f086a1daf9..c84ce5dcf1 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes') die(include "./tasklist.html.php")?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
@@ -40,11 +39,141 @@ var browseType  = '<?php echo $browseType;?>';
     </td>
     <td class='divider'></td>
     <td>
-      <?php include "./tasklist.html.php"?>
+      <table class='table-1 fixed colored tablesorter datatable' id='taskList'>
+        <?php $vars = "projectID=$project->id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
+        <thead>
+        <tr class='colhead'>
+          <th class='w-id'>    <?php common::printOrderLink('id',           $orderBy, $vars, $lang->idAB);?></th>
+          <th class='w-pri'>   <?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
+          <th class='w-p30'>   <?php common::printOrderLink('name',         $orderBy, $vars, $lang->task->name);?></th>
+          <th class='w-status'><?php common::printOrderLink('status',       $orderBy, $vars, $lang->statusAB);?></th>
+          <th class='w-70px'>  <?php common::printOrderLink('deadline',     $orderBy, $vars, $lang->task->deadlineAB);?></th>
+
+          <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
+          <th class='w-id'>    <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->task->openedDateAB);?></th>
+          <?php endif;?>
+
+          <th class='w-user'>  <?php common::printOrderLink('assignedTo',   $orderBy, $vars, $lang->task->assignedToAB);?></th>
+          <th class='w-user'>  <?php common::printOrderLink('finishedBy',   $orderBy, $vars, $lang->task->finishedByAB);?></th>
+
+          <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
+          <th class='w-40px'>  <?php common::printOrderLink('finishedDate', $orderBy, $vars, $lang->task->finishedDateAB);?></th>
+          <?php endif;?>
+
+          <th class='w-35px'>  <?php common::printOrderLink('estimate',     $orderBy, $vars, $lang->task->estimateAB);?></th>
+          <th class='w-40px'>  <?php common::printOrderLink('consumed',     $orderBy, $vars, $lang->task->consumedAB);?></th>
+          <th class='w-40px'>  <?php common::printOrderLink('left',         $orderBy, $vars, $lang->task->leftAB);?></th>
+          <?php if($project->type == 'sprint') print '<th>' and common::printOrderLink('story', $orderBy, $vars, $lang->task->story) and print '</th>';?>
+          <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php 
+        $canBatchEdit  = common::hasPriv('task', 'batchEdit');
+        $canBatchClose = common::hasPriv('task', 'batchClose') and strtolower($browseType) != 'closedBy';
+        ?>
+        <?php foreach($tasks as $task):?>
+        <?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : ''; ?>
+        <tr class='a-center'>
+          <td>
+            <?php if($canBatchEdit or $canBatchClose):?>
+            <input type='checkbox' name='taskIDList[]'  value='<?php echo $task->id;?>'/> 
+            <?php endif;?>
+            <?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
+          </td>
+          <td><span class='<?php echo 'pri'. $lang->task->priList[$task->pri]?>'><?php echo $lang->task->priList[$task->pri];?></span></td>
+          <td class='a-left' title="<?php echo $task->name?>">
+            <?php 
+            if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;
+            if($task->fromBug) echo html::a($this->createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'");
+            ?>
+          </td>
+          <td class=<?php echo $task->status;?> >
+            <?php
+            $storyChanged = ($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion);
+            $storyChanged ? print("<span class='warning'>{$lang->story->changed}</span> ") : print($lang->task->statusList[$task->status]);
+            ?>
+          </td>
+          <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
+
+          <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
+          <td><?php echo substr($task->openedDate, 5, 6);?></th>
+          <?php endif;?>
+
+          <td <?php echo $class;?>><?php echo $task->assignedTo == 'closed' ? 'Closed' : $task->assignedToRealName;?></td>
+          <td><?php echo $users[$task->finishedBy];?></td>
+
+          <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
+          <td><?php echo substr($task->finishedDate, 5, 6);?></th>
+          <?php endif;?>
+
+          <td><?php echo $task->estimate;?></td>
+          <td><?php echo $task->consumed;?></td>
+          <td><?php echo $task->left;?></td>
+          <?php
+          if($project->type == 'sprint')
+          {
+              echo '<td class="a-left" title="' . $task->storyTitle . '"';
+              if($task->storyID)
+              {
+                if(!common::printLink('story', 'view', "storyid=$task->storyID", $task->storyTitle)) print $task->storyTitle;
+              }
+              echo '</td>';
+          }
+          ?>
+          <td class='a-right'>
+            <?php
+            common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+            common::printIcon('task', 'start',    "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+
+            common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+            if($browseType == 'needconfirm')
+            {
+                $lang->task->confirmStoryChange = $lang->confirm;
+                common::printIcon('task', 'confirmStoryChange', "taskid=$task->id", '', 'list', '', 'hiddenwin');
+            }
+            common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+            common::printIcon('task', 'close',    "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+            common::printIcon('task', 'edit',"taskID=$task->id", '', 'list');
+            ?>
+          </td>
+        </tr>
+        <?php endforeach;?>
+        </tbody>
+        <tfoot>
+          <tr>
+            <?php $columns = ($this->cookie->windowWidth > $this->config->wideSize ? 14 : 12) - ($project->type == 'sprint' ? 0 : 1);?>
+            <td colspan='<?php echo $columns;?>'>
+              <div class='f-left'>
+              <?php 
+              if(count($tasks))
+              {
+                  if($canBatchEdit or $canBatchClose) echo html::selectAll() . html::selectReverse();
+
+                  if($canBatchEdit)
+                  {
+                      $actionLink = $this->createLink('task', 'batchEdit', "projectID=$projectID");
+                      echo html::commonButton($lang->edit, "onclick=\"changeAction('projectTaskForm', 'batchEdit', '$actionLink')\"");
+                  }
+                  if($canBatchClose)
+                  {
+                      $actionLink = $this->createLink('task', 'batchClose');
+                      echo html::commonButton($lang->close, "onclick=\"changeAction('projectTaskForm', 'batchClose', '$actionLink')\"");
+                  }
+              }
+              echo $summary;
+              ?>
+              </div>
+              <?php $pager->show();?>
+            </td>
+          </tr>
+        </tfoot>
+      </table>
     </td>
   </tr>
 </table>
 </form>
+<?php js::set('replaceID', 'taskList')?>
 <script language='javascript'>
 $('#project<?php echo $projectID;?>').addClass('active')
 $('#<?php echo $browseType;?>Tab').addClass('active')
diff --git a/module/project/view/tasklist.html.php b/module/project/view/tasklist.html.php
deleted file mode 100644
index a7deaa192b..0000000000
--- a/module/project/view/tasklist.html.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<table class='table-1 fixed colored tablesorter datatable' id='taskList'>
-  <?php $vars = "projectID=$project->id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
-  <thead>
-  <tr class='colhead'>
-    <th class='w-id'>    <?php common::printOrderLink('id',           $orderBy, $vars, $lang->idAB);?></th>
-    <th class='w-pri'>   <?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
-    <th class='w-p30'>   <?php common::printOrderLink('name',         $orderBy, $vars, $lang->task->name);?></th>
-    <th class='w-status'><?php common::printOrderLink('status',       $orderBy, $vars, $lang->statusAB);?></th>
-    <th class='w-70px'>  <?php common::printOrderLink('deadline',     $orderBy, $vars, $lang->task->deadlineAB);?></th>
-
-    <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
-    <th class='w-id'>    <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->task->openedDateAB);?></th>
-    <?php endif;?>
-
-    <th class='w-user'>  <?php common::printOrderLink('assignedTo',   $orderBy, $vars, $lang->task->assignedToAB);?></th>
-    <th class='w-user'>  <?php common::printOrderLink('finishedBy',   $orderBy, $vars, $lang->task->finishedByAB);?></th>
-
-    <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
-    <th class='w-40px'>  <?php common::printOrderLink('finishedDate', $orderBy, $vars, $lang->task->finishedDateAB);?></th>
-    <?php endif;?>
-
-    <th class='w-35px'>  <?php common::printOrderLink('estimate',     $orderBy, $vars, $lang->task->estimateAB);?></th>
-    <th class='w-40px'>  <?php common::printOrderLink('consumed',     $orderBy, $vars, $lang->task->consumedAB);?></th>
-    <th class='w-40px'>  <?php common::printOrderLink('left',         $orderBy, $vars, $lang->task->leftAB);?></th>
-    <?php if($project->type == 'sprint') print '<th>' and common::printOrderLink('story', $orderBy, $vars, $lang->task->story) and print '</th>';?>
-    <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
-  </tr>
-  </thead>
-  <tbody>
-  <?php 
-  $canBatchEdit  = common::hasPriv('task', 'batchEdit');
-  $canBatchClose = common::hasPriv('task', 'batchClose') and strtolower($browseType) != 'closedBy';
-  ?>
-  <?php foreach($tasks as $task):?>
-  <?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : ''; ?>
-  <tr class='a-center'>
-    <td>
-      <?php if($canBatchEdit or $canBatchClose):?>
-      <input type='checkbox' name='taskIDList[]'  value='<?php echo $task->id;?>'/> 
-      <?php endif;?>
-      <?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
-    </td>
-    <td><span class='<?php echo 'pri'. $lang->task->priList[$task->pri]?>'><?php echo $lang->task->priList[$task->pri];?></span></td>
-    <td class='a-left' title="<?php echo $task->name?>">
-      <?php 
-      if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;
-      if($task->fromBug) echo html::a($this->createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'");
-      ?>
-    </td>
-    <td class=<?php echo $task->status;?> >
-      <?php
-      $storyChanged = ($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion);
-      $storyChanged ? print("<span class='warning'>{$lang->story->changed}</span> ") : print($lang->task->statusList[$task->status]);
-      ?>
-    </td>
-    <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
-
-    <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
-    <td><?php echo substr($task->openedDate, 5, 6);?></th>
-    <?php endif;?>
-
-    <td <?php echo $class;?>><?php echo $task->assignedTo == 'closed' ? 'Closed' : $task->assignedToRealName;?></td>
-    <td><?php echo $users[$task->finishedBy];?></td>
-
-    <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
-    <td><?php echo substr($task->finishedDate, 5, 6);?></th>
-    <?php endif;?>
-
-    <td><?php echo $task->estimate;?></td>
-    <td><?php echo $task->consumed;?></td>
-    <td><?php echo $task->left;?></td>
-    <?php
-    if($project->type == 'sprint')
-    {
-        echo '<td class="a-left" title="' . $task->storyTitle . '"';
-        if($task->storyID)
-        {
-          if(!common::printLink('story', 'view', "storyid=$task->storyID", $task->storyTitle)) print $task->storyTitle;
-        }
-        echo '</td>';
-    }
-    ?>
-    <td class='a-right'>
-      <?php
-      common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-      common::printIcon('task', 'start',    "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-
-      common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-      if($browseType == 'needconfirm')
-      {
-          $lang->task->confirmStoryChange = $lang->confirm;
-          common::printIcon('task', 'confirmStoryChange', "taskid=$task->id", '', 'list', '', 'hiddenwin');
-      }
-      common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-      common::printIcon('task', 'close',    "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-      common::printIcon('task', 'edit',"taskID=$task->id", '', 'list');
-      ?>
-    </td>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <tfoot>
-    <tr>
-      <?php $columns = ($this->cookie->windowWidth > $this->config->wideSize ? 14 : 12) - ($project->type == 'sprint' ? 0 : 1);?>
-      <td colspan='<?php echo $columns;?>'>
-        <div class='f-left'>
-        <?php 
-        if(count($tasks))
-        {
-            if($canBatchEdit or $canBatchClose) echo html::selectAll() . html::selectReverse();
-
-            if($canBatchEdit)
-            {
-                $actionLink = $this->createLink('task', 'batchEdit', "projectID=$projectID");
-                echo html::commonButton($lang->edit, "onclick=\"changeAction('projectTaskForm', 'batchEdit', '$actionLink')\"");
-            }
-            if($canBatchClose)
-            {
-                $actionLink = $this->createLink('task', 'batchClose');
-                echo html::commonButton($lang->close, "onclick=\"changeAction('projectTaskForm', 'batchClose', '$actionLink')\"");
-            }
-        }
-        echo $summary;
-        ?>
-        </div>
-        <?php $pager->show();?>
-      </td>
-    </tr>
-  </tfoot>
-</table>
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index edd1bc93bc..dada0708a8 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -12,7 +12,9 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<table align='center' class='table-5 tablesorter'>
+<?php js::set('confirmUnlinkMember', $lang->project->confirmUnlinkMember)?>
+<?php js::set('projectID', $project->id)?>
+<table align='center' class='table-5 tablesorter' id='memberlist'>
   <thead>
   <tr class='colhead'>
     <th><?php echo $lang->team->account;?></th>
@@ -40,7 +42,11 @@
     <td><?php echo $member->days;?></td>
     <td><?php echo $member->hours;?></td>
     <td><?php echo $memberHours;?></td>
-    <td><?php common::printIcon('project', 'unlinkMember', "projectID=$project->id&account=$member->account", '', 'list', '', 'hiddenwin');?></td>
+    <td>
+      <?php 
+      echo html::a("javascript:unlinkMember($project->id, \"$member->account\")", '&nbsp;', '', "class='icon-green-project-unlinkMember' title='{$lang->project->unlinkMember}'");
+      ?>
+    </td>
   </tr>
   <?php endforeach;?>
   </tbody>     
diff --git a/module/release/control.php b/module/release/control.php
index a3190c3b35..253b3dcc8a 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -177,8 +177,16 @@ class release extends control
         }
         else
         {
+            $response['result']  = 'success';
+            $response['message'] = '';
+
             $this->release->delete(TABLE_RELEASE, $releaseID);
-            die(js::locate($this->session->releaseList, 'parent'));
+            if(dao::isError())
+            {
+                $response['result']  = 'fail';
+                $response['message'] = dao::getError();
+            }
+            $this->send($response);
         }
     }
 
diff --git a/module/release/js/browse.js b/module/release/js/browse.js
new file mode 100644
index 0000000000..595558edc3
--- /dev/null
+++ b/module/release/js/browse.js
@@ -0,0 +1,28 @@
+/**
+ * Delete release. 
+ * 
+ * @param  int    releaseID 
+ * @access public
+ * @return void
+ */
+function deleteRelease(releaseID)
+{
+    if(confirm(confirmDelete))
+    {
+        url = createLink('release', 'delete','releaseID=' + releaseID + '&confrim=yes');
+        $.ajax(
+        {
+            type:     'GET', 
+            url:      url,
+            dataType: 'json', 
+            success:  function(data) 
+            {
+                if(data.result == 'success') 
+                {
+                    url = createLink('release', 'browse', 'productID=' + productID);
+                    $('.outer').load(url + ' #releaselist', function(){sortTable();});
+                }
+            }
+        });
+    }
+}
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 1f43d44520..6a4681ca06 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -12,7 +12,9 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<table align='center' class='table-6 tablesorter'>
+<?php js::set('productID', $product->id)?>
+<?php js::set('confirmDelete', $lang->release->confirmDelete)?>
+<table align='center' class='table-6 tablesorter' id='releaselist'>
   <caption class='caption-tl'>
     <div class='f-left'><?php echo $lang->release->browse;?></div>
     <div class='f-right'><?php common::printIcon('release', 'create', "product=$product->id");?></div>
@@ -36,7 +38,7 @@
     <td class='a-center'>
       <?php
       common::printIcon('release', 'edit',   "release=$release->id", '', 'list');
-      common::printIcon('release', 'delete', "release=$release->id", '', 'list', '', 'hiddenwin');
+      echo html::a("javascript:deleteRelease($release->id)", '&nbsp;', '', "class='icon-green-common-delete' title='{$lang->release->delete}'");
       ?>
     </td>
   </tr>
diff --git a/module/story/control.php b/module/story/control.php
index 1a8600bbc6..ddfa225dfa 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -91,7 +91,7 @@ class story extends control
                 break;
             }
         }
-        $users = $this->user->getPairs('nodeleted|pdfirst');
+        $users = $this->user->getPairs('nodeleted|pdfirst|noclosed');
         $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'story');
 
         /* Set menu. */
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 6054e47c58..2db894b887 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -62,6 +62,7 @@ $lang->testcase->batchEdit          = "Batch edit";
 $lang->testcase->delete             = "Delete";
 $lang->testcase->browse             = "Browse";
 $lang->testcase->import             = "Import";
+$lang->testcase->importID           = "Linenum";
 $lang->testcase->showImport         = "Show import";
 $lang->testcase->exportTemplet      = "Export templet";
 $lang->testcase->export             = "Export";
@@ -69,6 +70,11 @@ $lang->testcase->export             = "Export";
 $lang->testcase->confirmChange      = 'Confirm case change';
 $lang->testcase->confirmStoryChange = 'Confirm story change';
 
+$lang->testcase->editHaved = 'Modify existing case';
+$lang->testcase->addNew    = 'Add new case';
+  
+$lang->testcase->num = 'The number of cases';
+
 $lang->testcase->deleteStep   = 'Delete';
 $lang->testcase->insertBefore = 'Insert before';
 $lang->testcase->insertAfter  = 'Insert after';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index fc9849b6fe..0fb8bb687d 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -61,13 +61,19 @@ $lang->testcase->edit               = "编辑";
 $lang->testcase->batchEdit          =  "批量编辑 ";
 $lang->testcase->delete             = "删除";
 $lang->testcase->browse             = "用例列表";
-$lang->testcase->import             = "导入用例";
+$lang->testcase->import             = "导入";
+$lang->testcase->importID           = "行号";
 $lang->testcase->showImport         = "显示导入内容";
 $lang->testcase->exportTemplet      = "导出模板";
 $lang->testcase->export             = "导出";
 $lang->testcase->confirmChange      = '确认用例变动';
 $lang->testcase->confirmStoryChange = '确认需求变动';
 
+$lang->testcase->editHaved = '修改已有用例';
+$lang->testcase->addNew    = '添加新用例';
+
+$lang->testcase->num = '导入用例个数：';
+
 $lang->testcase->deleteStep   = '删除';
 $lang->testcase->insertBefore = '之前添加';
 $lang->testcase->insertAfter  = '之后添加';
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 51bf33b91b..51a8d5e80e 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes') die(include './caselist.html.php');?>
 <?php
 include '../../common/view/header.html.php';
 include '../../common/view/datepicker.html.php';
@@ -54,7 +53,83 @@ js::set('moduleID'  , $moduleID);
     </td>
     <td class='divider <?php echo $treeClass;?>'></td>
     <td>
-      <?php include 'caselist.html.php';?>
+      <table class='table-1 colored tablesorter datatable fixed' id='caseList'>
+        <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+        <thead>
+          <tr class='colhead'>
+            <th class='w-id'>    <?php common::printOrderLink('id',            $orderBy, $vars, $lang->idAB);?></th>
+            <th class='w-pri'>   <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
+            <th>                 <?php common::printOrderLink('title',         $orderBy, $vars, $lang->testcase->title);?></th>
+            <?php if($browseType == 'needconfirm'):?>
+            <th>                 <?php common::printOrderLink('story',         $orderBy, $vars, $lang->testcase->story);?></th>
+            <th class='w-50px'><?php echo $lang->actions;?></th>
+            <?php else:?>
+            <th class='w-type'>  <?php common::printOrderLink('type',          $orderBy, $vars, $lang->typeAB);?></th>
+            <th class='w-user'>  <?php common::printOrderLink('openedBy',      $orderBy, $vars, $lang->openedByAB);?></th>
+            <th class='w-80px'>  <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
+            <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
+            <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
+            <th class='w-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
+            <th class='w-150px {sorter:false}'><?php echo $lang->actions;?></th>
+            <?php endif;?>
+          </tr>
+          <?php
+          $canBatchEdit = common::hasPriv('testcase', 'batchEdit');
+          $canBatchRun  = common::hasPriv('testtask', 'batchRun');
+          ?>
+          <?php foreach($cases as $case):?>
+          <tr class='a-center'>
+            <?php $viewLink = inlink('view', "caseID=$case->id");?>
+            <td>
+              <?php if($canBatchEdit or $canBatchRun):?>
+              <input type='checkbox' name='caseIDList[]'  value='<?php echo $case->id;?>'/> 
+              <?php endif;?>
+              <?php echo html::a($viewLink, sprintf('%03d', $case->id));?>
+            </td>
+            <td><span class='<?php echo 'pri' . $case->pri?>'><?php echo $case->pri?></span></td>
+            <td class='a-left' title="<?php echo $case->title?>"><?php echo html::a($viewLink, $case->title);?></td>
+            <?php if($browseType == 'needconfirm'):?>
+            <td class='a-left'><?php echo html::a($this->createLink('story', 'view', "storyID=$case->story"), $case->storyTitle, '_blank');?></td>
+            <td><?php $lang->testcase->confirmStoryChange = $lang->confirm; common::printIcon('testcase', 'confirmStoryChange', "caseID=$case->id", '', 'list', '', 'hiddenwin');?></td>
+            <?php else:?>
+            <td><?php echo $lang->testcase->typeList[$case->type];?></td>
+            <td><?php echo $users[$case->openedBy];?></td>
+            <td><?php echo $users[$case->lastRunner];?></td>
+            <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
+            <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
+            <td class='<?php if(isset($run)) echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
+            <td class='a-right'>
+              <?php
+              common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', '', '', 'runCase');
+              common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'results');
+              common::printIcon('testcase', 'edit',    "caseID=$case->id", $case, 'list');
+              common::printIcon('testcase', 'create',  "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $case, 'list', 'copy');
+              common::printIcon('testcase', 'delete',  "caseID=$case->id", '', 'list', '', 'hiddenwin');
+              common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug');
+              ?>
+            </td>
+            <?php endif;?>
+          </tr>
+        <?php endforeach;?>
+        </thead>
+       <tfoot>
+         <tr>
+           <?php $mergeColums = $browseType == 'needconfirm' ? 5 : 10;?>
+           <td colspan='<?php echo $mergeColums?>'>
+             <?php if($cases):?>
+             <div class='f-left'>
+             <?php
+             if($canBatchEdit or $canBatchRun) echo html::selectAll() . html::selectReverse(); 
+             if($canBatchEdit) echo html::submitButton($lang->edit, "onclick='changeAction(\"" . inLink('batchEdit', "productID=$productID") . "\")'");
+             if($canBatchRun) echo html::submitButton($lang->testtask->runCase,  "onclick='changeAction(\"" . $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy") . "\")'");
+             ?>
+             </div>
+             <?php endif?>
+             <?php $pager->show();?>
+           </td>
+         </tr>
+       </tfoot>
+      </table>
     </td>              
   </tr>              
 </table>              
diff --git a/module/testcase/view/caselist.html.php b/module/testcase/view/caselist.html.php
deleted file mode 100644
index 3ea4856ee0..0000000000
--- a/module/testcase/view/caselist.html.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<table class='table-1 colored tablesorter datatable fixed' id='caseList'>
-  <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-  <thead>
-    <tr class='colhead'>
-      <th class='w-id'>    <?php common::printOrderLink('id',            $orderBy, $vars, $lang->idAB);?></th>
-      <th class='w-pri'>   <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
-      <th>                 <?php common::printOrderLink('title',         $orderBy, $vars, $lang->testcase->title);?></th>
-      <?php if($browseType == 'needconfirm'):?>
-      <th>                 <?php common::printOrderLink('story',         $orderBy, $vars, $lang->testcase->story);?></th>
-      <th class='w-50px'><?php echo $lang->actions;?></th>
-      <?php else:?>
-      <th class='w-type'>  <?php common::printOrderLink('type',          $orderBy, $vars, $lang->typeAB);?></th>
-      <th class='w-user'>  <?php common::printOrderLink('openedBy',      $orderBy, $vars, $lang->openedByAB);?></th>
-      <th class='w-80px'>  <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
-      <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
-      <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
-      <th class='w-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
-      <th class='w-150px {sorter:false}'><?php echo $lang->actions;?></th>
-      <?php endif;?>
-    </tr>
-    <?php
-    $canBatchEdit = common::hasPriv('testcase', 'batchEdit');
-    $canBatchRun  = common::hasPriv('testtask', 'batchRun');
-    ?>
-    <?php foreach($cases as $case):?>
-    <tr class='a-center'>
-      <?php $viewLink = inlink('view', "caseID=$case->id");?>
-      <td>
-        <?php if($canBatchEdit or $canBatchRun):?>
-        <input type='checkbox' name='caseIDList[]'  value='<?php echo $case->id;?>'/> 
-        <?php endif;?>
-        <?php echo html::a($viewLink, sprintf('%03d', $case->id));?>
-      </td>
-      <td><span class='<?php echo 'pri' . $case->pri?>'><?php echo $case->pri?></span></td>
-      <td class='a-left' title="<?php echo $case->title?>"><?php echo html::a($viewLink, $case->title);?></td>
-      <?php if($browseType == 'needconfirm'):?>
-      <td class='a-left'><?php echo html::a($this->createLink('story', 'view', "storyID=$case->story"), $case->storyTitle, '_blank');?></td>
-      <td><?php $lang->testcase->confirmStoryChange = $lang->confirm; common::printIcon('testcase', 'confirmStoryChange', "caseID=$case->id", '', 'list', '', 'hiddenwin');?></td>
-      <?php else:?>
-      <td><?php echo $lang->testcase->typeList[$case->type];?></td>
-      <td><?php echo $users[$case->openedBy];?></td>
-      <td><?php echo $users[$case->lastRunner];?></td>
-      <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
-      <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
-      <td class='<?php if(isset($run)) echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
-      <td class='a-right'>
-        <?php
-        common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', '', '', 'runCase');
-        common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'results');
-        common::printIcon('testcase', 'edit',    "caseID=$case->id", $case, 'list');
-        common::printIcon('testcase', 'create',  "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $case, 'list', 'copy');
-        common::printIcon('testcase', 'delete',  "caseID=$case->id", '', 'list', '', 'hiddenwin');
-        common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug');
-        ?>
-      </td>
-      <?php endif;?>
-    </tr>
-  <?php endforeach;?>
-  </thead>
- <tfoot>
-   <tr>
-     <?php $mergeColums = $browseType == 'needconfirm' ? 5 : 10;?>
-     <td colspan='<?php echo $mergeColums?>'>
-       <?php if($cases):?>
-       <div class='f-left'>
-       <?php
-       if($canBatchEdit or $canBatchRun) echo html::selectAll() . html::selectReverse(); 
-       if($canBatchEdit) echo html::submitButton($lang->edit, "onclick='changeAction(\"" . inLink('batchEdit', "productID=$productID") . "\")'");
-       if($canBatchRun) echo html::submitButton($lang->testtask->runCase,  "onclick='changeAction(\"" . $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy") . "\")'");
-       ?>
-       </div>
-       <?php endif?>
-       <?php $pager->show();?>
-     </td>
-   </tr>
- </tfoot>
-</table>
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index e7afd15d73..ecd39360ef 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -57,6 +57,7 @@
 <table class='table-1'>
   <caption class='caption-tl'><?php echo $lang->testcase->addNew?></caption>
   <tr class='colhead'>
+    <th><?php echo $lang->testcase->importID?></th>
     <th><?php echo $lang->testcase->title?></th>
     <th><?php echo $lang->testcase->module?></th>
     <th><?php echo $lang->testcase->story?></th>
@@ -77,6 +78,7 @@
   </tr>
   <?php foreach($caseData as $key => $case):?>
   <tr valign='top' align='center'>
+    <td><?php echo $key + 1?></td>
     <td><?php echo html::input("title[$key]", $case->title, "class='text-1' style='margin-top:2px'")?></td>
     <td><?php echo html::select("module[$key]", $modules, isset($case->module) ? $case->module : '', "class='select-2'") . html::hidden("product[$key]", $productID)?></td>
     <td><?php echo html::select("story[$key]", $stories, isset($case->story) ? $case->story : '', "class='select-2'")?></td>
diff --git a/module/todo/control.php b/module/todo/control.php
index eb80abf7ba..2221c9d4ee 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -278,9 +278,18 @@ class todo extends control
         }
         else
         {
+            $response['result']  = 'success';
+            $response['message'] = '';
+
             $this->dao->delete()->from(TABLE_TODO)->where('id')->eq($todoID)->exec();
+            if(dao::isError())
+            {
+                $response['result']  = 'fail';
+                $response['message'] = dao::getError();
+            }
+
             $this->loadModel('action')->create('todo', $todoID, 'erased');
-            die(js::locate($this->session->todoList, 'parent'));
+            $this->send($response);
         }
     }
 
diff --git a/module/webapp/control.php b/module/webapp/control.php
index 7d445d70bf..ac65b8a0de 100644
--- a/module/webapp/control.php
+++ b/module/webapp/control.php
@@ -156,7 +156,7 @@ class webapp extends control
                 die(js::reload('parent'));
             }
             echo js::alert($this->lang->webapp->successInstall);
-            die(js::reload('parent.parent'));
+            die(js::closeColorbox('parent.parent'));
         }
 
         $this->view->title   = $this->lang->webapp->common . $this->lang->colon . $this->lang->webapp->install;
diff --git a/module/webapp/js/common.js b/module/webapp/js/common.js
index 75c009218d..e28b91ab2c 100644
--- a/module/webapp/js/common.js
+++ b/module/webapp/js/common.js
@@ -1,4 +1,13 @@
-if($('a.iframe').size()) $("a.iframe").colorbox({width:450, height:190, iframe:true, transition:'none', scrolling:true});
+if($('a.iframe').size())
+{
+    $("a.iframe").colorbox({width:450, height:190, iframe:true, transition:'none', scrolling:true, onCleanup:function()
+    {
+        var selfClose = $.cookie('selfClose');
+        if(selfClose != 1) return;
+        $(this).replaceWith("<input type='button' value='" + installed + "' disabled='disabled' style='color:gray' class='button-c'>");
+        $.cookie('selfClose', 0);
+    }});
+}
 if($('a.webapp').size()) $("a.webapp").colorbox({width:700, height:400, iframe:true, transition:'none', scrolling:true});
 if($('a.apiapp').size()) $("a.apiapp").colorbox({width:700, height:330, iframe:true, transition:'none', scrolling:true});
 if($('a.popup').size()) $("a.popup").colorbox({width:900, height:600, iframe:true, transition:'none', scrolling:true});
diff --git a/module/webapp/view/obtain.html.php b/module/webapp/view/obtain.html.php
index 7f33ebc0b1..53e9b47d67 100644
--- a/module/webapp/view/obtain.html.php
+++ b/module/webapp/view/obtain.html.php
@@ -84,6 +84,7 @@
     </td>
   </tr>
 </table>
+<?php js::set('installed', $lang->webapp->installed)?>
 <script>
 $('#<?php echo $type;?>').addClass('active')
 $('#module<?php echo $moduleID;?>').addClass('active')
diff --git a/www/js/my.full.js b/www/js/my.full.js
index acbfdeab3a..bf5f199fa1 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -794,9 +794,10 @@ function setModal4List(colorboxClass, replaceID, callback)
             saveWindowSize();
 
             var link = self.location.href;
-            $.get(link, {ajax:"yes"}, function(data)
+            $('#' + replaceID).wrap("<div id='tmpDiv'></div>");
+            $('#tmpDiv').load(link + ' #' + replaceID, function()
             {
-                $('#' + replaceID).replaceWith(data);
+                $('#tmpDiv').replaceWith($('#tmpDiv').html());
                 setModal4List(colorboxClass, replaceID, callback);
 
                 $('.colored').colorize();