From 27466d9cd83faea7d8cdfffd033a4c04c87ab07f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Mon, 7 May 2018 15:04:28 +0800
Subject: [PATCH] * Task#3921

---
 module/project/control.php         | 12 ++++-
 module/project/css/build.css       |  4 ++
 module/project/lang/zh-cn.php      |  2 +-
 module/project/view/build.html.php | 83 +++++++++++++++++++-----------
 4 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 9159e20402..a3f0ac8ab6 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -772,9 +772,17 @@ class project extends control
         $this->view->position[] = html::a(inlink('browse', "projectID=$projectID"), $project->name);
         $this->view->position[] = $this->lang->project->build;
 
+        $builds = $this->loadModel('build')->getProjectBuilds((int)$projectID);
+        $projectBuilds = array();
+        if(!empty($builds))
+        {
+            foreach($builds as $build) $projectBuilds[$build->product][] = $build;
+        }
+
         /* Get builds. */
-        $this->view->builds = $this->loadModel('build')->getProjectBuilds((int)$projectID);
-        $this->view->users  = $this->loadModel('user')->getPairs('noletter');
+        $this->view->users         = $this->loadModel('user')->getPairs('noletter');
+        $this->view->buildsTotal   = count($builds);
+        $this->view->projectBuilds = $projectBuilds;
 
         $this->display();
     }
