From bf326f57ffe72764302cf163ea3f72da9d4ccbd8 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Mon, 16 Apr 2018 16:55:32 +0800
Subject: [PATCH]  * Rewrite view page of product.

---
 module/branch/lang/zh-cn.php       |   1 +
 module/common/lang/zh-cn.php       |   2 +
 module/common/view/action.html.php |  15 ++
 module/file/control.php            |   6 +-
 module/product/control.php         |   8 +
 module/product/css/view.css        |   5 +-
 module/product/lang/zh-cn.php      |  34 +--
 module/product/view/view.html.php  | 336 +++++++++++++++++------------
 8 files changed, 249 insertions(+), 158 deletions(-)

diff --git a/module/branch/lang/zh-cn.php b/module/branch/lang/zh-cn.php
index 3f8d2d374d..2de28a09d4 100644
--- a/module/branch/lang/zh-cn.php
+++ b/module/branch/lang/zh-cn.php
@@ -3,6 +3,7 @@ $lang->branch->common = '分支';
 $lang->branch->manage = '分支管理';
 $lang->branch->sort   = '排序';
 $lang->branch->delete = '分支删除';
+$lang->branch->add    = '添加';
 
 $lang->branch->manageTitle = '%s管理';
 $lang->branch->all         = '所有';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index bea3860fc0..5a4c86a81c 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -59,6 +59,8 @@ $lang->history         = '历史记录';
 $lang->attatch         = '附件';
 $lang->reverse         = '切换顺序';
 $lang->switchDisplay   = '切换显示';
+$lang->expand          = '展开全部';
+$lang->collapse        = '收起';
 $lang->addFiles        = '上传了附件 ';
 $lang->files           = '附件 ';
 $lang->pasteText       = '多项录入';
diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php
index c4e3f45e2c..ae29b021c2 100755
--- a/module/common/view/action.html.php
+++ b/module/common/view/action.html.php
@@ -1,5 +1,9 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
+<?php if(!empty($blockHistory)):?>
+<div class="panel block-histories histories" data-textDiff="<?php echo $lang->action->textDiff;?>" data-original="<?php echo $lang->action->original;?>">
+<?php else:?>
 <div class="detail histories" id='actionbox' data-textDiff="<?php echo $lang->action->textDiff;?>" data-original="<?php echo $lang->action->original;?>">
+<?php endif;?>
   <script>
   $(function()
   {
@@ -17,7 +21,11 @@
       })
   })
   </script>
+  <?php if(!empty($blockHistory)):?>
+  <div class="panel-heading"><div class="panel-title">
+  <?php else:?>
   <div class="detail-title">
+  <?php endif;?>
     <?php echo $lang->history?> &nbsp;
     <button type="button" class="btn btn-mini btn-icon btn-reverse" title='<?php echo $lang->reverse;?>'>
       <i class="icon icon-arrow-up icon-sm"></i>
@@ -27,7 +35,14 @@
     </button>
     <?php if(isset($actionFormLink)) echo common::printCommentIcon($actionFormLink);?>
   </div>
+  <?php if(!empty($blockHistory)):?>
+  </div>
+  <?php endif;?>
+  <?php if(!empty($blockHistory)):?>
+  <div class="panel-body">
+  <?php else:?>
   <div class="detail-content">
+  <?php endif;?>
     <ol class='histories-list'>
       <?php $i = 1; ?>
       <?php foreach($actions as $action):?>
diff --git a/module/file/control.php b/module/file/control.php
index 3dbdaf656b..28980323e4 100644
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -21,7 +21,7 @@ class file extends control
      * @access public
      * @return void
      */
-    public function buildForm($fileCount = 1, $percent = 0.9, $filesName = 'files', $labelsName = 'labels')
+    public function buildForm()
     {
         if(!file_exists($this->file->savePath))
         {
@@ -34,10 +34,6 @@ class file extends control
             return false;
         }
 
-        $this->view->fileCount  = $fileCount;
-        $this->view->percent    = $percent;
-        $this->view->filesName  = $filesName;
-        $this->view->labelsName = $labelsName;
         $this->display();
     }
 
