From 8dc609e4a0d37e73a1ee0ec7f889cd56da0149cd Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 13 Dec 2022 14:15:39 +0800
Subject: [PATCH]  * code task #79859,79858,79857,79856,79855,79854.

---
 module/build/css/view.css                | 16 ++++++
 module/build/view/view.html.php          | 62 ++++++++++++------------
 module/productplan/css/view.css          |  2 +-
 module/projectrelease/css/view.css       | 12 +++++
 module/projectrelease/view/view.html.php | 54 ++++++++++-----------
 module/release/css/view.css              | 12 +++++
 module/release/view/view.html.php        | 56 ++++++++++-----------
 7 files changed, 126 insertions(+), 88 deletions(-)

diff --git a/module/build/css/view.css b/module/build/css/view.css
index 0789a2c0c3..baaa980afa 100644
--- a/module/build/css/view.css
+++ b/module/build/css/view.css
@@ -7,3 +7,19 @@
 .body-modal #mainContent {min-height: 200px;}
 td.article-content{overflow:auto !important;}
 td.c-build{white-space: nowrap; overflow:hidden;}
+
+#stories th, #stories td{padding-left:16px;}
+#stories .c-estimate{width:90px; text-align:right}
+#stories .c-status{width:120px}
+#stories .c-stage{width:130px; text-align:left;}
+#bugs .c-status{width:100px;}
+#bugs .c-build{width:160px; text-align:left}
+#bugs .c-user{width:120px;}
+#bugs .c-date{width:130px;}
+#bugs .c-actions-1{width:60px;}
+#generatedBugs .c-id {width:60px;}
+#generatedBugs .c-severity {width:70px;}
+#generatedBugs .c-status {width:100px;}
+#generatedBugs .c-build {width:160px; text-align:left}
+#generatedBugs .c-user {width:100px;}
+#generatedBugs .c-date {width:120px;}
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 036a9518f5..9ccf26e647 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -88,15 +88,15 @@ tbody tr td:first-child input {display: none;}
                   <?php endif;?>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
+                <th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+                <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
                 <?php if($childBuilds):?>
                 <th class='c-build w-200px text-left'><?php echo $lang->build->linkedBuild;?></th>
                 <?php endif;?>
-                <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-                <th class='c-id text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-                <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-                <th class='c-status'><?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
+                <th class='c-user'>     <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+                <th class='c-estimate'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+                <th class='c-stage'>   <?php common::printOrderLink('stage',     $orderBy, $vars, $lang->story->stageAB);?></th>
                 <th class='c-actions-1'><?php echo $lang->actions?></th>
               </tr>
             </thead>
@@ -125,11 +125,6 @@ tbody tr td:first-child input {display: none;}
                   <?php printf('%03d', $story->id);?>
                   <?php endif;?>
                 </td>
-                <td>
-                  <?php if($story->pri):?>
-                  <span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span>
-                  <?php endif;?>
-                </td>
                 <td class='text-left nobr' title='<?php echo $story->title?>'>
                   <?php
                   if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
@@ -147,17 +142,20 @@ tbody tr td:first-child input {display: none;}
                   }
                   ?>
                 </td>
+                <td>
+                  <?php if($story->pri):?>
+                  <span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span>
+                  <?php endif;?>
+                </td>
+                <td>
+                  <span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
+                </td>
                 <?php if($childBuilds):?>
                 <td class='c-build text-left' title='<?php echo $buildName?>'><?php echo $buildName;?></td>
                 <?php endif;?>
                 <td><?php echo zget($users, $story->openedBy);?></td>
-                <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
-                <td>
-                  <span class='status-story status-<?php echo $story->status;?>'>
-                    <?php echo $this->processStatus('story', $story);?>
-                  </span>
-                </td>
-                <td><?php echo $lang->story->stageList[$story->stage];?></td>
+                <td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
+                <td class='c-stage'><?php echo $lang->story->stageList[$story->stage];?></td>
                 <td class='c-actions'>
                   <?php
                   if($canBeChanged and common::hasPriv($module, 'unlinkStory'))
@@ -208,14 +206,14 @@ tbody tr td:first-child input {display: none;}
                   <?php endif;?>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='text-left'>  <?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