diff --git a/module/project/css/build.css b/module/project/css/build.css
index e69de29bb2..30e418bdfa 100644
--- a/module/project/css/build.css
+++ b/module/project/css/build.css
@@ -0,0 +1,4 @@
+.table-group-btns {width: 200px;}
+.fixed-header-copy .group-menu .btn {background-color: transparent; color: #fff;}
+.fixed-header-copy .group-menu .btn .icon {background: transparent!important; color: #fff; opacity: .5;}
+.icon-caret-right.text-muted {color: #CBD0DB;}
\ No newline at end of file
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index e2822e671b..70253b5cbe 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -113,7 +113,7 @@ $lang->project->story             = '需求列表';
 $lang->project->bug               = 'Bug列表';
 $lang->project->dynamic           = '动态';
 $lang->project->latestDynamic     = '最新动态';
-$lang->project->build             = '版本列表';
+$lang->project->build             = '所有版本';
 $lang->project->testtask          = '测试任务';
 $lang->project->burn              = '燃尽图';
 $lang->project->baseline          = '基准线';
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 50d4d18e67..1870d017f9 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -12,11 +12,15 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('confirmDelete', $lang->build->confirmDelete)?>
-<div id="mainMenu" class="clearfix">
+<div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolbar pull-left">
+    <div class="pull-left table-group-btns">
+      <button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->project->treeLevel['root'];?> <i class="icon-fold-all"> </i></button>
+      <button type="button" class="btn btn-link group-expand-all"><?php echo $lang->project->treeLevel['all'];?> <i class="icon-unfold-all"> </i></button>
+    </div>
     <span class='btn btn-link btn-active-text'>
       <span class='text'><?php echo $lang->project->build;?></span>
-      <span class='label label-light label-badge'><?php echo count($builds);?></span>
+      <span class='label label-light label-badge'><?php echo count($buildsTotal);?></span>
     </span>
   </div>
   <div class="btn-toolbar pull-right">
@@ -24,42 +28,50 @@
   </div>
 </div>
 <div id="mainContent">
-  <div class='main-table'>
-    <table class="table" id='buildList'>
+  <div class='main-table' data-ride="table" data-checkable="false" data-group="true">
+    <table class="table table-grouped text-center" id='buildList'>
       <thead>
-        <tr class='text-center'>
-          <th class='w-id'><?php echo $lang->build->id;?></th>
-          <th class='w-120px'><?php echo $lang->build->product;?></th>
-          <th><?php echo $lang->build->name;?></th>
-          <th><?php echo $lang->build->scmPath;?></th>
-          <th><?php echo $lang->build->filePath;?></th>
-          <th class='w-100px'><?php echo $lang->build->date;?></th>
-          <th class='w-user'><?php echo $lang->build->builder;?></th>
-          <th class='c-actions-3'><?php echo $lang->actions;?></th>
+        <tr class="divider">
+          <th class="c-side"><?php echo $lang->build->product;?></th>
+          <th class="c-id-sm"><?php echo $lang->build->id;?></th>
+          <th class="c-name"><?php echo $lang->build->name;?></th>
+          <th class="c-url"><?php echo $lang->build->scmPath;?></th>
+          <th class="c-url"><?php echo $lang->build->filePath;?></th>
+          <th class="c-date"><?php echo $lang->build->date;?></th>
+          <th class="c-user"><?php echo $lang->build->builder;?></th>
+          <th class="c-actions-3"><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
-        <?php foreach($builds as $build):?>
-        <tr>
-          <td class='text-center'><?php echo $build->id;?></td>
-          <td class='nobr' title='<?php echo $build->productName?>'><?php echo $build->productName;?></td>
-          <td class='nobr'>
+        <?php foreach($projectBuilds as $projectID => $builds):?>
+        <?php $total = count($builds);?>
+        <?php foreach($builds as $index => $build):?>
+        <?php $trClass = $index == 0 ? 'divider-top' : '';?>
+        <tr data-id="<?php echo $projectID;?>" class="<?php echo $trClass;?>">
+          <?php if($index == 0):?>
+          <td rowspan="<?php echo $total;?>" class="c-side text-left group-toggle">
+            <a title="<?php echo $build->productName;?>" class="text-primary"><i class="icon-caret-down"></i> <?php echo $build->productName;?></a>
+            <div class="small"><span class="text-muted"><?php echo $lang->project->build;?></span> <?php echo $total;?></div>
+          </td>
+          <?php endif;?>
+          <td class="c-id-sm text-muted"><?php echo $build->id;?></td>
+          <td class="c-name">
             <?php if($build->branchName) echo "<span class='label label-info label-badge'>{$build->branchName}</span>"?>
             <?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?>
           </td>
-          <td title="<?php echo $build->scmPath?>"><?php  echo strpos($build->scmPath,  'http') === 0 ? html::a($build->scmPath)  : $build->scmPath;?></td>
-          <td title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
-          <td><?php echo $build->date?></td>
-          <td><?php echo $users[$build->builder]?></td>
-          <td class='c-actions'>
+          <td class="c-url" title="<?php echo $build->scmPath?>"><?php  echo strpos($build->scmPath,  'http') === 0 ? html::a($build->scmPath)  : $build->scmPath;?></td>
+          <td class="c-url" title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
+          <td class="c-date"><?php echo $build->date?></td>
+          <td class="c-user em"><?php echo $users[$build->builder]?></td>
+          <td class="c-actions">
             <div class='more'>
-              <?php
-              if(common::hasPriv('build',  'delete', $build))
-              {
-                  $deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes");
-                  echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->build->delete}'");
-              }
-              ?>
+            <?php
+            if(common::hasPriv('build',  'delete', $build))
+            {
+                $deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes");
+                echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->build->delete}'");
+            }
+            ?>
             </div>
             <?php
             if(common::hasPriv('build', 'linkstory') and common::hasPriv('build', 'view'))
@@ -73,6 +85,17 @@
             ?>
           </td>
         </tr>
+        <?php if(($index + 1) == $total):?>
+        <tr class="group-toggle group-summary divider hidden" data-id="<?php echo $projectID;?>">
+          <td class="c-side text-left">
+            <a title="<?php echo $build->productName;?>"><i class="icon-caret-right text-muted"></i> <?php echo $build->productName;?></a>
+          </td>
+          <td colspan="7" class="text-left">
+            <div class="small with-padding"><span class="text-muted"><?php echo $lang->project->build;?></span> <?php echo $total;?></div>
+          </td>
+        </tr>
+        <?php endif;?>
+        <?php endforeach;?>
         <?php endforeach;?>
       </tbody>
     </table>