diff --git a/module/product/control.php b/module/product/control.php
index 2d272c7298..862a0ee779 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -394,6 +394,11 @@ class product extends control
         $product->desc = $this->loadModel('file')->setImgSize($product->desc);
         if(!$product) die(js::error($this->lang->notFound) . js::locate('back'));
 
+        $actions = $this->dao->select('*')->from(TABLE_ACTION)->where('product')->like("%,$productID,%")->orderBy('date_desc')->limit(6)->fetchAll();
+        if($actions) $this->loadModel('action')->transformActions($actions);
+
+        $releases = $this->dao->select('*')->from(TABLE_RELEASE)->where('deleted')->eq(0)->andWhere('product')->eq($productID)->orderBy('date')->fetchAll();
+
         $this->view->title      = $product->name . $this->lang->colon . $this->lang->product->view;
         $this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $product->name);
         $this->view->position[] = $this->lang->product->view;
@@ -402,6 +407,9 @@ class product extends control
         $this->view->users      = $this->user->getPairs('noletter');
         $this->view->groups     = $this->loadModel('group')->getPairs();
         $this->view->lines      = array('') + $this->loadModel('tree')->getLinePairs();
+        $this->view->branches   = $this->loadModel('branch')->getPairs($productID);
+        $this->view->actions    = $actions;
+        $this->view->releases   = $releases;
 
         $this->display();
     }
diff --git a/module/product/css/view.css b/module/product/css/view.css
index 03e5de0542..5d3502e33c 100644
--- a/module/product/css/view.css
+++ b/module/product/css/view.css
@@ -1 +1,4 @@
-.outer .main-side > fieldset {padding-right: 0px;}
+.branch-list {padding-left: 0; margin: 0;}
+.branch-list > li {float: left; list-style: none; width: 50%; margin: 5px 0;}
+.data-basic.table-data tbody > tr > th {width: 80px;}
+.block-release .panel-body, .block-dynamic .panel-body {height: 224px; overflow: auto;}
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 03f305bb7e..cf7c10315b 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -56,20 +56,26 @@ $lang->product->confirmDelete   = " 您确定删除该{$lang->productCommon}吗
 $lang->product->errorNoProduct = "还没有创建{$lang->productCommon}！";
 $lang->product->accessDenied   = "您无权访问该{$lang->productCommon}";
 
