Merge branch 'master' of github.com:easysoft/zentaopms

module/bug/view/edit.html.php

@@ -39,8 +39,8 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
     <?php echo html::submitButton($lang->save)?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <div class='form-group'>
         <?php echo html::input('title', str_replace("'","&#039;",$bug->title), 'class="form-control" placeholder="' . $lang->bug->title . '"');?>
@@ -67,7 +67,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
       <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
-  <div class='col-md-4'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->bug->legendBasicInfo;?></legend>

module/bug/view/view.html.php

@@ -63,8 +63,8 @@
   </div>
 </div>
 
-<div class='row'>
-  <div class='col-md-8 col-lg-9'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->bug->legendSteps;?></legend>
@@ -84,7 +84,7 @@
       </fieldset>
     </div>
   </div>
-  <div class='col-md-4 col-lg-3'>
+  <div class='col-side'>
     <div class='main main-side'>
       <div class='tabs'>
         <ul class='nav nav-tabs'>

module/build/view/view.html.php

@@ -20,8 +20,8 @@
     <?php endif; ?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->build->desc;?></legend>
@@ -123,7 +123,7 @@
       </div>
     </div>
   </div>
-  <div class='col-md-4'>
+  <div class='col-side'>
     <div class='main-side main'>
       <fieldset>
         <legend><?php echo $lang->build->basicInfo?></legend>

module/doc/view/view.html.php

@@ -45,8 +45,8 @@
     ?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8 col-lg-9'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->doc->digest;?></legend>
@@ -75,7 +75,7 @@
       <div class='actions'><?php if(!$doc->deleted) echo $actionLinks;?></div>
     </div>
   </div>
-  <div class='col-md-4 col-lg-3'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->doc->basicInfo;?></legend>

module/my/view/index.html.php

@@ -22,28 +22,28 @@
   </div>
 </div>
 <div class="row">
-  <div class="col-md-4">
+  <div class="col-md-4 col-sm-6">
     <?php include './blocktodoes.html.php';?>
   </div>
   <?php if($app->user->role and strpos('qa|qd', $app->user->role) !== false):?>
-  <div class="col-md-4">
+  <div class="col-md-4 col-sm-6">
     <?php include './blockbugs.html.php';?>
   </div>
-  <div class="col-md-4">
+  <div class="col-md-4 col-sm-6">
     <?php include './blocktasks.html.php';?>
   </div>
   <?php elseif($app->user->role and strpos('po|pd', $app->user->role) !== false):?>
-  <div class="col-md-4">
+  <div class="col-md-4 col-sm-6">
     <?php include './blockstories.html.php';?>
   </div>
-  <div class="col-md-4">
+  <div class="col-md-4 col-sm-6">
     <?php include './blockbugs.html.php';?>
   </div>
   <?php else:?>
-  <div class="col-md-4">
+  <div class="col-md-4 col-sm-6">
     <?php include './blocktasks.html.php';?>
   </div>
-  <div class="col-md-4">
+  <div class="col-md-4 col-sm-6">
     <?php include './blockbugs.html.php';?>
   </div>
   <?php endif;?>

module/product/view/view.html.php

@@ -45,8 +45,8 @@
     ?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8 col-lg-9'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->product->desc;?></legend>
@@ -56,7 +56,7 @@
       <div class='actions'><?php if(!$product->deleted) echo $actionLinks;?></div>
     </div>
   </div>
-  <div class='col-md-4 col-lg-3'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->product->basicInfo?></legend>

module/productplan/css/browse.css

@@ -1,4 +1,2 @@
 #productplan tbody > tr > td{border-right:1px solid #E4E4E4;}
-.popover {max-width: 500px;}
-.popover-content .article-content {max-width: 500px; overflow: hidden; max-height: 150px}
-.table td .article-content {max-height: 20px; overflow: hidden; padding: 0}
+.table td .article-content {padding: 0}

module/productplan/js/browse.js

@@ -1,4 +0,0 @@
-$(function()
-{
-    $('[data-toggle="popover"]').popover({container: 'body', placement: 'top', html: true, trigger: 'hover'});
-});

module/productplan/view/browse.html.php

@@ -35,7 +35,7 @@
   <tr class='text-center'>
     <td><?php echo $plan->id;?></td>
     <td class='text-left' title="<?php echo $plan->title?>"><?php echo html::a(inlink('view', "id=$plan->id"), $plan->title);?></td>
-    <td class='text-left content' data-original-title='<?php echo $plan->title;?>'><div class='article-content'><?php echo $plan->desc;?></div></td>
+    <td class='text-left content'><div class='article-content'><?php echo $plan->desc;?></div></td>
     <td><?php echo $plan->begin;?></td>
     <td><?php echo $plan->end;?></td>
     <td class='text-center'>

