diff --git a/module/bug/view/browse.custom.html.php b/module/bug/view/browse.custom.html.php
index 954cf0e26c..5ff3d353bf 100644
--- a/module/bug/view/browse.custom.html.php
+++ b/module/bug/view/browse.custom.html.php
@@ -14,57 +14,78 @@
     <td class='divider'></td>
     <td>
       <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-      <table class='table-1 colored tablesorter datatable'>
-        <thead>
-        <tr class='colhead'>
-          <?php foreach($customFields as $fieldName):?>
-          <th><nobr><?php common::printOrderLink($fieldName, $orderBy, $vars, $lang->bug->$fieldName);?></nobr></th>
+      <form method='post' action='<?php echo $this->inLink('batchEdit', "from=bugBrowse&productID=$productID&orderBy=$orderBy");?>'>
+        <table class='table-1 colored tablesorter datatable'>
+          <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='{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><nobr>
+              <?php
+              $params = "bugID=$bug->id";
+              if(!($bug->status == 'active'   and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
+              if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose)))     echo $lang->bug->buttonClose . ' ';
+              common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
+              ?>
+              </nobr>
+            </td>
+          </tr>
           <?php endforeach;?>
-          <th class='{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 foreach($customFields as $fieldName):?>
-          <td><nobr>
-            <?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><nobr>
-            <?php
-            $params = "bugID=$bug->id";
-            if(!($bug->status == 'active'   and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
-            if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose)))     echo $lang->bug->buttonClose . ' ';
-            common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
-            ?>
-            </nobr>
-          </td>
-        </tr>
-        <?php endforeach;?>
-        </tbody>
-        <tfoot><tr><td colspan='9'><?php $pager->show();?></td></tr></tfoot>
-      </table>
+          </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->bug->batchEdit);
+               ?>
+              </div>
+              <?php endif?>
+              <div class='f-right'><?php $pager->show();?></div>
+            </td>
+          </tr>
+          </tfoot>
+        </table>
+      </form>
     </td>
   </tr>
 </table>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index b52f32afdc..5586e1f904 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -10,14 +10,14 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
-<?php include '../../common/view/colorize.html.php';?>
-<script language='Javascript'>
-var browseType = '<?php echo $browseType;?>';
-var moduleID   = '<?php echo $moduleID;?>';
-var customed   = <?php echo (int)$customed;?>;
-</script>
+<?php
+include '../../common/view/header.html.php';
+include '../../common/view/treeview.html.php';
+include '../../common/view/colorize.html.php';
+js::set('browseType', $browseType);
+js::set('moduleID', $moduleID);
+js::set('customed', $customed, 'number');
+?>
 
 <div id='featurebar'>
   <div class='f-left'>
@@ -158,12 +158,14 @@ var customed   = <?php echo (int)$customed;?>;
             <tr>
               <?php $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 12 : 9;?>
               <td colspan='<?php echo $columns;?>'>
+                <?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->bug->batchEdit);
                  ?>
                 </div>
+                <?php endif?>
                 <div class='f-right'><?php $pager->show();?></div>
               </td>
             </tr>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index ccdc5aa432..3b89729b70 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -10,14 +10,17 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/chosen.html.php';?>
-<?php include '../../common/view/autocomplete.html.php';?>
-<?php include '../../common/view/alert.html.php';?>
-<?php include '../../common/view/kindeditor.html.php';?>
-<?php js::set('holders', $lang->bug->placeholder, 'json');?>
-<?php js::set('userList', array_keys($users), 'json');?>
-<?php js::set('page', 'create');?>
+<?php
+include '../../common/view/header.html.php';
+include '../../common/view/chosen.html.php';
+include '../../common/view/autocomplete.html.php';
+include '../../common/view/alert.html.php';
+include '../../common/view/kindeditor.html.php';
+js::set('holders', $lang->bug->placeholder, 'json');
+js::set('userList', array_keys($users), 'json');
+js::set('page', 'create');
+?>
+
 <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
   <table class='table-1'> 
     <caption><?php echo $lang->bug->create;?></caption>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 66c11686d5..6e454288fe 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -10,23 +10,24 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/chosen.html.php';?>
-<?php include '../../common/view/autocomplete.html.php';?>
-<?php include '../../common/view/alert.html.php';?>
-<?php include '../../common/view/kindeditor.html.php';?>
-<script language='Javascript'>
-page                   = 'edit';
-changeProductConfirmed = false;
-changeProjectConfirmed = false;
-confirmChangeProduct   = '<?php echo $lang->bug->confirmChangeProduct;?>';
-oldProjectID           = '<?php echo $bug->project;?>';
-oldStoryID             = '<?php echo $bug->story;?>';
-oldTaskID              = '<?php echo $bug->task;?>';
-oldOpenedBuild         = '<?php echo $bug->openedBuild;?>';
-oldResolvedBuild       = '<?php echo $bug->resolvedBuild;?>';
-userList               = "<?php echo join(',', array_keys($users));?>".split(',');
-</script>
+<?php
+include '../../common/view/header.html.php';
+include '../../common/view/chosen.html.php';
+include '../../common/view/autocomplete.html.php';
+include '../../common/view/alert.html.php';
+include '../../common/view/kindeditor.html.php';
+js::set('page'                   , 'edit');
+js::set('changeProductConfirmed' , 'false', 'number');
+js::set('changeProjectConfirmed' , 'false', 'number');
+js::set('confirmChangeProduct'   , $lang->bug->confirmChangeProduct);
+js::set('oldProjectID'           , $bug->project);
+js::set('oldStoryID'             , $bug->story);
+js::set('oldTaskID'              , $bug->task);
+js::set('oldOpenedBuild'         , $bug->openedBuild);
+js::set('oldResolvedBuild'       , $bug->resolvedBuild);
+js::set('userList'               , array_keys($users), 'json');
+?>
+
 <form method='post' target='hiddenwin' enctype='multipart/form-data' id='dataform'>
 <div id='titlebar'>
   <div id='main'>