From b8605a5f71a03e0ef5e8dbefc2ffb36490667aca Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Wed, 11 Apr 2018 10:55:56 +0800
Subject: [PATCH] * Refact browse page of release.

---
 module/productplan/view/browse.html.php |  2 +-
 module/release/css/browse.css           |  2 +-
 module/release/view/browse.html.php     | 31 +++++++++++++------------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index dc6301e0d4..c07c2764bc 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -49,7 +49,7 @@
           <?php endif;?>
           <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
         </th>
-        <th class='w-140px'>  <?php common::printOrderLink('title', $orderBy, $vars, $lang->productplan->title);?></th>
+        <th class='w-140px'><?php common::printOrderLink('title', $orderBy, $vars, $lang->productplan->title);?></th>
         <?php if($this->session->currentProductType != 'normal'):?>
         <th class='w-100px'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->product->branch);?></th>
         <?php endif;?>
diff --git a/module/release/css/browse.css b/module/release/css/browse.css
index b99367c33c..68ea34da67 100644
--- a/module/release/css/browse.css
+++ b/module/release/css/browse.css
@@ -1 +1 @@
-#releaseList td, tr, th{ border:1px solid #E4E4E4;}
+#releaseList {font-size: 13px;}
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 70177cedc0..efba1bed14 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -17,34 +17,31 @@
   <div class="btn-toolbar pull-left">
     <span class='btn btn-link btn-active-text'>
       <span class='text'><?php echo $lang->release->browse;?></span>
-      <?php if($product->type !== 'normal'):?>
-      <span class='label label-light label-badge'><?php echo $branches[$branch];?></span>
-      <?php endif;?>
     </span>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printIcon('release', 'create', "product=$product->id&branch=$branch");?>
+    <?php common::printIcon('release', 'create', "product=$product->id&branch=$branch", '', 'button', 'plus', '', 'btn-primary');?>
   </div>
 </div>
 <div id="mainContent">
-  <table class="main-table table has-sort-head table-fixed tablesorter" id='releaseList'>
+  <table class="main-table table has-sort-head" id='releaseList'>
     <thead>
       <tr>
         <th class='w-id'><?php echo $lang->release->id;?></th>
         <th><?php echo $lang->release->name;?></th>
         <th><?php echo $lang->release->build;?></th>
         <?php if($product->type != 'normal'):?>
-        <th class='w-100px'><?php echo $lang->product->branch;?></th>
+        <th class='text-center w-100px'><?php echo $lang->product->branch;?></th>
         <?php endif;?>
-        <th class='w-100px'><?php echo $lang->release->date;?></th>
-        <th class='w-100px'><?php echo $lang->release->status;?></th>
-        <th class='w-200px'><?php echo $lang->actions;?></th>
+        <th class='text-center w-100px'><?php echo $lang->release->date;?></th>
+        <th class='text-center w-100px'><?php echo $lang->release->status;?></th>
+        <th class='c-actions-3'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
       <?php foreach($releases as $release):?>
       <tr>
-        <td class='text-center'><?php echo $release->id;?></td>
+        <td><?php echo $release->id;?></td>
         <td><?php echo html::a(inlink('view', "release=$release->id"), $release->name);?></td>
         <td title='<?php echo $release->buildName?>'><?php echo html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank');?></td>
         <?php if($product->type != 'normal'):?>
@@ -53,6 +50,15 @@
         <td class='text-center'><?php echo $release->date;?></td>
         <td class='text-center'><?php echo $lang->release->statusList[$release->status];?></td>
         <td class='c-actions'>
+          <div class='more'>
+          <?php
+          if(common::hasPriv('release', 'delete', $release))
+          {
+              $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes");
+              echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->release->delete}'");
+          }
+          ?>
+          </div>
           <?php
           if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), '<i class="icon-link"></i> ', '', "class='btn' title='{$lang->release->linkStory}'");
           if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"),   '<i class="icon-bug"></i> ',  '', "class='btn' title='{$lang->release->linkBug}'");
@@ -62,11 +68,6 @@
               echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"),   '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ',  'hiddenwin', "class='btn' title='{$lang->release->changeStatusList[$changedStatus]}'");
           }
           common::printIcon('release', 'edit',   "release=$release->id", $release, 'list');
-          if(common::hasPriv('release', 'delete', $release))
-          {
-              $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes");
-              echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->release->delete}'");
-          }
           ?>
         </td>
       </tr>