module/project/view/view.html.php

@@ -51,8 +51,8 @@
     ?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8 col-lg-9'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->project->desc;?></legend>
@@ -62,7 +62,7 @@
       <div class='actions'> <?php if(!$project->deleted) echo $actionLinks;?></div>
     </div>
   </div>
-  <div class='col-md-4 col-lg-3'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->project->basicInfo?></legend>

module/release/view/view.html.php

@@ -46,8 +46,8 @@
     ?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->release->desc;?></legend>
@@ -162,7 +162,7 @@
       </div>
     </div>
   </div>
-  <div class='col-md-4'>
+  <div class='col-side'>
     <div class='main-side main'>
       <fieldset>
         <legend><?php echo $lang->release->basicInfo?></legend>

module/story/lang/zh-cn.php

@@ -24,6 +24,7 @@ $lang->story->batchClose  = '批量关闭';
 $lang->story->activate    = '激活';
 $lang->story->delete      = "删除";
 $lang->story->view        = "需求详情";
+$lang->story->legend      = "相关";
 $lang->story->tasks       = "相关任务";
 $lang->story->taskCount   = '任务数';
 $lang->story->bugs        = "Bug";

module/story/view/edit.html.php

@@ -22,8 +22,8 @@
     <?php echo html::submitButton($lang->save)?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->story->legendSpec;?></legend>
@@ -48,7 +48,7 @@
       <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
-  <div class='col-md-4'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->story->legendBasicInfo;?></legend>

module/story/view/view.html.php

@@ -14,7 +14,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <div id='titlebar'>
   <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['story']);?> <strong><?php echo $product->id;?></strong></span>
+    <span class='prefix'><?php echo html::icon($lang->icons['story']);?> <strong><?php echo $story->id;?></strong></span>
     <strong><?php echo $story->title;?></strong>
     <?php if($story->version > 1):?>
     <small class='dropdown'>
@@ -227,43 +227,56 @@
             </table>
           </div>
           <div class='tab-pane' id='legendRelated'>
-            <ul class='list-unstyled'>
-              <li><?php echo $lang->story->legendBugs?></li>
-              <li>
-                <ul class='list-unstyled'>
-                <?php
-                if(!empty($fromBug)) echo "<li title='#$fromBug->id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . " <span class='label label-warning'>{$lang->story->legendFromBug}</span></li>";
-                ?>
-              </li>
-              <li><?php echo $lang->story->legendCases?></li>
-              <li>
-                <ul class='list-unstyled'>
-                <?php
-                foreach($cases as $case)
-                {
-                    echo "<li title='#$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id"), "#$case->id $case->title") . '</li>';
-                }
-                ?>
-                </ul>
-              </li>
-              <li><?php echo $lang->story->legendLinkStories?></li>
-              <li>
-                <ul class='list-unstyled'>
+            <table class='table table-data table-condensed table-borderless'>
+              <tr class='text-top'>
+                <th class='w-70px'><?php echo $lang->story->legendBugs;?></th>
+                <td>
+                  <ul class='list-unstyled'>
                   <?php
-                  $linkStories = explode(',', $story->linkStories) ;    
-                  foreach($linkStories as $linkStoryID)
+                  if(!empty($fromBug)) echo "<li title='#$fromBug->id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . " <span class='label label-warning'>{$lang->story->legendFromBug}</span></li>";
+                  ?>
+                  <?php
+                  foreach($cases as $case)
                   {
-                      if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '</li>';
-                  }
-                  $childStories = explode(',', $story->childStories) ;    
-                  foreach($childStories as $childStoryID)
-                  {
-                    if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . " <span class='label label-info'>{$lang->story->legendChildStories}</span></li>";
+                      echo "<li title='#$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id"), "#$case->id $case->title") . '</li>';
                   }
                   ?>
-                </ul>
-              </li>
-            </ul>
+                  </ul>
+                </td>
+              </tr>
+              <tr class='text-top'>
+                <th><?php echo $lang->story->legendCases;?></th>
+                <td>
+                  <ul class='list-unstyled'>
+                  <?php
+                  foreach($cases as $case)
+                  {
+                      echo "<li title='#$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id"), "#$case->id $case->title") . '</li>';
+                  }
+                  ?>
+                  </ul>
+                </td>
+              </tr>
+              <tr class='text-top'>
+                <th><?php echo $lang->story->legendLinkStories;?></th>
+                <td>
+                  <ul class='list-unstyled'>
+                    <?php
+                    $linkStories = explode(',', $story->linkStories) ;    
+                    foreach($linkStories as $linkStoryID)
+                    {
+                        if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '</li>';
+                    }
+                    $childStories = explode(',', $story->childStories) ;    
+                    foreach($childStories as $childStoryID)
+                    {
+                      if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . " <span class='label label-info'>{$lang->story->legendChildStories}</span></li>";
+                    }
+                    ?>
+                  </ul>
+                </td>
+              </tr>
+            </table>
           </div>
         </div>
       </div>