-$lang->product->id        = "编号";
-$lang->product->name      = "{$lang->productCommon}名称";
-$lang->product->code      = "{$lang->productCommon}代号";
-$lang->product->line      = '产品线';
-$lang->product->order     = '排序';
-$lang->product->type      = "{$lang->productCommon}类型";
-$lang->product->status    = '状态';
-$lang->product->desc      = "{$lang->productCommon}描述";
-$lang->product->PO        = "{$lang->productCommon}负责人";
-$lang->product->QD        = '测试负责人';
-$lang->product->RD        = '发布负责人';
-$lang->product->acl       = '访问控制';
-$lang->product->whitelist = '分组白名单';
-$lang->product->branch    = '所属%s';
+$lang->product->id            = "编号";
+$lang->product->name          = "{$lang->productCommon}名称";
+$lang->product->code          = "{$lang->productCommon}代号";
+$lang->product->line          = '产品线';
+$lang->product->order         = '排序';
+$lang->product->type          = "{$lang->productCommon}类型";
+$lang->product->status        = '状态';
+$lang->product->desc          = "{$lang->productCommon}描述";
+$lang->product->manager       = '负责人';
+$lang->product->PO            = "{$lang->productCommon}负责人";
+$lang->product->QD            = '测试负责人';
+$lang->product->RD            = '发布负责人';
+$lang->product->acl           = '访问控制';
+$lang->product->whitelist     = '分组白名单';
+$lang->product->branch        = '所属%s';
+$lang->product->qa            = '测试';
+$lang->product->release       = '发布';
+$lang->product->latestDynamic = "最新动态";
+$lang->product->iteration     = "版本迭代";
+$lang->product->iterationInfo = "迭代 %s 次";
 
 $lang->product->searchStory  = '搜索';
 $lang->product->assignedToMe = '指给我';
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 5c178815bd..8d8bf34881 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -11,15 +11,204 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $product->id;?></strong></span>
-    <strong><?php echo $product->name;?></strong>
-    <?php if($product->deleted):?>
-    <span class='label label-danger'><?php echo $lang->product->deleted;?></span>
-    <?php endif; ?>
+  <div class="main-row">
+    <div class="col-8 main-col">
+      <div class="row">
+        <div class="col-sm-6">
+          <div class="panel block-release">
+            <div class="panel-heading">
+            <div class="panel-title"><?php echo $lang->product->iteration;?> <span class="label label-badge label-light"><?php echo sprintf($lang->product->iterationInfo, count($releases));?></span></div>
+            </div>
+            <div class="panel-body">
+              <div class="release-path">
+                <ul class="release-line">
+                  <?php foreach($releases as $release):?>
+                  <?php $icon = !empty($release->flag) ? "<i class='icon icon-flag'></i>" : '';?>
+                  <li class="<?php echo end($releases)->id == $release->id ? 'active' : '';?>">
+                    <a href="<?php echo $this->createLink('release', 'view', "releaseID={$release->id}");?>">
+                      <span class="title"><?php echo $release->name;?></span>
+                      <span class="date"><?php echo $release->date;?></span>
+                      <span class="info"><?php echo $release->desc;?></span>
+                    </a>
+                  </li>
+                  <?php endforeach;?>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-sm-6">
+          <div class="panel block-dynamic">
+            <div class="panel-heading">
+            <div class="panel-title"><?php echo $lang->product->latestDynamic;?></div>
+              <nav class="panel-actions nav nav-default">
+                <li><a href="<?php echo $this->createLink('product', 'dynamic', "productID={$product->id}");?>" title="<?php echo $lang->more;?>">MORE</i></a></li>
+              </nav>
+            </div>
+            <div class="panel-body">
+              <ul class="timeline timeline-tag-left">
+                <?php $i = 1;?>
+                <?php foreach($actions as $action):?>
+                <?php $i++;?>
+                <li <?php if($i % 3 == 0) echo "class='active'";?>>
+                  <div>
+                    <span class="timeline-tag"><?php echo $action->date;?></span>
+                    <span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . $action->actionLabel . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName);?></span>
+                  </div>
+                </li>
+                <?php endforeach;?>
+              </ul>
+            </div>
+          </div>
+        </div>
+        <div class="col-sm-12">
+          <?php $blockHistory = true;?>
+          <?php include '../../common/view/action.html.php';?>
+        </div>
+      </div>
+    </div>
+    <div class="col-4 side-col">
+      <div class="row">
+        <div class="col-sm-12">
+          <div class="cell">
+            <div class="detail">
+              <h2 class="detail-title"><span class="label-id"><?php echo $product->id;?></span> <span class="label label-light label-outline">zentaopms</span> <?php echo $product->name;?></h2>
+              <div class="detail-content article-content">
+                <p><span class="text-limit" data-limit-size="40"><?php echo $product->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></p>
+                <p>
+                  <span class="label label-primary label-outline"><?php echo zget($lang->product->typeList, $product->type);?></span>
+                  <span class="label label-success label-outline"><?php echo zget($lang->product->statusList, $product->status);?></span>
+                  <?php if($product->deleted):?>
+                  <span class='label label-danger label-outline'><?php echo $lang->product->deleted;?></span>
+                  <?php endif; ?>
+                </p>
+              </div>
+            </div>
+            <?php if($product->type == 'platform'):?>
+            <div class="detail">
+            <div class="detail-title"><strong><?php echo $lang->product->branchName['platform'];?></strong><a class="btn btn-link pull-right muted">MORE</a></div>
+              <div class="detail-content">
+                <ul class="clearfix branch-list">
+                  <?php foreach($branches as $branchName):?>
+                  <li><?php echo $branchName;?></li>
+                  <?php endforeach;?>
+                  <li><a class="text-muted" href="<?php echo $this->createLink('branch', 'manage', "productID={$product->id}")?>"><i class="icon icon-plus hl-primary text-primary"></i> &nbsp;<?php echo $lang->branch->add;?></a></li>
+                </ul>
+              </div>
+            </div>
+            <?php endif;?>
+            <div class="detail">
+                <div class="detail-title"><strong><?php echo $lang->product->manager;?></strong></div>
+              <div class="detail-content">
+                <table class="table table-data">
+                  <tbody>
+                    <tr>
+                      <th><i class="icon icon-person icon-sm"></i> <?php echo $lang->productCommon;?></th>
+                      <td><em><?php echo zget($users, $product->PO);?></em></td>
+                      <th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->release;?></th>
+                      <td><em><?php echo zget($users, $product->QD);?></em></td>
+                    </tr>
+                    <tr>
+                      <th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->qa;?></th>
+                      <td><em><?php echo zget($users, $product->RD);?></em></td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+            <div class="detail">
+              <div class="detail-title"><strong><?php echo $lang->product->basicInfo;?></strong></div>
+              <div class="detail-content">
+                <table class="table table-data data-basic">
+                  <tbody>
+                    <tr>
+                      <th><?php echo $lang->product->code;?></th>
+                      <td><em><?php echo $product->code;?></em></td>
+                    </tr>
+                    <tr>
+                      <th><?php echo $lang->product->line;?></th>
+                      <td><em><?php echo zget($lines, $product->line);?></em></td>
+                    </tr>
+                    <tr>
+                      <th><?php echo $lang->story->openedBy?></th>
+                      <td><em><?php echo zget($users, $product->createdBy);?></em></td>
+                    </tr>
+                    <tr>
+                      <th><?php echo $lang->story->openedDate?></th>
+                      <td><em><?php echo formatTime($product->createdDate, DT_DATE1);?></em></td>
+                    </tr>
+                    <tr>
+                      <th><?php echo $lang->product->acl;?></th>
+                      <td><em><?php echo $lang->product->aclList[$product->acl];?></em></td>
+                    </tr>  
+                    <?php if($product->acl == 'custom'):?>
+                    <tr>
+                      <th><?php echo $lang->product->whitelist;?></th>
+                      <td>
+                        <em>
+                          <?php
+                          $whitelist = explode(',', $product->whitelist);
+                          foreach($whitelist as $groupID) if(isset($groups[$groupID])) echo $groups[$groupID] . '&nbsp;';
+                          ?>
+                        </em>
+                      </td>
+                    </tr>
+                    <?php endif;?>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+            <?php if($this->config->global->flow != 'onlyTest'):?>
+            <div class="detail">
+              <div class="detail-title"><strong><?php echo $lang->product->otherInfo;?></strong></div>
+              <div class="detail-content">
+                <table class="table table-data data-basic">
+                  <tbody>
+                    <tr>
+                      <th><?php echo $lang->story->statusList['active']  . $lang->story->common;?></th>
+                      <td><em><?php echo $product->stories['active']?></em></td>
+                      <th><?php echo $lang->product->plans?></th>
+                      <td><em><?php echo $product->plans?></em></td>
+                      <th><?php echo $lang->product->bugs?></th>
+                      <td><em><?php echo $product->bugs?></em></td>
+                    </tr>
+                    <tr>
+                      <th><?php echo $lang->story->statusList['changed']  . $lang->story->common;?></th>
+                      <td><em><?php echo $product->stories['changed']?></em></td>
+                      <th><?php echo $lang->product->projects?></th>
+                      <td><em><?php echo $product->projects?></em></td>
+                      <th><?php echo $lang->product->cases?></th>
+                      <td><em><?php echo $product->cases?></em></td>
+                    </tr>
+                    <tr>
+                      <th><?php echo $lang->story->statusList['draft']  . $lang->story->common;?></th>
+                      <td><em><?php echo $product->stories['draft']?></em></td>
+                      <th><?php echo $lang->product->builds?></th>
+                      <td><em><?php echo $product->builds?></em></td>
+                      <th><?php echo $lang->product->docs?></th>
+                      <td><em><?php echo $product->docs?></em></td>
+                    </tr>
+                    <tr>
+                      <th><?php echo $lang->story->statusList['closed']  . $lang->story->common;?></th>
+                      <td><em><?php echo $product->stories['closed']?></em></td>
+                      <th><?php echo $lang->product->releases?></th>
+                      <td><em><?php echo $product->releases?></em></td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+            <?php endif;?>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
-  <div class='actions'>
+</div>
+
+<div id="mainActions">
+  <nav class="container"></nav>
+  <div class="btn-toolbar">
     <?php
     $params = "product=$product->id";
     $browseLink = $this->session->productList ? $this->session->productList : inlink('browse', "productID=$product->id");
