From 32d7fd7bc39251ca4a6655ed2f22bb9c5a3153db Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Tue, 9 Jul 2019 11:19:21 +0800
Subject: [PATCH]  * Adjust for task #8275 of inner backyard pms.

---
 module/bug/view/view.html.php         | 6 +++---
 module/build/view/view.html.php       | 3 +--
 module/product/view/view.html.php     | 4 ++--
 module/productplan/view/view.html.php | 3 +--
 module/project/view/view.html.php     | 4 ++--
 module/release/view/view.html.php     | 3 +--
 module/story/view/view.html.php       | 6 +++---
 module/task/view/view.html.php        | 6 +++---
 module/testcase/view/view.html.php    | 6 +++---
 module/testsuite/view/view.html.php   | 3 +--
 module/testtask/view/view.html.php    | 6 +++---
 11 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 2231f401ab..517783d7e8 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -55,11 +55,11 @@
           ?>
         </div>
       </div>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true'));?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=bug&objectID=$bug->id");?>
-      <?php include '../../common/view/action.html.php';?>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=left&divCell=true");?>
+    <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <?php
     $params        = "bugID=$bug->id";
     $copyParams    = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id";
@@ -225,7 +225,6 @@
                   <th><?php echo $lang->bug->mailto;?></th>
                   <td><?php $mailto = explode(',', str_replace(' ', '', $bug->mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
                 </tr>
-                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
               </tbody>
             </table>
           </div>
@@ -377,6 +376,7 @@
         </div>
       </div>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=right&divCell=true");?>
   </div>
 </div>
 
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 4240a7f554..57b04b23ca 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -333,7 +333,7 @@ tbody tr td:first-child input{display:none;}
                   <th><?php echo $lang->build->filePath;?></th>
                   <td style='word-break:break-all;'><?php echo html::a($build->filePath, $build->filePath, '_blank');?></td>
                 </tr>
-                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
+                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', "columns=1");?>
                 <?php if($config->global->flow != 'onlyTest'):?>
                 <tr>
                   <th style="vertical-align:top"><?php echo $lang->build->desc;?></th>
@@ -346,7 +346,6 @@ tbody tr td:first-child input{display:none;}
                   </td>
                 </tr>
                 <?php endif;?>
-                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
               </table>
             </div>
           </div>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 016c752119..bdab189f52 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -75,7 +75,7 @@
           </div>
         </div>
       </div>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
+      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=left&divCell=false");?>
       <div class="col-sm-12">
         <?php $blockHistory = true;?>
         <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=product&objectID=$product->id");?>
@@ -187,7 +187,6 @@
                     </td>
                   </tr>
                   <?php endif;?>
-                  <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
                 </tbody>
               </table>
             </div>
@@ -234,6 +233,7 @@
             </div>
           </div>
           <?php endif;?>
+          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=right&divCell=false");?>
         </div>
       </div>
     </div>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index ba83f78b06..6869d58783 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -453,12 +453,11 @@
                   </td>
                 </tr>
                 <?php endif;?>
-                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
+                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', "columns=1");?>
                 <tr>
                   <th><?php echo $lang->productplan->desc;?></th>
                   <td><?php echo $plan->desc;?></td>
                 </tr>
-                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
               </table>
             </div>
           </div>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index c933b1ae90..ca624de568 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -140,7 +140,7 @@
             </div>
           </div>
         </div>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=left&divCell=false");?>
         <div class="col-sm-12">
           <?php $blockHistory = true;?>
           <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=project&objectID=$project->id");?>
@@ -279,7 +279,6 @@
                 </table>
               </div>
             </div>
-            <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
             <div class="detail">
               <div class="detail-title"><strong><?php echo $lang->project->acl;?></strong></div>
               <div class="detail-content">
@@ -294,6 +293,7 @@
                 <?php endif;?>
               </div>
             </div>
+            <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=right&divCell=false");?>
           </div>
         </div>
       </div>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 205038abb7..8a406a4490 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -328,12 +328,11 @@
                       <th><?php echo $lang->release->date;?></th>
                       <td><?php echo $release->date;?></td>
                     </tr>
-                    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
+                    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', "columns=1");?>
                     <tr>
                       <th><?php echo $lang->release->desc;?></th>
                       <td><?php echo $release->desc;?></td>
                     </tr>
-                    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
                   </table>
                 </div>
               </div>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index cfb84efc6e..00eabf0bb8 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -59,11 +59,11 @@
         <div class="detail-title"><?php echo $lang->story->legendVerify;?></div>
         <div class="detail-content article-content"><?php echo $story->verify;?></div>
       </div>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'true'));?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=story&objectID=$story->id");?>
-      <?php include '../../common/view/action.html.php';?>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=left&divCell=true");?>
+    <div class="cell"><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
         <?php common::printBack($browseLink);?>
@@ -226,7 +226,6 @@
                   <th><?php echo $lang->story->legendMailto;?></th>
                   <td><?php $mailto = explode(',', $story->mailto); foreach($mailto as $account) {if(empty($account)) continue; echo "<span>" . $users[trim($account)] . '</span> &nbsp;'; }?></td>
                 </tr>
-                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
               </tbody>
             </table>
           </div>
@@ -388,6 +387,7 @@
         </div>
       </div>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=right&divCell=true");?>
   </div>
 </div>
 
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 64e748ee88..020453e9f3 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -142,11 +142,11 @@
         </div>
       </div>
       <?php endif;?>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=task&objectID=$task->id");?>
-      <?php include '../../common/view/action.html.php';?>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=left&divCell=true");?>
+    <div class="cell"><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
         <?php common::printBack($browseLink);?>
@@ -282,7 +282,6 @@
                     ?>
                   </td>
                 </tr>
-                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
               </tbody>
             </table>
           </div>
@@ -377,6 +376,7 @@
         </div>
       </details>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=right&divCell=true");?>
   </div>
 </div>
 
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 8fd218f8eb..6c1b39ec74 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -94,10 +94,10 @@
           </table>
         </div>
       </div>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
-      <?php include '../../common/view/action.html.php';?>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=left&divCell=true");?>
+    <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
         <?php common::printBack($browseLink);?>
@@ -264,7 +264,6 @@
               </td>
             </tr>
             <?php endif;?>
-            <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
           </table>
         </div>
       </details>
@@ -328,6 +327,7 @@
         </div>
       </details>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=right&divCell=true");?>
   </div>
 </div>
 <div id="mainActions" class='main-actions'>
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index f20d62a952..474c752ec6 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -144,15 +144,14 @@
   </div>
   <div class='side-col col-4'>
     <div class='cell'>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
       <div class='detail'>
         <div class='detail-title'><?php echo $lang->testsuite->legendDesc;?></div>
         <div class='detail-content article-content'>
           <?php echo $suite->desc;?>
         </div>
       </div>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=right&divCell=true");?>
     <div class='cell'>
       <?php include '../../common/view/action.html.php';?>
     </div>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 591d6d841b..dea3cddf45 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -39,10 +39,10 @@
         <div class="detail-content article-content"><?php echo $task->report;?></div>
       </div>
       <?php endif;?>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'detail');?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=testtask&objectID=$task->id");?>
-      <?php include '../../common/view/action.html.php';?>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=left&divCell=true");?>
+    <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
         <?php common::printBack($browseLink);?>
@@ -117,11 +117,11 @@
               <th><?php echo $lang->testtask->status;?></th>
               <td class='task-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
             </tr>
-            <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'basic');?>
           </table>
         </div>
       </div>
     </div>
+    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', "position=right&divCell=true");?>
   </div>
 </div>