module/task/view/edit.html.php

@@ -28,8 +28,8 @@
     <?php echo html::submitButton($lang->save)?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <div class='form-group'>
         <?php echo html::input('name', $task->name, 'class="form-control" placeholder="' . $lang->task->name . '"');?>
@@ -54,7 +54,7 @@
       <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
-  <div class='col-md-4'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->task->legendBasic;?></legend>

module/task/view/view.html.php

@@ -62,8 +62,8 @@
     ?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8 col-lg-9'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->task->legendDesc;?></legend>
@@ -81,7 +81,7 @@
       </fieldset>
     </div>
   </div>
-  <div class='col-md-4 col-lg-3'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->task->legendBasic;?></legend>

module/testcase/view/edit.html.php

@@ -27,8 +27,8 @@
     <?php echo html::submitButton($lang->save)?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <div class='form-group'>
         <?php echo html::input('title', $case->title, 'class="form-control" placeholder="' . $lang->case->title . '"');?>
@@ -83,7 +83,7 @@
       <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
-  <div class='col-md-4'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->testcase->legendBasicInfo;?></legend>

module/testcase/view/view.html.php

@@ -72,8 +72,8 @@
   </div>
 </div>
 
-<div class='row'>
-  <div class='col-md-8 col-lg-9'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->testcase->precondition;?></legend>
@@ -115,7 +115,7 @@
       </fieldset>
     </div>
   </div>
-  <div class='col-md-4 col-lg-3'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->testcase->legendBasicInfo;?></legend>

module/testtask/view/view.html.php

@@ -50,8 +50,8 @@
     ?>
   </div>
 </div>
-<div class='row'>
-  <div class='col-md-8 col-lg-9'>
+<div class='row-table'>
+  <div class='col-main'>
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->testtask->legendDesc;?></legend>
@@ -65,7 +65,7 @@
       <div class='actions'><?php echo $actionLinks;?></div>
     </div>
   </div>
-  <div class='col-md-4 col-lg-3'>
+  <div class='col-side'>
     <div class='main main-side'>
       <fieldset>
         <legend><?php echo $lang->testtask->legendBasicInfo;?></legend>

module/tree/view/browse.html.php

@@ -16,7 +16,7 @@
   <div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?>  </div>
 </div>
 <div class='row'>
-  <div class='col-md-4 col-lg-3'>
+  <div class='col-sm-6 col-md-4 col-lg-3'>
     <form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'updateOrder', "root={$root->id}&viewType=$viewType");?>'>
       <div class='panel'>
         <div class='panel-heading'>
@@ -31,7 +31,7 @@
       </div>
     </form>
   </div>
-  <div class='col-md-8 col-lg-9'>
+  <div class='col-sm-6 col-md-8 col-lg-9'>
     <form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root={$root->id}&viewType=$viewType");?>'>
       <div class='panel'>
         <div class='panel-heading'>

module/tree/view/browsetask.html.php

@@ -16,7 +16,7 @@
   <div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?>  </div>
 </div>
 <div class='row'>
-  <div class='col-md-4 col-lg-3'>
+  <div class='col-sm-6 col-md-4 col-lg-3'>
     <form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'updateOrder', "root={$root->id}&viewType=task");?>'>
       <div class='panel'>
         <div class='panel-heading'>
@@ -31,7 +31,7 @@
       </div>
     </form>
   </div>
-  <div class='col-md-8 col-lg-9'>
+  <div class='col-sm-6 col-md-8 col-lg-9'>
     <form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root={$root->id}&viewType=task");?>'>
       <div class='panel'>
         <div class='panel-heading'>

www/js/my.full.js

@@ -1058,27 +1058,12 @@ function setTableBehavior()
     $('#wrap .outer > .table, #wrap .outer > form > .table, #wrap .outer > .mian > .table, #wrap .outer > .mian > form > .table, #wrap .outer > .container > .table').not('.table-data, .table-form').addClass('table table-condensed table-hover table-striped tablesorter');
 }
 
