From 2bfe07e3a0308b3603dccf888068919f63baec56 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Fri, 15 Jun 2012 02:14:39 +0000
Subject: [PATCH]  * Finish task#860.

---
 module/build/control.php                      |   4 +-
 module/build/css/common.css                   |   4 +-
 module/build/view/create.html.php             | 101 ++++++++++++------
 module/build/view/edit.html.php               |  93 ++++++++++------
 module/my/view/blockproducts.html.php         |   2 +-
 module/my/view/blockprojects.html.php         |   2 +-
 module/project/model.php                      |  19 ----
 module/release/control.php                    |   5 +-
 module/release/css/common.css                 |   3 +
 .../view/ajaxgetstoriesandbugs.html.php       |  97 +++++++++++------
 module/release/view/edit.html.php             |  95 ++++++++++------
 11 files changed, 268 insertions(+), 157 deletions(-)
 create mode 100755 module/release/css/common.css

diff --git a/module/build/control.php b/module/build/control.php
index 4f8fa5a50d..d0db4ef8e9 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -41,7 +41,7 @@ class build extends control
         /* Get stories and bugs. */
         $orderBy = 'status_asc, stage_asc, id_desc';
         $stories = $this->story->getProjectStories($projectID, $orderBy);
-        $bugs    = $this->project->getResolvedBugs($projectID); 
+        $bugs    = $this->bug->getProjectBugs($projectID); 
 
         /* Assign. */
         $this->view->header->title = $this->lang->build->create;
@@ -86,7 +86,7 @@ class build extends control
         /* Get stories and bugs. */
         $orderBy = 'status_asc, stage_asc, id_desc';
         $stories = $this->story->getProjectStories($build->project, $orderBy);
-        $bugs    = $this->project->getResolvedBugs($build->project); 
+        $bugs    = $this->bug->getProjectBugs($build->project); 
 
         /* Assign. */
         $this->view->header->title = $this->lang->build->edit;
diff --git a/module/build/css/common.css b/module/build/css/common.css
index 6673dd5e78..e8abbee4f8 100644
--- a/module/build/css/common.css
+++ b/module/build/css/common.css
@@ -1 +1,3 @@
-.linkbox{height:225px; overflow-y:auto}
+.mainTable  { width:100%; border:none}
+.headTable  { width:100%; height:30px; margin:0px;}
+.contentDiv { height:195px; overflow-y:auto}
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 0ca9ae4a33..28d466f622 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -44,48 +44,81 @@
       <th class='rowhead'><?php echo $lang->build->linkStoriesAndBugs;?></th>
       <td>
         <div class="w-p90">
-          <div class='half-left linkbox'>
-            <table class='table-1 fixed'>
-            <caption><?php echo $lang->build->linkStories;?></caption>
-              <tr>
-                <th class='w-id'><?php echo $lang->idAB;?></th>
-                <th><?php echo $lang->story->title;?></th>
-                <th class='w-hour'><?php echo $lang->statusAB;?></th>
-                <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+
+          <div class='half-left'>
+            <table class='mainTable'>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <table class='headTable'>
+                    <caption><?php echo $lang->build->linkStories;?></caption>
+                    <tr>
+                      <th class='w-id a-left'> <?php echo html::selectAll('story', 'checkbox') . $lang->idAB;?></th>
+                      <th><?php echo $lang->story->title;?></th>
+                      <th class='w-hour'><?php echo $lang->statusAB;?></th>
+                      <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+                    </tr>
+                  </table>
+                </td>
               </tr>
