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

module/block/css/dashboard.css

@@ -15,7 +15,8 @@ body {background: #fafafa;}
 .dashboard a.panel-title > .icon-double-angle-right {position: relative; filter: alpha(opacity=0); opacity: 0; transition: opacity .2s, left .2s; left: -5px}
 .dashboard .panel:hover a.panel-title > .icon-double-angle-right {filter: alpha(opacity=100); opacity: 1; left: 0}
 .dashboard a.panel-title:hover {color: #1a53ff}
-.dashboard .panel {box-shadow: 0 1px 3px rgba(0,0,0,.05); position: relative;}
+.dashboard .panel {box-shadow: 0 1px 3px rgba(0,0,0,.05); position: relative; overflow-x: hidden;}
+.dashboard .panel.with-fixed-header {overflow-x: hidden;}
 .dashboard .panel-heading + .panel-body {position: absolute; left: 0; top: 30px; right: 0; bottom: 0}
 .dashboard .panel-dragging-shadow {position: absolute;}
 .dashboard-empty-message {text-align: center; margin-top: 100px;}

module/block/js/dashboard.js

@@ -65,6 +65,7 @@ function resizeBlock(event)
     {
         if(data.result !== 'success') event.revert();
     });
+    initTableHeader();
 }
 
 /**
@@ -80,16 +81,27 @@ function initTableHeader()
         var $table = $panel.find('.table:first');
 
         if(!$table.length || !$table.children('thead').length) return;
+        var isFixed = $panel.find('.panel-body').height() < $table.outerHeight();
 
-        var $header = $panel.children('.table-header-fixed');
+        $panel.toggleClass('with-fixed-header', isFixed);
+        var $header = $panel.children('.table-header-fixed').toggle(isFixed);
+        if(!isFixed) return;
         if(!$header.length)
         {
-            $header = $('<div class="table-header-fixed"><table class="table table-fixed"></table></div>').css('right', $panel.width() - $table.width()).css('min-width', $table.width());
+            $header = $('<div class="table-header-fixed" style="position: absolute; left: 0; top: 0; right: 0;"><table class="table table-fixed"></table></div>').css('right', $panel.width() - $table.width()).css('min-width', $table.width());
             $header.find('.table').addClass($table.attr('class')).append($table.find('thead').css('visibility', 'hidden').clone().css('visibility', 'visible'));
             $panel.addClass('with-fixed-header').append($header);
             var $heading = $panel.children('.panel-heading');
             if($heading.length) $header.css('top', $heading.outerHeight());
         }
+        else
+        {
+            var $fixedTh = $header.css('min-width', $table.width()).find('thead > tr > th');
+            $table.find('thead > tr > th').each(function(idx)
+            {
+                $fixedTh.eq(idx).width($(this).width());
+            });
+        }
     });
 }
 

module/build/model.php

@@ -211,9 +211,10 @@ class buildModel extends model
     public function update($buildID)
     {
         $oldBuild = $this->getByID($buildID);
-        $build = fixer::input('post')->setDefault('branch', $oldBuild->branch)->stripTags($this->config->build->editor->edit['id'], $this->config->allowedTags)
+        $build = fixer::input('post')->stripTags($this->config->build->editor->edit['id'], $this->config->allowedTags)
             ->remove('allchecker,resolvedBy,files,labels')
             ->get();
+        if(!isset($build->branch)) $build->branch = $oldBuild->branch;
 
         $build = $this->loadModel('file')->processEditor($build, $this->config->build->editor->edit['id']);
         $this->dao->update(TABLE_BUILD)->data($build)

module/my/css/index.css

@@ -1,16 +0,0 @@
-.panel-block {height: 208px;overflow-y: auto; overflow-x: hidden; padding: 0}
-.panel-block.dynamic {height: 435px;}
-.panel-block .panel-heading {padding: 6px 10px; margin: 0;}
-.panel-block .panel-actions.pull-right {line-height: 36px; margin-right: -2px; margin-right: 5px!important\0}
-.panel > .table > thead > tr > th, .panel > form > .table > thead > tr > th {background: #f1f1f1!important}
-.panel-block td, .panel-block th {padding: 6px 6px 5px;}
-.panel-block.dynamic td {padding: 5px 6px 5px; overflow: hidden;}
-.panel-block tr > td:first-child, .panel-block tr > th:first-child, .outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 10px;}
-.panel-block .icon {color: #666; display: inline-block; margin-right: 2px;}
-#wrap .outer {padding: 20px 20px 0}
-.outer .panel-block .table tbody > tr:last-child td {border-bottom: none}
-
-.outer .row {padding: 0 !important; margin: 0 -10px}
-.outer .row > .col-md-8, .outer .row > .col-md-4 {padding: 0 10px}
-
-.projectline-canvas {position: relative;}

module/testtask/view/casesdata.html.php

@@ -23,7 +23,7 @@
           <th class='w-100px'>   <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
           <th class='w-80px'>    <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
           <th class='w-status'>  <?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='w-100px {sorter: false}'><?php echo $lang->actions;?></th>
+          <th class='w-120px {sorter: false}'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

www/theme/default/style.css

@@ -731,7 +731,6 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .datatable.head-fixed thead tr .headerSortDown > a:after,
 .datatable.head-fixed > .datatable-head .table > thead > tr > th a, .fixedTheadOfList > thead > tr > th a {color: #fff}
 .datatable.head-fixed > .datatable-head .table > thead > tr > th .header a, .fixedTheadOfList > thead > tr > th .header a {color: #ccc}
-.table-header-fixed {position: absolute; left: 0; top: 0; right: 0;}
 
 /* Help tab iframe */
 #helpContent {display: none; position: absolute; left: 0; right: 0; top: 73px; bottom: 40px; background-color: #fff;}