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

module/block/css/dashboard.css

@@ -7,7 +7,6 @@ body{padding-bottom: 20px;}
 #dashboard .panel-body.has-table {padding-top: 0;}
 #dashboard .panel-move-handler {position: absolute; top: 0; left: 0; right: 50px; height: 40px; z-index: 10; cursor: move;}
 #dashboard .panel-heading {cursor: move; padding-right: 75px;}
-#dashboard .panel.table-scrolled .table-header-fixed {border-bottom: 1px solid #e5e5e5;}
 @media (min-width: 992px)
 {
     #dashboard > .row {display: table; width: 100%; margin: 0;}

module/block/view/dynamic.html.php

@@ -2,13 +2,12 @@
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
 <style>
-.block-dynamic .timeline > li .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: normal;}
-.block-dynamic .timeline > li:hover .timeline-text {overflow: visible; text-overflow: normal; white-space: normal;}
+.block-dynamic .timeline > li .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 .block-dynamic .panel-body {padding-top: 0;}
 </style>
 <div class='panel-body'>
   <ul class="timeline timeline-tag-left no-margin">
-    <?php 
+    <?php
     $i = 0;
     foreach($actions as $action)
     {

module/common/view/tablesorter.html.php

@@ -1,17 +1,18 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<?php 
+<?php
 js::import($jsRoot . 'jquery/tablesorter/min.js');
 js::import($jsRoot . 'jquery/tablesorter/metadata.js');
 ?>
 <style>
 .tablesorter-header-inner {cursor: pointer;}
 .tablesorter-header-inner:hover {color: #000;font-weight:bold;}
-table.tablesorter tr.tablesorter-headerRow .header.tablesorter-headerUnSorted .tablesorter-header-inner:after {font-family: ZentaoIcon; font-weight: normal; content: "\f0dc"; font-size: 14px;}
+table.tablesorter tr.tablesorter-headerRow .header.tablesorter-headerUnSorted .tablesorter-header-inner:after {font-family: ZentaoIcon; font-weight: normal; content: "\f0dc"; font-size: 14px; color: #838a9c}
 table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner{color: #000;font-weight:bold;}
 table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner:after{font-family: ZentaoIcon; font-weight: normal; content: "\f0d8"; color: #000;}
 table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner{color: #000;font-weight:bold;}
 table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after{font-family: ZentaoIcon; font-weight: normal; content: "\f0d7"; color: #000;}
 table.tablesorter tr.tablesorter-headerRow .header.sorter-false .tablesorter-header-inner:after{content:"";}
+table.tablesorter.table-borderless > thead > tr > th {border-bottom: 1px solid #ddd;}
 </style>
 <script>
 function sortTable(selector, options)
@@ -20,7 +21,7 @@ function sortTable(selector, options)
     $table.tablesorter($.extend(
     {
         saveSort: true,
-        widgets: ['zebra', 'saveSort'], 
+        widgets: ['zebra', 'saveSort'],
         widgetZebra: {css: ['odd', 'even'] }
     }, $table.data(), options)).on('mouseenter', 'tbody tr', function()
     {

module/testcase/js/common.js

@@ -144,7 +144,9 @@ function setStories()
 function initSteps(selector)
 {
     /* Fix task #4832. Auto adjust textarea height. */
-    $('textarea.autosize').each($.autoResizeTextarea);
+    $('textarea.autosize').each(function() {
+        $.autoResizeTextarea(this);
+    });
 
     var $steps = $(selector || '#steps');
     var $stepTemplate = $('#stepTemplate').detach().removeClass('template').attr('id', null);

module/testcase/view/edit.html.php

@@ -47,7 +47,7 @@
           </div>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->testcase->steps;?></div>
-            <div class='form-group'>
+            <div class='detail-content'>
               <table class='table table-form table-bordered'>
                 <thead>
                   <tr>

www/js/zui/min.js

@@ -1,5 +1,5 @@
 /*!
- * ZUI: Zentao template - v1.8.1 - 2018-09-13
+ * ZUI: Zentao template - v1.8.1 - 2018-09-18
  * http://zui.sexy
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2018 cnezsoft.com; Licensed MIT

www/theme/default/style.css

@@ -8,16 +8,6 @@
 * @version     $Id: style.css 1454 2009-10-23 01:45:26Z wwccss $
 * @link        http://www.zentao.net
 */
-.article-content, .article>.content{word-wrap: break-word;}
-
-#noticeBox .alert {box-shadow: rgba(0,0,0,.15) 0 0.15rem 0.5rem, rgba(0,0,0,.25) 0 0.15rem 0.5rem;}
-.table.has-sort-head thead>tr>th>a.sort-down, .table.has-sort-head thead>tr>th>a.sort-up, .table.has-sort-head thead>tr>th>a:hover{color:#000;text-decoration: none;font-weight:bold}
-.table.has-sort-head thead>tr>th>a.sort-down:after,.table.has-sort-head thead>tr>th>a.sort-up:before,.table.has-sort-head thead>tr>th>a:hover:after,.table.has-sort-head thead>tr>th>a:hover:before{color:#000}
-.main-header>h2{font-size: 14px;}
-.detail-content{padding: 5px 0 0 0px; margin-left: -5px;}
-.article-content{margin-left: 0px;}
-.body-modal .main-header>h2{font-weight:bold;}
-.timeline > li .timeline-text{white-space: nowrap !important;}
 
 /* Finish task #4751. */
 .hide-sidebar #sidebar .cell{display:none;}