-/**
- * Make form condensed
- * 
- * @access public
- * @return void
- */
-function condensedForm()
-{
-    $('.form-condensed legend').click(function()
-    {
-        $(this).closest('fieldset').toggleClass('collapsed');
-    });
-}
-
 /* Ping the server every some minutes to keep the session. */
 needPing = true;
 
 /* When body's ready, execute these. */
 $(document).ready(function() 
 {
-    condensedForm();
     setModal();
     setTableBehavior();
     setForm();

www/theme/default/style.css

@@ -40,7 +40,13 @@
 tr.text-center > td, tr.text-center > th {text-align: center;}
 tr.text-center > td.text-left, tr.text-center > th.text-left {text-align: left;}
 tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: right;}
-tr.text-top td {vertical-align: top!important;}
+tr.text-top td, tr.text-top th {vertical-align: top!important;}
+
+/* columns */
+.row-table {display: table; width: 100%}
+.col-side, .col-main {padding: 0; display: table-cell; vertical-align: top;}
+.col-side {width: 350px; padding-left: 10px;}
+.col-main {padding-right: 10px;}
 
 /* === Components === */
 /* remove outline of links */
@@ -170,7 +176,6 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
 /* fieldset */
 fieldset {margin-bottom: 15px; border: 1px solid #e5e5e5; padding: 10px 15px 15px;}
 fieldset.fieldset-pure {background: none; padding: 0; border: none; padding-top: 5px;}
-fieldset.collapsed {border: none}
 fieldset > legend {width: auto; margin: 0 0 0 -5px; font-size: 13px; font-weight: bold; border-bottom: none; padding: 0 5px}
 fieldset > .form-group {margin-bottom: 0;}
 
@@ -222,7 +227,7 @@ fieldset > .form-group {margin-bottom: 0;}
 .form-condensed .chosen-container-multi .chosen-choices li.search-field {margin-bottom: 4px;}
 .form-condensed .table-fixed .form-control {padding: 5px 6px}
 .form-condensed .table-fixed select.form-control {padding: 5px}
-.form-condensed .chosen-container {font-size: 12px}
+.form-condensed .chosen-container {font-size: 13px}
 .form-condensed .chosen-container-single .chosen-single {padding: 5px 10px}
 .form-condensed .chosen-container-single .chosen-single abbr {top: 5px; right: 18px}
 .form-condensed .chosen-container-single .chosen-search:before {top: 10px}
@@ -524,7 +529,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 #_pageID, #goto {display: none}
 
 /* modal */
-.modal-dialog {border: 8px solid #666; border-color: rgba(0,0,0,.25)}
+.modal .modal-dialog {border: 8px solid #666; border-color: rgba(0,0,0,.25)}
 .modal-title {font-size: 14px;}
 
 /* modal with iframe */
@@ -543,6 +548,8 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .body-modal #titlebar .actions {right: 40px}
 .body-modal .outer, .body-modal #wrap{padding: 0!important; margin: 0!important;}
 
+.body-modal .row-table {padding: 20px}
+
 .modal-dialog.fullscreen {width: 100% !important; height: 100% !important; margin: 0; border: none !important;}
 .modal-dialog.fullscreen .modal-body iframe {height: 100%}
 
@@ -557,7 +564,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .tree {padding: 0; margin: 0;}
 .tree li,.tree ul {margin: 0; padding: 0; display: block; position: relative;}
 .tree > li {margin-right: 20px; font-weight: 400; padding-bottom: 6px;}
-.tree > li > ul li {padding: 6px 15px 0; margin: 0;}
+.tree > li > ul li {padding: 6px 5px 0 15px; margin: 0;}
 .tree li:before {display: inline-block; margin-right: 6px; position: relative; top: 0; left: 0; content: ' '; width: 8px; height: 8px; background: #f1f1f1; border: 1px solid #ccc; border-radius: 2px}
 .tree > li ul {border-left: 1px dotted #aaa; margin-left: 3px; font-weight: normal;}
 .tree > li ul > li:before {margin-right: 4px;}

www/theme/default/treeview.css

@@ -1,8 +1,8 @@
 /*treeview*/
-.treeview .hitarea {position: absolute; left: 15px; top: 10px; background-color: #fff; cursor: pointer;}
-.treeview > li > .hitarea {left: -1px; top: -1px;}
+.treeview .hitarea {position: absolute; left: 15px; top: 5px; background-color: #fff; cursor: pointer;}
+.treeview > li > .hitarea {left: -1px; top: 0px;}
 .treeview .hitarea:before {color: #999; content: '\e6f1'; font-family: ZenIcon; transition:all 0.3s; font-size: 14px}
 .treeview li:hover .hitarea:before {color: #2973EA;}
 .treeview .hitarea.collapsable-hitarea:before {content: '\e6f2';}
 
-.treeview .form-control {padding: 1px 2px; height: 22px; display: inline-block;}
+.treeview .form-control, .treeview input[type='text'] {padding: 1px 2px; height: 20px; display: inline-block;}