Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
wangyidong
2018-09-20 14:25:50 +08:00
parent 0b085311b4 bcca340d54
commit f3e026d2da
8 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/flowchart.html.php
+4 -3
View File
@@ -10,12 +10,12 @@
</div>
<style>
.block-flowchart .panel-body {padding: 0 30px 0 20px;}
.flow-item {float: left; width: 16.66667%; max-width: 180px; text-align: center; margin-bottom: 9px; padding-right: 5px;}
.flow-item {float: left; width: 16.66667%; max-width: 180px; text-align: center; margin-bottom: 9px; padding-right: 15px;}
.flow-item > div {position: relative; padding: 5px 0 5px 8px; line-height: 20px; background: #E8EBEF; white-space:nowrap; overflow: visible; color: #3c4353}
.flow-item > div:before, .flow-item > div:after {content: ' '; display: block; width: 0; height: 0; border-style: solid; border-width: 15px 0 15px 15px; border-color: transparent transparent transparent #E8EBEF; position: absolute; left: 0; top: 0}
.flow-item > div:before, .flow-item > div:after {content: ' '; display: block; width: 0; height: 0; border-style: solid; border-width: 15px 0 15px 10px; border-color: transparent transparent transparent #E8EBEF; position: absolute; left: 0; top: 0;}
.ie-8 .flow-item > div:before {display: none}
.flow-item > div:before {border-left-color: #fff; z-index: 1}
.flow-item > div:after {left: auto; right: -14px; z-index: 2}
.flow-item > div:after {left: auto; right: -10px; z-index: 2}
.ie-8 .flow-item > div {margin-right: 10px}
.flow-item-0 > div {color: #838A9D; font-weight: bold; padding-left: 0;}
.flow-item-0 > div:before {display: none}
@@ -40,6 +40,7 @@
.flow-item-5 > div:hover {background: #9C27B0; color: #fff;}
.flow-item-5 > div:hover:after {border-left-color: #9C27B0}
.block-sm .flow-item {padding-right: 5px}
.block-sm .flow-item > div:before, .block-sm .flow-item > div:after {border-width: 15px 0 15px 6px;}
.block-sm .row-3 .flow-item-1, .block-sm .row-3 .flow-item-3 {width: 25%}
.block-sm .flow-item > div:after {right: -6px;}
module/bug/view/browse.html.php
+3 -3
View File
@@ -297,7 +297,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php else:?>
<div class="dropdown-menu">
<div class="dropdown-menu search-list">
<?php endif;?>
<div class="list-group">
<?php
@@ -323,7 +323,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php else:?>
<div class="dropdown-menu">
<div class="dropdown-menu search-list">
<?php endif;?>
<div class="list-group">
<?php
@@ -349,7 +349,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php else:?>
<div class="dropdown-menu">
<div class="dropdown-menu search-list">
<?php endif;?>
<div class="list-group">
<?php
module/product/model.php
+1 -1
View File
@@ -661,7 +661,7 @@ class productModel extends model
}
/* Get last 5 roadmap. */
$lastKeys = array_slice(array_keys($groupRoadmap), -5);
$lastKeys = array_slice(array_keys($groupRoadmap), 0, 5);
$lastRoadmap = array();
$lastRoadmap['total'] = 0;
foreach($lastKeys as $key)
module/project/view/task.html.php
+4 -4
View File
@@ -238,7 +238,7 @@ js::set('browseType', $browseType);
<div class="table-footer">
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php
<?php
$canBatchEdit = common::hasPriv('task', 'batchEdit', !empty($task) ? $task : null);
$canBatchClose = (common::hasPriv('task', 'batchClose', !empty($task) ? $task : null) && strtolower($browseType) != 'closedBy');
$canBatchCancel = common::hasPriv('task', 'batchCancel', !empty($task) ? $task : null);
@@ -246,7 +246,7 @@ js::set('browseType', $browseType);
$canBatchAssignTo = common::hasPriv('task', 'batchAssignTo', !empty($task) ? $task : null);
?>
<div class='btn-group dropup'>
<?php
<?php
$actionLink = $this->createLink('task', 'batchEdit', "projectID=$projectID");
$disabled = $canBatchEdit ? '' : "disabled='disabled'";
@@ -276,7 +276,7 @@ js::set('browseType', $browseType);
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php else:?>
<div class="dropdown-menu">
<div class="dropdown-menu search-list">
<?php endif;?>
<div class="list-group">
<?php
@@ -307,7 +307,7 @@ js::set('browseType', $browseType);
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php else:?>
<div class="dropdown-menu">
<div class="dropdown-menu search-list">
<?php endif;?>
<div class="list-group">
<?php
module/testcase/view/browse.html.php
+11 -11
View File
@@ -64,7 +64,7 @@ js::set('suiteID', $suiteID);
</div>
<?php
$vars = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
if($useDatatable) include '../../common/view/datatable.html.php';
else include '../../common/view/tablesorter.html.php';
$setting = $this->datatable->getSetting('testcase');
@@ -102,18 +102,18 @@ js::set('suiteID', $suiteID);
<div class='btn-group dropup'>
<?php
$class = "class='disabled'";
$actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID&branch=$branch");
$misc = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
echo html::commonButton($lang->edit, $misc);
?>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
<ul class='dropdown-menu' id='moreActionMenu'>
<?php
<?php
$actionLink = $this->createLink('testcase', 'batchDelete', "productID=$productID");
$misc = common::hasPriv('testcase', 'batchDelete') ? "onclick=\"confirmBatchDelete('$actionLink')\"" : $class;
echo "<li>" . html::a('#', $lang->delete, '', $misc) . "</li>";
if(common::hasPriv('testcase', 'batchReview') and ($config->testcase->needReview or !empty($config->testcase->forceReview)))
{
echo "<li class='dropdown-submenu'>";
@@ -127,19 +127,19 @@ js::set('suiteID', $suiteID);
}
echo '</ul></li>';
}
if(common::hasPriv('testcase', 'batchConfirmStoryChange'))
{
$actionLink = $this->createLink('testcase', 'batchConfirmStoryChange', "productID=$productID");
$misc = common::hasPriv('testcase', 'batchConfirmStoryChange') ? "onclick=\"setFormAction('$actionLink')\"" : $class;
echo "<li>" . html::a('#', $lang->testcase->confirmStoryChange, '', $misc) . "</li>";
}
$actionLink = $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy");
$misc = common::hasPriv('testtask', 'batchRun') ? "onclick=\"setFormAction('$actionLink')\"" : $class;
echo "<li>" . html::a('#', $lang->testtask->runCase, '', $misc) . "</li>";
if(common::hasPriv('testcase', 'batchCaseTypeChange'))
{
echo "<li class='dropdown-submenu'>";
@@ -168,7 +168,7 @@ js::set('suiteID', $suiteID);
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php else:?>
<div class="dropdown-menu">
<div class="dropdown-menu search-list">
<?php endif;?>
<div class="list-group">
<?php
@@ -194,7 +194,7 @@ js::set('suiteID', $suiteID);
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<?php else:?>
<div class="dropdown-menu">
<div class="dropdown-menu search-list">
<?php endif;?>
<div class="list-group">
<?php
@@ -217,7 +217,7 @@ js::set('suiteID', $suiteID);
</div>
</div>
<script>
$('#module' + moduleID).closest('li').addClass('active');
$('#module' + moduleID).closest('li').addClass('active');
$('#' + caseBrowseType + 'Tab').addClass('btn-active-text').find('.text').after(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
<?php if($useDatatable):?>
$(function(){$('#caseForm').table();})
module/testtask/js/runcase.js
+8 -2
View File
@@ -1,17 +1,23 @@
custom = false;
$(document).on('keyup', 'form textarea', function()
{
var preSelect = $(this).closest('table').parent().prev().find('select');
if($(this).val() == '' && $(preSelect).val() == 'fail')
if($(this).val() == '' && $(preSelect).val() == 'fail' && !custom)
{
$(preSelect).val('pass');
}
else if($(this).val() != '' && $(preSelect).val() == 'pass')
else if($(this).val() != '' && $(preSelect).val() == 'pass' && !custom)
{
$(preSelect).val('fail').parent().addClass('has-error');
setTimeout(function(){$(preSelect).parent().removeClass('has-error');},'1000');
}
})
function checkStepValue(result)
{
if(result == 'pass') custom = true;
}
/* Delete a file. */
function deleteFile(fileID)
{
module/testtask/view/runcase.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
</td>
<?php if($step->type != 'group'):?>
<td class='text-left'><?php echo nl2br($step->expect);?></td>
<td class='text-center'><?php echo html::select("steps[$step->id]", $lang->testcase->resultList, 'pass', "class='form-control'");?></td>
<td class='text-center'><?php echo html::select("steps[$step->id]", $lang->testcase->resultList, 'pass', "class='form-control' onchange='checkStepValue(this.value)'");?></td>
<td>
<table class='w-p100'>
<tr>
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long