-                <th class='c-status'>   <?php common::printOrderLink('status',       $orderBy, $vars, $lang->bug->status);?></th>
+                <th class='text-left'><?php common::printOrderLink('title',  $orderBy, $vars, $lang->bug->title);?></th>
+                <th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->status);?></th>
                 <?php if($childBuilds):?>
-                <th class='c-build w-200px text-left'><?php echo $lang->build->linkedBuild?></th>
+                <th class='c-build'><?php echo $lang->build->linkedBuild?></th>
                 <?php endif;?>
                 <th class='c-user'>     <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-date'>     <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-                <th class='c-user'>     <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
+                <th class='c-user'>     <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
                 <th class='c-date'>     <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
                 <th class='c-actions-1'><?php echo $lang->actions?></th>
               </tr>
@@ -254,7 +252,7 @@ tbody tr td:first-child input {display: none;}
                   </span>
                 </td>
                 <?php if($childBuilds):?>
-                <td class='c-build text-left' title='<?php echo $buildName?>'><?php echo $buildName;?></td>
+                <td class='c-build' title='<?php echo $buildName?>'><?php echo $buildName;?></td>
                 <?php endif;?>
                 <td><?php echo zget($users, $bug->openedBy);?></td>
                 <td><?php echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);?></td>
@@ -297,14 +295,14 @@ tbody tr td:first-child input {display: none;}
             <?php $vars = "buildID={$build->id}&type=generatedBug&link=$link&param=$param&orderBy=%s";?>
             <thead>
               <tr class='text-center'>
-                <th class='c-id text-left'><?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
-                <th class='c-status' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-                <th class='text-left'><?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
-                <th class='c-status'> <?php common::printOrderLink('status',       $orderBy, $vars, $lang->bug->status);?></th>
-                <th class='c-build w-200px text-left'><?php echo $lang->bug->openedBuild;?></th>
+                <th class='c-id text-left'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
+                <th class='text-left'><?php common::printOrderLink('title',   $orderBy, $vars, $lang->bug->title);?></th>
+                <th class='c-severity' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
+                <th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->status);?></th>
+                <th class='c-build'>  <?php echo $lang->bug->openedBuild;?></th>
                 <th class='c-user'>   <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-date'>   <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-                <th class='c-user'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
+                <th class='c-user'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
                 <th class='c-date'>   <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
               </tr>
             </thead>
@@ -324,6 +322,9 @@ tbody tr td:first-child input {display: none;}
               <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
               <tr>
                 <td class='text-left'><?php printf('%03d', $bug->id);?></td>
+                <td class='text-left nobr' title='<?php echo $bug->title?>'>
+                    <?php echo html::a($bugLink, $bug->title, '', isonlybody() ? "data-width='1000'" : "class='iframe' data-width='1000'");?>
+                </td>
                 <td class='c-severity'>
                   <?php if($hasCustomSeverity):?>
                   <span class='label-severity-custom' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
@@ -331,9 +332,6 @@ tbody tr td:first-child input {display: none;}
                   <span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?>'></span>
                   <?php endif;?>
                 </td>
-                <td class='text-left nobr' title='<?php echo $bug->title?>'>
-                    <?php echo html::a($bugLink, $bug->title, '', isonlybody() ? "data-width='1000'" : "class='iframe' data-width='1000'");?>
-                </td>
                 <td>
                   <span class='status-bug status-<?php echo $bug->status?>'>
                     <?php echo $this->processStatus('bug', $bug);?>
@@ -343,7 +341,7 @@ tbody tr td:first-child input {display: none;}
                 $openedBuilds = '';
                 foreach(explode(',', $bug->openedBuild) as $buildID) $openedBuilds .= ($buildID == 'trunk' ? 'Trunk' : zget($buildPairs, $buildID, '')) . ' ';
                 ?>
-                <td class='c-build text-left' title='<?php echo $openedBuilds;?>'><?php echo $openedBuilds;?></td>
+                <td class='c-build' title='<?php echo $openedBuilds;?>'><?php echo $openedBuilds;?></td>
                 <td><?php echo zget($users, $bug->openedBy);?></td>
                 <td><?php echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);?></td>
                 <td><?php echo zget($users, $bug->resolvedBy);?></td>
diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css
index 64fc550a1c..b924713e90 100644
--- a/module/productplan/css/view.css
+++ b/module/productplan/css/view.css
@@ -34,5 +34,5 @@ ol, ul {padding-left: 20px;}
 #actionsBox a:last-of-type + .divider {display: none;}
 #actionsBox div.divider:first-child {display: none;}
 
-#bugs th.c-pri, #bugs th.c-actions {width:72px !important;}
+#bugs th.c-pri, #bugs th.c-actions {width:70px !important;}
 #bugs th.c-status, #bugs th.c-user {width:120px !important;}
diff --git a/module/projectrelease/css/view.css b/module/projectrelease/css/view.css
index a35a23f770..b229853430 100644
--- a/module/projectrelease/css/view.css
+++ b/module/projectrelease/css/view.css
@@ -10,3 +10,15 @@
 ol, ul {padding-left: 20px;}
 .c-id {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 td.c-build{white-space: nowrap; overflow:hidden;}
+
+#stories th, #stories td{padding-left:16px;}
+#stories .c-build{width:160px; text-align:left;}
+#stories .c-status{width:120px;}
+#stories .c-stage{width:130px; text-align:left;}
+#stories .c-estimate{width:90px; text-align:right;}
+#bugs .c-build{width:160px; text-align:left;}
+#bugs .c-user{width:120px;}
+#bugs .c-date{width:130px;}
+#leftBugs .c-build{width:160px; text-align:left;}
+#leftBugs .c-user{width:120px;}
+#leftBugs .c-date{width:160px;}
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index d8c5b7d6cd..7475a422a2 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -60,7 +60,7 @@
                 ?>
                 <?php $vars = "releaseID={$release->id}&type=story&link=$link&param=$param&orderBy=%s";?>
                 <thead>
-                  <tr>
+                  <tr class='text-center'>
                     <th class='c-id text-left'>
                       <?php if(($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
                       <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -69,17 +69,17 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
+                    <th class="text-left"><?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
                     <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
-                    <th class="text-left"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
-                    <th class='c-build w-200px text-left'><?php echo $lang->build->linkedBuild;?></th>
-                    <th class='c-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-                    <th class='w-80px text-right' style='padding-right:20px'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-                    <th class='w-90px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-                    <th class='w-100px'><?php common::printOrderLink('stage',  $orderBy, $vars, $lang->story->stageAB);?></th>
+                    <th class='c-status'>   <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
+                    <th class='c-build'>    <?php echo $lang->build->linkedBuild;?></th>
+                    <th class='c-user'>     <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+                    <th class='c-estimate'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+                    <th class='c-stage'>    <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
                     <th class='c-actions-1'><?php echo $lang->actions?></th>
                   </tr>
                 </thead>
-                <tbody>
+                <tbody class='text-center'>
                   <?php foreach($stories as $storyID => $story):?>
                   <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id&version=0&param={$this->session->project}", '', true);?>
                   <tr>
@@ -92,20 +92,20 @@
                       <?php endif;?>
                       <?php echo sprintf('%03d', $story->id);?>
                     </td>
-                    <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
                     <td class='text-left nobr' title='<?php echo $story->title?>'>
                       <?php
                       if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
                       echo html::a($storyLink,$story->title, '', "class='preview'");
                       ?>
                     </td>
-                    <td class='c-build text-left' title='<?php echo $story->buildName?>'><?php echo $story->buildName?></td>
-                    <td><?php echo zget($users, $story->openedBy);?></td>
-                    <td class='text-right' style='padding-right:25px' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
+                    <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
                     <td>
                       <span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
                     </td>
-                    <td><?php echo $lang->story->stageList[$story->stage];?></td>
+                    <td class='c-build text-left' title='<?php echo $story->buildName?>'><?php echo $story->buildName?></td>
+                    <td><?php echo zget($users, $story->openedBy);?></td>
+                    <td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
+                    <td class='c-stage'><?php echo $lang->story->stageList[$story->stage];?></td>
                     <td class='c-actions'>
                       <?php
                       if(common::hasPriv('projectrelease', 'unlinkStory') and $canBeChanged)
@@ -167,14 +167,14 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
-                    <th class='text-left'><?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
-                    <th class='w-100px'>  <?php common::printOrderLink('status',       $orderBy, $vars, $lang->bug->status);?></th>
-                    <th class='c-build w-200px text-left'><?php echo $lang->bug->resolvedBuild;?></th>
+                    <th class='text-left'><?php common::printOrderLink('title',  $orderBy, $vars, $lang->bug->title);?></th>
+                    <th class='w-100px'>  <?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->status);?></th>
+                    <th class='c-build'>  <?php echo $lang->bug->resolvedBuild;?></th>
                     <th class='c-user'>   <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
-                    <th class='w-date'>   <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-                    <th class='c-user'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
-                    <th class='w-100px'>  <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
-                    <th class='w-50px'>   <?php echo $lang->actions;?></th>
+                    <th class='c-date'>   <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->bug->openedDateAB);?></th>
+                    <th class='c-user'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
+                    <th class='c-date'>   <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
+                    <th class='w-60px'>   <?php echo $lang->actions;?></th>
                   </tr>
                 </thead>
                 <tbody class='text-center'>
@@ -259,13 +259,13 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
+                    <th class='text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
                     <th class='w-80px' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-                    <th class='text-left'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
-                    <th class='w-100px'>   <?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
-                    <th class='c-build w-200px text-left'><?php echo $lang->bug->openedBuild;?></th>
-                    <th class='c-user'>    <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-                    <th class='w-150px'>   <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-                    <th class='w-50px'>    <?php echo $lang->actions;?></th>
+                    <th class='w-100px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->status);?></th>
+                    <th class='c-build'><?php echo $lang->bug->openedBuild;?></th>
+                    <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+                    <th class='c-date'> <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->bug->openedDateAB);?></th>
+                    <th class='w-60px'> <?php echo $lang->actions;?></th>
                   </tr>
                 </thead>
                 <?php