-              <?php foreach($stories as $key => $story):?>
-              <?php
-              $storyLink = $this->createLink('story', 'view', "storyID=$story->id");
-              ?>
-              <tr class='a-center'>
-                <td id='story'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if($story->stage == 'developed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
-                <td class='a-left nobr'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
-                <td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
-                <td><?php echo $lang->story->stageList[$story->stage];?></td>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <div class='contentDiv'>
+                    <table class='f-left table-1 fixed'>
+                      <?php foreach($stories as $key => $story):?>
+                      <?php
+                      $storyLink = $this->createLink('story', 'view', "storyID=$story->id");
+                      ?>
+                      <tr class='a-center'>
+                        <td class='w-id a-left' id='story'>
+                          <input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?>
+                        </td>
+                        <td class='a-left nobr'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
+                        <td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
+                        <td class='w-80px'><?php echo $lang->story->stageList[$story->stage];?></td>
+                      </tr>
+                    <?php endforeach;?>
+                    </table>
+                  </div>
+                </td>
               </tr>
-              <?php endforeach;?>
-              <tr class='a-center'><td><?php echo html::selectAll('story', 'checkbox') . $lang->selectAll;?></td>
             </table>
           </div>
-          <div class='half-right linkbox'>
-            <table class='table-1 fixed'>
-              <caption><?php echo $lang->build->linkBugs;?></caption>
-              <tr>
-                <th class='w-id'><?php echo $lang->idAB;?></th>
-                <th><?php echo $lang->bug->title;?></th>
-                <th class='w-100px'><?php echo $lang->bug->status;?></th>
+
+          <div class='half-right'>
+            <table class='mainTable'>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <table class='headTable'>
+                    <caption><?php echo $lang->build->linkBugs;?></caption>
+                    <tr>
+                      <th class='w-id a-left'><?php echo html::selectAll('bug', 'checkbox') . $lang->idAB;?></th>
+                      <th><?php echo $lang->bug->title;?></th>
+                      <th class='w-100px'><?php echo $lang->bug->status;?></th>
+                    </tr>
+                  </table>
+                </td>
               </tr>
-              <?php foreach($bugs as $bug):?>
-              <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id");?>
-              <tr class='a-center'>
-                <td id='bug'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" checked> <?php echo sprintf('%03d', $bug->id);?></td>
-                <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
-                <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <div class='contentDiv'>
+                    <table class='f-left table-1 fixed'>
+                      <?php foreach($bugs as $bug):?>
+                      <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id");?>
+                      <tr class='a-center'>
+                        <td class='w-id a-left' id='bug'>
+                          <input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?>> <?php echo sprintf('%03d', $bug->id);?>
+                        </td>
+                        <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
+                        <td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
+                      </tr>
+                      <?php endforeach;?>
+                    </table>
+                  </div>
+                </td>
               </tr>
-              <?php endforeach;?>
-              <tr class='a-center'><td><?php echo html::selectAll('bug', 'checkbox', true) . $lang->selectAll;?></td></tr>
             </table>
           </div>
+
         </div>
       </td>
     </tr>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index 29ecdc9df4..df15903343 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -44,46 +44,75 @@
       <th class='rowhead'><?php echo $lang->build->linkStoriesAndBugs;?></th>
       <td>
         <div class="w-p90">
-          <div class='half-left linkbox'>
-            <table class='table-1 fixed'>
-            <caption><?php echo $lang->build->linkStories;?></caption>
-              <tr>
-                <th class='w-id'><?php echo $lang->idAB;?></th>
-                <th><?php echo $lang->story->title;?></th>
-                <th class='w-hour'><?php echo $lang->statusAB;?></th>
-                <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+
+          <div class='half-left'>
+            <table class='mainTable'>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none;padding:0px'>
+                  <table class='headTable'>
+                    <caption><?php echo $lang->build->linkStories;?></caption>
+                    <tr>
+                      <th class='w-id a-left'><?php echo html::selectAll('story', 'checkbox', 'true') . $lang->idAB;?></th>
+                      <th><?php echo $lang->story->title;?></th>
+                      <th class='w-hour'><?php echo $lang->statusAB;?></th>
+                      <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+                    </tr>
+                  </table>
+                </td>
               </tr>
-              <?php foreach($stories as $key => $story):?>
-              <?php
-              $storyLink = $this->createLink('story', 'view', "storyID=$story->id");
-              ?>
-              <tr class='a-center'>
-                <td><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if(strpos($build->stories, $story->id) !== false) echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
-                <td class='a-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
-                <td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
-                <td><?php echo $lang->story->stageList[$story->stage];?></td>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <div class="contentDiv">
+                    <table class='f-left table-1 fixed'>
+                      <?php foreach($stories as $key => $story):?>
+                      <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id");?>
+                      <tr class='a-center'>
+                        <td class='w-id a-left' id='story'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if(strpos($build->stories, $story->id) !== false) echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
+                        <td class='a-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
+                        <td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
+                        <td class='w-80px'><?php echo $lang->story->stageList[$story->stage];?></td>
+                      </tr>
+                      <?php endforeach;?>
+                    </table>
+                  </div>
+                </td>
               </tr>
-              <?php endforeach;?>
             </table>
           </div>
-          <div class='half-right linkbox'>
-            <table class='table-1 fixed'>
-              <caption><?php echo $lang->build->linkBugs;?></caption>
-              <tr>
-                <th class='w-id'>       <?php echo $lang->idAB;?></th>
-                <th><?php echo $lang->bug->title;?></th>
-                <th class='w-100px'><?php echo $lang->bug->status;?></th>
+
+          <div class='half-right'>
+            <table class='mainTable'>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <table class='headTable'>
+                    <caption><?php echo $lang->build->linkBugs;?></caption>
+                    <tr>
+                      <th class='w-id a-left'><?php echo html::selectAll('bug', 'checkbox', 'true') . $lang->idAB;?></th>
+                      <th><?php echo $lang->bug->title;?></th>
+                      <th class='w-100px'><?php echo $lang->bug->status;?></th>
+                    </tr>
+                  </table>
+                </td>
               </tr>
-              <?php foreach($bugs as $bug):?>
-              <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id");?>
-              <tr class='a-center'>
-                <td><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if(strpos($build->bugs, $bug->id) !== false) echo 'checked';?>> <?php echo sprintf('%03d', $bug->id);?></td>
-                <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
-                <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <div class='contentDiv'>
+                    <table class='f-left table-1 fixed'>
+                      <?php foreach($bugs as $bug):?>
+                      <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id");?>
+                      <tr class='a-center'>
+                        <td class='w-id a-left' id='bug'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if(strpos($build->bugs, $bug->id) !== false) echo 'checked';?>> <?php echo sprintf('%03d', $bug->id);?></td>
+                        <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
+                        <td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
+                      </tr>
+                      <?php endforeach;?>
+                    </table>
+                  </div>
+                </td>
               </tr>
-              <?php endforeach;?>
             </table>
           </div>
+
         </div>
       </td>
     </tr>
diff --git a/module/my/view/blockproducts.html.php b/module/my/view/blockproducts.html.php
index dedd43b66d..b019c455cb 100644
--- a/module/my/view/blockproducts.html.php
+++ b/module/my/view/blockproducts.html.php
@@ -40,7 +40,7 @@
   <tr>
     <td>
       <div class='contentDiv1'>
-      <table class='table-1 fixer colored'>
+      <table class='table-1 fixed colored'>
         <?php foreach($productStats as $product):?>
         <tr class='a-center' style='height:30px'>
           <td class='a-left'><?php echo html::a($this->createLink('product', 'view', 'product=' . $product->id), $product->name);?></td>
diff --git a/module/my/view/blockprojects.html.php b/module/my/view/blockprojects.html.php
index 16c96900a1..53592c2baf 100644
--- a/module/my/view/blockprojects.html.php
+++ b/module/my/view/blockprojects.html.php
@@ -42,7 +42,7 @@
   <tr>
     <td>
       <div class='contentDiv1'>
-      <table class='table-1 fixer colored'>
+      <table class='table-1 fixed colored'>
         <?php foreach($projectStats as $project):?>
         <tr class='a-center'>
           <td class='a-left'><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id), $project->name);?></td>
