Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'

Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1655

module/kanban/css/view.css

@@ -103,7 +103,7 @@
 .kanban-card .header .executionName {display: flex; width: 100%; float: left;}
 .kanban-card .header .executionName .title {padding-right: 0px; margin-right: 5px; overflow: hidden; white-space: nowrap;}
 .kanban-card .header .executionName > span {flex: none;}
-.execInfo, .releaseInfo, .productplanInfo {margin-top: 23px;}
+.execInfo, .releaseInfo, .productplanInfo {margin-top: 22px;}
 .label-wait {background: #EFEFEF !important; color: #838A9D;}
 .label-doing {background: #f8d2d2 !important; color: #e64b4c;}
 .label-suspended {background: #fff3d9 !important; color: #ff9800;}

module/kanban/js/view.js

@@ -315,7 +315,7 @@ function renderKanbanItem(item, $item)
         if(privs.includes('sortCard')) $item.parent().addClass('sort');
         if(!$title.length)
         {
-            if(privs.includes('viewCard')) $title = $('<a class="title iframe text-ellipsis" data-toggle="modal" data-width="80%"></a>').appendTo($item).attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true));
+            if(privs.includes('viewCard')) $title = $('<a class="title iframe" data-toggle="modal" data-width="80%"></a>').appendTo($item).attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true));
             if(!privs.includes('viewCard')) $title = $('<p class="title"></p>').appendTo($item);
         }
 