@@ -27,11 +216,10 @@
     {
         ob_start();
         common::printIcon('product', 'close', "productID=$product->id", $product, 'button', '', '', 'iframe text-danger', true);
+        echo "<div class='divider'></div>";
 
-        echo "<div class='btn-group'>";
         common::printIcon('product', 'edit', $params, $product);
         common::printIcon('product', 'delete', $params, $product, 'button', '', 'hiddenwin');
-        echo '</div>';
         common::printRPN($browseLink);
 
         $actionLinks = ob_get_contents();
@@ -44,132 +232,4 @@
     }
     ?>
   </div>
-</div>
-<div class='row-table'>
-  <div class='col-main'>
-    <div class='main'>
-      <fieldset>
-        <legend><?php echo $lang->product->desc;?></legend>
-        <div class='article-content'><?php echo $product->desc;?></div>
-      </fieldset>
-      <?php include '../../common/view/action.html.php';?>
-      <div class='actions'><?php if(!$product->deleted) echo $actionLinks;?></div>
-    </div>
-  </div>
-  <div class='col-side'>
-    <div class='main main-side'>
-      <fieldset>
-        <legend><?php echo $lang->product->basicInfo?></legend>
-        <table class='table table-data table-condensed table-borderless'>
-          <tr>
-            <th class='strong w-110px'><?php echo $lang->product->name;?></th>
-            <td <?php if($product->deleted) echo "class='deleted text-danger'";?>><strong><?php echo $product->name;?></strong></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->code;?></th>
-            <td><?php echo $product->code;?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->line;?></th>
-            <td><?php echo zget($lines, $product->line);?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->PO;?></th>
-            <td><?php echo zget($users, $product->PO);?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->QD;?></th>
-            <td><?php echo zget($users, $product->QD);?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->RD;?></th>
-            <td><?php echo zget($users, $product->RD);?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->type;?></th>
-            <td><?php echo $lang->product->typeList[$product->type];?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->status;?></th>
-            <td class='product-<?php echo $product->status?>'><?php echo $lang->product->statusList[$product->status];?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->story->openedBy?></th>
-            <td><?php echo zget($users, $product->createdBy);?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->story->openedDate?></th>
-            <td><?php echo $product->createdDate;?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->acl;?></th>
-            <td><?php echo $lang->product->aclList[$product->acl];?></td>
-          </tr>  
-          <?php if($product->acl == 'custom'):?>
-          <tr>
-            <th><?php echo $lang->product->whitelist;?></th>
-            <td>
-              <?php
-              $whitelist = explode(',', $product->whitelist);
-              foreach($whitelist as $groupID) if(isset($groups[$groupID])) echo $groups[$groupID] . '&nbsp;';
-              ?>
-            </td>
-          </tr>
-          <?php endif;?>
-        </table>
-      </fieldset>
-      <?php if($this->config->global->flow != 'onlyTest'):?>
-      <fieldset>
-        <legend><?php echo $lang->product->otherInfo?></legend>
-        <table class='table table-data table-condensed table-borderless'>
-          <tr>
-            <th class='strong w-110px'><?php echo $lang->story->statusList['active']  . $lang->story->common;?></th>
-            <td class='strong'><?php echo $product->stories['active']?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->story->statusList['changed']  . $lang->story->common;?></th>
-            <td><?php echo $product->stories['changed']?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->story->statusList['draft']  . $lang->story->common;?></th>
-            <td><?php echo $product->stories['draft']?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->story->statusList['closed']  . $lang->story->common;?></th>
-            <td><?php echo $product->stories['closed']?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->plans?></th>
-            <td><?php echo $product->plans?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->projects?></th>
-            <td><?php echo $product->projects?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->bugs?></th>
-            <td><?php echo $product->bugs?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->docs?></th>
-            <td><?php echo $product->docs?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->cases?></th>
-            <td><?php echo $product->cases?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->builds?></th>
-            <td><?php echo $product->builds?></td>
-          </tr>
-          <tr>
-            <th><?php echo $lang->product->releases?></th>
-            <td><?php echo $product->releases?></td>
-          </tr>
-        </table>
-      </fieldset>
-      <?php endif;?>
-    </div>
-  </div>
-</div>
 <?php include '../../common/view/footer.html.php';?>