diff --git a/module/project/model.php b/module/project/model.php
index 96865bcbdc..364eeb7872 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1050,23 +1050,4 @@ class projectModel extends model
             ->page($pager)
             ->fetchAll();
     }
-
-    /**
-     * Get resolved bugs of a project
-     * 
-     * @param  int    $projectID 
-     * @access public
-     * @return array
-     */
-    public function getResolvedBugs($projectID)
-    {
-        $project  = $this->getById($projectID);
-        $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs('product');
-        return $this->dao->select('id, title, status')->from(TABLE_BUG)
-            ->where('status')->eq('resolved')
-            ->andWhere('resolvedDate')->ge($project->begin)
-            ->andWhere('resolution')->eq('fixed')
-            ->andWhere('product')->in($products)
-            ->fetchAll();
-    }
 }
diff --git a/module/release/control.php b/module/release/control.php
index d8131e2673..9b72338a77 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -93,7 +93,6 @@ class release extends control
         }
         $this->loadModel('story');
         $this->loadModel('bug');
-        $this->loadModel('project');
         $this->loadModel('build');
 
         /* Get release and build. */
@@ -104,7 +103,7 @@ class release extends control
         /* Get stories and bugs. */
         $orderBy = 'status_asc, stage_asc, id_desc';
         $stories = $this->story->getProjectStories($build->project, $orderBy);