@@ -1302,10 +1302,10 @@ $(function()
         var columnID = $(this).closest('.kanban-col').data('id');
 
         /* The submenu of import. */
-        var importPlanLink      = kanban.object.indexOf('plans') != -1 ? "<li><a class='iframe' data-toggle='modal' data-width='80%' href='" + createLink('kanban', 'importPlan', 'kanbanID=' + kanban.id + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID) + "'>" + kanbanLang.importPlan + '</a></li>' : '';
-        var importReleaseLink   = kanban.object.indexOf('releases') != -1 ? "<li><a class='iframe' data-toggle='modal' data-width='80%' href='" + createLink('kanban', 'importRelease', 'kanbanID=' + kanban.id + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID) + "'>" + kanbanLang.importRelease + '</a></li>' : '';
-        var importExecutionLink = kanban.object.indexOf('executions') != -1 ? "<li><a class='iframe' data-toggle='modal' data-width='80%' href='" + createLink('kanban', 'importExecution', 'kanbanID=' + kanban.id + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID) + "'>" + kanbanLang.importExecution + '</a></li>' : '';
-        var importBuildLink     = kanban.object.indexOf('builds') != -1 ? "<li><a class='iframe' data-toggle='modal' data-width='80%' href='" + createLink('kanban', 'importBuild', 'kanbanID=' + kanban.id + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID) + "'>" + kanbanLang.importBuild + '</a></li>' : '';
+        var importPlanLink      = kanban.object.indexOf('plans') != -1 ? "<li><a class='iframe' data-toggle='modal'' href='" + createLink('kanban', 'importPlan', 'kanbanID=' + kanban.id + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID) + "'>" + kanbanLang.importPlan + '</a></li>' : '';
+        var importReleaseLink   = kanban.object.indexOf('releases') != -1 ? "<li><a class='iframe' data-toggle='modal'' href='" + createLink('kanban', 'importRelease', 'kanbanID=' + kanban.id + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID) + "'>" + kanbanLang.importRelease + '</a></li>' : '';
+        var importExecutionLink = kanban.object.indexOf('executions') != -1 ? "<li><a class='iframe' data-toggle='modal' href='" + createLink('kanban', 'importExecution', 'kanbanID=' + kanban.id + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID) + "'>" + kanbanLang.importExecution + '</a></li>' : '';
+        var importBuildLink     = kanban.object.indexOf('builds') != -1 ? "<li><a class='iframe' data-toggle='modal' href='" + createLink('kanban', 'importBuild', 'kanbanID=' + kanban.id + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID) + "'>" + kanbanLang.importBuild + '</a></li>' : '';
         var importSubmenu       = '<ul class="dropdown-menu">' + importPlanLink + importReleaseLink + importExecutionLink + importBuildLink +'</ul>';
         $('.import').parent().append(importSubmenu);
 

module/kanban/view/importbuild.html.php

@@ -22,14 +22,13 @@
       <h2><?php echo $lang->kanban->importAB . $lang->kanban->importBuild;?></h2>
     </div>
   </div>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedProject;?></h4></div>
-    <div class='table-col'><?php echo html::select('project', $projects, $selectedProjectID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
-  </div>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>
-    <div class='table-col'><?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
+  <div class='input-group space'>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedProject;?></span>
+    <?php echo html::select('project', $projects, $selectedProjectID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedLane;?></span>
+    <?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?>
   </div>
+  <?php if($builds2Imported):?>
   <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='importBuildForm'>
     <table class='table table-fixed' id='buildList'>
       <thead>
@@ -73,13 +72,15 @@
         <tr><?php echo html::hidden('targetLane', key($lanePairs));?></tr>
       </tbody>
     </table>
-    <?php if($builds2Imported):?>
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar show-always"><?php echo html::submitButton($lang->kanban->importAB, '', 'btn btn-default');?></div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
-    <?php endif;?>
   </form>
+  <?php else:?>
+  <div class='table-empty-tip'><?php echo $lang->noData;?></div>
+  <?php endif;?>
 </div>
+<style>#project_chosen {width: 45% !important}</style>
 <?php include '../../common/view/footer.lite.html.php';?>

module/kanban/view/importcard.html.php

@@ -22,14 +22,13 @@
       <h2><?php echo $lang->kanban->importCard;?></h2>
     </div>
   </div>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedKanban;?></h4></div>
-    <div class='table-col'><?php echo html::select('kanban', $kanbanPairs, $selectedKanbanID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
-  </div>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>
-    <div class='table-col'><?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
+  <div class='input-group space'>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedKanban;?></span>
+    <?php echo html::select('kanban', $kanbanPairs, $selectedKanbanID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedLane;?></span>
+    <?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?>
   </div>
+  <?php if($cards2Imported):?>
   <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='importCardForm'>
     <table class='table table-fixed' id='cardList'>
       <thead>
@@ -71,13 +70,15 @@
         <tr><?php echo html::hidden('targetLane', key($lanePairs));?></tr>
       </tbody>
     </table>
-    <?php if($cards2Imported):?>
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar show-always"><?php echo html::submitButton($lang->kanban->importCard, '', 'btn btn-default');?></div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
-    <?php endif;?>
   </form>
+  <?php else:?>
+  <div class='table-empty-tip'><?php echo $lang->noData;?></div>
+  <?php endif;?>
 </div>
+<style>#kanban_chosen {width: 45% !important}</style>
 <?php include '../../common/view/footer.lite.html.php';?>

module/kanban/view/importexecution.html.php

@@ -22,16 +22,15 @@
       <h2><?php echo $lang->kanban->importAB . $lang->kanban->importExecution;?></h2>
     </div>
   </div>
-  <?php if($config->systemMode == 'new'):?>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedProject;?></h4></div>
-    <div class='table-col'><?php echo html::select('project', $projects, $selectedProjectID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
-  </div>
-  <?php endif;?>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>
-    <div class='table-col'><?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
+  <div class='input-group space'>
+    <?php if($config->systemMode == 'new'):?>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedProject;?></span>
+    <?php echo html::select('project', $projects, $selectedProjectID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?>
+    <?php endif;?>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedLane;?></span>
+    <?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?>
   </div>
+  <?php if($executions2Imported):?>
   <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='importExecutionForm'>
     <table class='table table-fixed' id='executionList'>
       <thead>
@@ -79,13 +78,19 @@
         <tr><?php echo html::hidden('targetLane', key($lanePairs));?></tr>
       </tbody>
     </table>
-    <?php if($executions2Imported):?>
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar show-always"><?php echo html::submitButton($lang->kanban->importAB, '', 'btn btn-default');?></div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
-    <?php endif;?>
   </form>
+  <?php else:?>
+  <div class='table-empty-tip'><?php echo $lang->noData;?></div>
+  <?php endif;?>
 </div>
+<?php if($config->systemMode == 'classic'):?>
+<style>.input-group {width: 45% !important}</style>
+<?php else:?>
+<style>#project_chosen {width: 45% !important}</style>
+<?php endif;?>
 <?php include '../../common/view/footer.lite.html.php';?>

module/kanban/view/importplan.html.php

@@ -22,14 +22,13 @@
       <h2><?php echo $lang->kanban->importAB . $lang->kanban->importPlan;?></h2>
     </div>
   </div>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedProduct;?></h4></div>
-    <div class='table-col'><?php echo html::select('product', $products, $selectedProductID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
-  </div>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>
-    <div class='table-col'><?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
+  <div class='input-group space'>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedProduct;?></span>
+    <?php echo html::select('product', $products, $selectedProductID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedLane;?></span>
+    <?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?>
   </div>
+  <?php if($plans2Imported):?>
   <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='importPlanForm'>
     <table class='table table-fixed' id='planList'>
       <thead>
@@ -77,13 +76,15 @@
         <tr><?php echo html::hidden('targetLane', key($lanePairs));?></tr>
       </tbody>
     </table>
-    <?php if($plans2Imported):?>
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar show-always"><?php echo html::submitButton($lang->kanban->importAB, '', 'btn btn-default');?></div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
-    <?php endif;?>
   </form>
+  <?php else:?>
+  <div class='table-empty-tip'><?php echo $lang->noData;?></div>
+  <?php endif;?>
 </div>
+<style>#product_chosen {width: 45% !important}</style>
 <?php include '../../common/view/footer.lite.html.php';?>

module/kanban/view/importrelease.html.php

@@ -22,14 +22,13 @@
       <h2><?php echo $lang->kanban->importAB . $lang->kanban->importRelease;?></h2>
     </div>
   </div>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedProduct;?></h4></div>
-    <div class='table-col'><?php echo html::select('product', $products, $selectedProductID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
-  </div>
-  <div class='table-row p-10px'>
-    <div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>
-    <div class='table-col'><?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?></div>
+  <div class='input-group space'>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedProduct;?></span>
+    <?php echo html::select('product', $products, $selectedProductID, "onchange='reloadObjectList(this.value)' class='form-control chosen' data-drop_direction='down'");?>
+    <span class='input-group-addon'><?php echo $lang->kanban->selectedLane;?></span>
+    <?php echo html::select('lane', $lanePairs, '', "onchange='setTargetLane(this.value)' class='form-control chosen' data-drop_direction='down'");?>
   </div>
+  <?php if($releases2Imported):?>
   <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='importReleaseForm'>
     <table class='table table-fixed' id='releaseList'>
       <thead>
@@ -75,13 +74,15 @@
         <tr><?php echo html::hidden('targetLane', key($lanePairs));?></tr>
       </tbody>
     </table>
-    <?php if($releases2Imported):?>
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar show-always"><?php echo html::submitButton($lang->kanban->importAB, '', 'btn btn-default');?></div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
-    <?php endif;?>
   </form>
+  <?php else:?>
+  <div class='table-empty-tip'><?php echo $lang->noData;?></div>
+  <?php endif;?>
 </div>
+<style>#product_chosen {width: 45% !important}</style>
 <?php include '../../common/view/footer.lite.html.php';?>