@@ -292,6 +292,7 @@
                       <?php endif;?>
                       <?php echo sprintf('%03d', $bug->id);?>
                     </td>
+                    <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
                     <td class='c-severity'>
                       <?php if($hasCustomSeverity):?>
                       <span class='<?php echo 'label-severity-custom';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
@@ -299,7 +300,6 @@
                       <span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?>'></span>
                       <?php endif;?>
                     </td>
-                    <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
                     <td><span class='status-<?php echo $bug->status?>'> <?php echo $this->processStatus('bug', $bug);?></span></td>
                     <?php
                     $openedBuildName = '';
diff --git a/module/release/css/view.css b/module/release/css/view.css
index acc96a13fd..ecdd28df04 100644
--- a/module/release/css/view.css
+++ b/module/release/css/view.css
@@ -11,3 +11,15 @@ ol, ul {padding-left: 20px;}
 .body-modal #mainContent {min-height: 240px;}
 .c-id {width: 110px;}
 td.c-build{white-space: nowrap; overflow:hidden;}
+
+#stories th, #stories td{padding-left:16px;}
+#stories .c-build{width:160px; text-align:left;}
+#stories .c-status{width:120px;}
+#stories .c-stage{width:130px; text-align:left;}
+#stories .c-estimate{width:90px; text-align:right;}
+#bugs .c-build{width:160px; text-align:left;}
+#bugs .c-user{width:120px;}
+#bugs .c-date{width:130px;}
+#leftBugs .c-id{width:90px;}
+#leftBugs .c-build{width:160px; text-align:left;}
+#leftBugs .c-user{width:120px;}
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 63c2073a51..4e080fce23 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -62,7 +62,7 @@
                 ?>
                 <?php $vars = "releaseID={$release->id}&type=story&link=$link&param=$param&orderBy=%s";?>
                 <thead>