-        $bugs    = $this->project->getResolvedBugs($build->project); 
+        $bugs    = $this->bug->getProjectBugs($build->project); 
 
         $this->view->header->title = $this->lang->release->edit;
         $this->view->position[]    = $this->lang->release->edit;
@@ -188,7 +187,7 @@ class release extends control
         if(!empty($build))
         {
             $stories = $this->loadModel('story')->getProjectStories($build->project, $orderBy);
-            $bugs    = $this->loadModel('project')->getResolvedBugs($build->project);
+            $bugs    = $this->bug->getProjectBugs($build->project);
         }
         $this->view->productID = $productID;
         $this->view->stories   = $stories;
diff --git a/module/release/css/common.css b/module/release/css/common.css
new file mode 100755
index 0000000000..e8abbee4f8
--- /dev/null
+++ b/module/release/css/common.css
@@ -0,0 +1,3 @@
+.mainTable  { width:100%; border:none}
+.headTable  { width:100%; height:30px; margin:0px;}
+.contentDiv { height:195px; overflow-y:auto}
diff --git a/module/release/view/ajaxgetstoriesandbugs.html.php b/module/release/view/ajaxgetstoriesandbugs.html.php
index e069d20433..9d7cfbf9ca 100644
--- a/module/release/view/ajaxgetstoriesandbugs.html.php
+++ b/module/release/view/ajaxgetstoriesandbugs.html.php
@@ -1,45 +1,78 @@
 <th class='rowhead'><?php echo $lang->release->linkStoriesAndBugs;?></th>
 <td>
   <div class="w-p90">
-    <div class='half-left' style="height:225px; overflow-y:auto">
-      <table class='table-1 fixed'>
-        <caption><?php echo $lang->release->linkStories;?></caption>
-        <tr>
-          <th class='w-id'><?php echo $lang->idAB;?></th>
-          <th><?php echo $lang->story->title;?></th>
-          <th class='w-hour'><?php echo $lang->statusAB;?></th>
-          <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+
+    <div class='half-left'>
+      <table class='mainTable'>
+        <tr style='border-bottom:none'>
+          <td style='border-bottom:none; padding:0px'>
+            <table class='headTable'>
+              <caption><?php echo $lang->release->linkStories;?></caption>
+              <tr>
+                <th class='w-id a-left'><?php echo html::selectAll('story', 'checkbox') . $lang->idAB;?></th>
+                <th><?php echo $lang->story->title;?></th>
+                <th class='w-hour'><?php echo $lang->statusAB;?></th>
+                <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+              </tr>
+            </table>
+          </td>
         </tr>
-        <?php foreach($stories as $storyID => $story):?>
-        <?php $storyLink = $this->createLink('story', 'view', "storyID=$storyID");?>
-        <tr class='a-center'>
-          <td id='story'><input type='checkbox' name='stories[]' value="<?php echo $storyID;?>" <?php if($story->stage == 'developed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
-          <td id='preview<?php echo $story->id;?>' class='a-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
-          <td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
-          <td><?php echo $lang->story->stageList[$story->stage];?></td>
+        <tr style='border-bottom:none'>
+          <td style='border-bottom:none; padding:0px'>
+            <div class='contentDiv'>
+              <table class='f-left table-1 fixed'>
+                <?php foreach($stories as $storyID => $story):?>
+                <?php $storyLink = $this->createLink('story', 'view', "storyID=$storyID");?>
+                <tr class='a-center'>
+                  <td id='story' class='w-id a-left'>
+                    <input type='checkbox' name='stories[]' value="<?php echo $storyID;?>" <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?>
+                  </td>
+                  <td id='preview<?php echo $story->id;?>' class='a-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
+                  <td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
+                  <td class='w-80px'><?php echo $lang->story->stageList[$story->stage];?></td>
+                </tr>
+                <?php endforeach;?>
+              </table>
+            </div>
+          </td>
         </tr>
-        <?php endforeach;?>
-        <tr class='a-center'><td><?php echo html::selectAll('story', 'checkbox') . $lang->selectAll;?></td>
       </table>
     </div>
-    <div class='half-right' style="height:225px; overflow-y:auto">
-      <table class='table-1 fixed'>
-        <caption><?php echo $lang->release->linkBugs;?></caption>
-        <tr>
-          <th class='w-id'>       <?php echo $lang->idAB;?></th>
-          <th><?php echo $lang->bug->title;?></th>
-          <th class='w-100px'><?php echo $lang->bug->status;?></th>
+
+    <div class='half-right'>
+      <table class='mainTable'>
+        <tr style='border-bottom:none'>
+          <td style='border-bottom:none; padding:0px'>
+            <table class='headTable'>
+              <caption><?php echo $lang->release->linkBugs;?></caption>
+              <tr>
+                <th class='w-id a-left'><?php echo html::selectAll('bug', 'checkbox') . $lang->idAB;?></th>
+                <th><?php echo $lang->bug->title;?></th>
+                <th class='w-100px'><?php echo $lang->bug->status;?></th>
+              </tr>
+            </table>
+          </td>
         </tr>
-        <?php foreach($bugs as $bug):?>
-        <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id");?>
-        <tr class='a-center'>
-          <td id='bug'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" checked> <?php echo sprintf('%03d', $bug->id);?></td>
-          <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
-          <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+        <tr style='border-bottom:none'>
+          <td style='border-bottom:none; padding:0px'>
+            <div class='contentDiv'>
+              <table class='f-left table-1 fixed'>
+                <?php foreach($bugs as $bug):?>
+                <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id");?>
+                <tr class='a-center'>
+                  <td class='w-id a-left' id='bug'>
+                    <input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'closed' or $bug->status == 'resolved') echo "checked"; ?>> <?php echo sprintf('%03d', $bug->id);?>
+                  </td>
+                  <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
+                  <td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
+                </tr>
+                <?php endforeach;?>
+              </table>
+            </div>
+          </td>
         </tr>
-        <?php endforeach;?>
-        <tr class='a-center'><td><?php echo html::selectAll('bug', 'checkbox', true) . $lang->selectAll;?></td></tr>
       </table>
     </div>
+
   </div>
 </td>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index 2f07a838b5..6e40b0bc7b 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -32,46 +32,77 @@
       <th class='rowhead'><?php echo $lang->release->linkStoriesAndBugs;?></th>
       <td>
         <div class="w-p90">