-                  <tr>
+                  <tr class='text-center'>
                     <th class='c-id text-left'>
                       <?php if(($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
                       <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -71,17 +71,17 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
+                    <th class="text-left"><?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
                     <th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
-                    <th class="text-left"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
-                    <th class='c-build w-200px text-left'><?php echo $lang->build->linkedBuild;?></th>
-                    <th class='c-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-                    <th class='w-80px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-                    <th class='w-90px text-center'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-                    <th class='w-100px'><?php common::printOrderLink('stage',  $orderBy, $vars, $lang->story->stageAB);?></th>
+                    <th class='c-status'>   <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
+                    <th class='c-build'>    <?php echo $lang->build->linkedBuild;?></th>
+                    <th class='c-user'>     <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+                    <th class='c-estimate'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+                    <th class='c-stage'>    <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
                     <th class='c-actions-1'><?php echo $lang->actions?></th>
                   </tr>
                 </thead>
-                <tbody>
+                <tbody class='text-center'>
                   <?php foreach($stories as $storyID => $story):?>
                   <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
                   <tr>
@@ -94,20 +94,20 @@
                       <?php endif;?>
                       <?php echo sprintf('%03d', $story->id);?>
                     </td>
-                    <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
                     <td class='text-left nobr' title='<?php echo $story->title?>'>
                       <?php
                       if($story->parent > 0) echo "<span class='label label-badge label-light' title='{$lang->story->childrenAB}'>{$lang->story->childrenAB}</span>";
                       echo html::a($storyLink,$story->title, '', "class='preview'");
                       ?>
                     </td>
-                    <td class='c-build text-left' title='<?php echo $story->buildName?>'><?php echo $story->buildName?></td>
-                    <td><?php echo zget($users, $story->openedBy);?></td>
-                    <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
-                    <td class='text-center'>
+                    <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
+                    <td class='c-status'>
                       <span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
                     </td>
-                    <td><?php echo $lang->story->stageList[$story->stage];?></td>
+                    <td class='c-build' title='<?php echo $story->buildName?>'><?php echo $story->buildName?></td>
+                    <td><?php echo zget($users, $story->openedBy);?></td>
+                    <td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
+                    <td class='c-stage'><?php echo $lang->story->stageList[$story->stage];?></td>
                     <td class='c-actions'>
                       <?php
                       if(common::hasPriv('release', 'unlinkStory') and $canBeChanged)
@@ -169,14 +169,14 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
-                    <th class='text-left'><?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
-                    <th class='w-100px'>  <?php common::printOrderLink('status',       $orderBy, $vars, $lang->bug->status);?></th>
-                    <th class='c-build w-200px text-left'><?php echo $lang->bug->resolvedBuild;?></th>
+                    <th class='text-left'><?php common::printOrderLink('title',  $orderBy, $vars, $lang->bug->title);?></th>
+                    <th class='w-100px'>  <?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->status);?></th>
+                    <th class='c-build'>  <?php echo $lang->bug->resolvedBuild;?></th>
                     <th class='c-user'>   <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
-                    <th class='w-date'>   <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-                    <th class='c-user'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
-                    <th class='w-100px'>  <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
-                    <th class='w-50px'>   <?php echo $lang->actions;?></th>
+                    <th class='c-date'>   <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->bug->openedDateAB);?></th>
+                    <th class='c-user'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
+                    <th class='c-date'>   <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
+                    <th class='w-60px'>   <?php echo $lang->actions;?></th>
                   </tr>
                 </thead>
                 <tbody class='text-center'>
@@ -261,13 +261,13 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
+                    <th class='text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
                     <th class='w-80px' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-                    <th class='text-left'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
-                    <th class='w-100px'>   <?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
-                    <th class='c-build w-200px text-left'><?php echo $lang->bug->openedBuild;?></th>
-                    <th class='c-user'>    <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-                    <th class='w-150px'>   <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-                    <th class='w-50px'>    <?php echo $lang->actions;?></th>
+                    <th class='w-100px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->status);?></th>
+                    <th class='c-build'><?php echo $lang->bug->openedBuild;?></th>
+                    <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+                    <th class='w-160px'><?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->bug->openedDateAB);?></th>
+                    <th class='w-60px'> <?php echo $lang->actions;?></th>
                   </tr>
                 </thead>
                 <?php
@@ -294,6 +294,7 @@
                       <?php endif;?>
                       <?php echo sprintf('%03d', $bug->id);?>
                     </td>
+                    <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
                     <td class='c-severity'>
                       <?php if($hasCustomSeverity):?>
                       <span class='<?php echo 'label-severity-custom';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
@@ -301,7 +302,6 @@
                       <span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?>'></span>
                       <?php endif;?>
                     </td>
-                    <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
                     <td><span class='status-<?php echo $bug->status?>'> <?php echo $this->processStatus('bug', $bug);?></span></td>
                     <?php
                     $openedBuildName = '';