-          <div class='half-left' style="height:225px; overflow-y:auto">
-            <table class='table-1 fixed'>
-            <caption><?php echo $lang->release->linkStories;?></caption>
-              <tr>
-                <th class='w-id'><?php echo $lang->idAB;?></th>
-                <th><?php echo $lang->story->title;?></th>
-                <th class='w-hour'><?php echo $lang->statusAB;?></th>
-                <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+
+          <div class='half-left'>
+            <table class='mainTable'>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <table class='headTable'>
+                    <caption><?php echo $lang->release->linkStories;?></caption>
+                    <tr>
+                      <th class='w-id a-left'><?php echo html::selectAll('story', 'checkbox') . $lang->idAB;?></th>
+                      <th><?php echo $lang->story->title;?></th>
+                      <th class='w-hour'><?php echo $lang->statusAB;?></th>
+                      <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+                    </tr>
+                  </table>
+                </td>
               </tr>
-              <?php foreach($stories as $key => $story):?>
-              <?php
-              $storyLink = $this->createLink('story', 'view', "storyID=$story->id");
-              ?>
-              <tr class='a-center'>
-                <td><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if(strpos($release->stories, $story->id) !== false) echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
-                <td class='a-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
-                <td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
-                <td><?php echo $lang->story->stageList[$story->stage];?></td>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <div class='contentDiv'>
+                    <table class='f-left table-1 fixed'>
+                      <?php foreach($stories as $key => $story):?>
+                      <?php
+                      $storyLink = $this->createLink('story', 'view', "storyID=$story->id");
+                      ?>
+                      <tr class='a-center'>
+                        <td id='story' class='w-id a-left'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if(strpos($release->stories, $story->id) !== false) echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
+                        <td class='a-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
+                        <td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
+                        <td class='w-80px'><?php echo $lang->story->stageList[$story->stage];?></td>
+                      </tr>
+                      <?php endforeach;?>
+                    </table>
+                  </div>
+                </td>
               </tr>
-              <?php endforeach;?>
             </table>
           </div>
-          <div class='half-right' style="height:225px; overflow-y:auto">
-            <table class='table-1 fixed'>
-              <caption><?php echo $lang->release->linkBugs;?></caption>
-              <tr>
-                <th class='w-id'>       <?php echo $lang->idAB;?></th>
-                <th><?php echo $lang->bug->title;?></th>
-                <th class='w-100px'><?php echo $lang->bug->status;?></th>
+
+          <div class='half-right'>
+            <table class='mainTable'>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <table class='headTable'>
+                    <caption><?php echo $lang->release->linkBugs;?></caption>
+                    <tr>
+                      <th class='w-id a-left'><?php echo html::selectAll('bug', 'checkbox') . $lang->idAB;?></th>
+                      <th><?php echo $lang->bug->title;?></th>
+                      <th class='w-100px'><?php echo $lang->bug->status;?></th>
+                    </tr>
+                  </table>
+                </td>
               </tr>
-              <?php foreach($bugs as $bug):?>
-              <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id");?>
-              <tr class='a-center'>
-                <td><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if(strpos($release->bugs, $bug->id) !== false) echo 'checked';?>> <?php echo sprintf('%03d', $bug->id);?></td>
-                <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
-                <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+              <tr style='border-bottom:none'>
+                <td style='border-bottom:none; padding:0px'>
+                  <div class='contentDiv'>
+                    <table class='f-left table-1 fixed'>
+                      <?php foreach($bugs as $bug):?>
+                      <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id");?>
+                      <tr class='a-center'>
+                        <td id='bug' class='w-id a-left'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if(strpos($release->bugs, $bug->id) !== false) echo 'checked';?>> <?php echo sprintf('%03d', $bug->id);?></td>
+                        <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
+                        <td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
+                      </tr>
+                      <?php endforeach;?>
+                    </table>
+                  </div>
+                </td>
               </tr>
-              <?php endforeach;?>
             </table>
           </div>
+
         </div>
       </td>
     </tr>