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-05-15 14:09:49 +08:00
parent 41d8cfe611 d5cf1f21f5
commit f8d523d5d7
8 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browse.html.php
+1 -1
View File
@@ -57,7 +57,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
</div>
</li>
<li class='right'>
<?php common::printLink('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID", "<i class='icon-common-report icon-bar-chart'></i> " . $lang->bug->report->common); ?>
<?php common::printLink('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID", "<i class='icon-bar-chart muted'></i> " . $lang->bug->report->common); ?>
</li>
<li class='right'>
<a href='###' class='dropdown-toggle' data-toggle='dropdown'>
module/product/view/browse.html.php
+1 -1
View File
@@ -53,7 +53,7 @@
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->product->searchStory;?></a>
</div>
<div class="btn-toolbar pull-right">
<?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID", '', 'button', 'bar-chart'); ?>
<?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID", '', 'button', 'bar-chart muted'); ?>
<div class="btn-group">
<button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export ?></span> <span class="caret"></span></button>
<ul class="dropdown-menu" id='exportActionMenu'>
module/productplan/view/edit.html.php
+1 -5
View File
@@ -17,11 +17,7 @@
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
<h2>
<span class='prefix'><?php echo html::icon($lang->icons['plan']);?></span>
<strong><?php echo html::a(inlink('view', "id=$plan->id"), $plan->title);?></strong>
<small><?php echo $lang->arrow . ' ' . $lang->productplan->edit;?></small>
</h2>
<h2><?php echo html::a(inlink('view', "id=$plan->id"), $plan->title);?></strong></h2>
</div>
<form class='load-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
<table class='table table-form'>
module/project/view/kanban.html.php
+5 -5
View File
@@ -121,13 +121,13 @@ $account = $this->app->user->account;
<?php foreach($group->tasks[$col] as $task):?>
<div class='board-item' data-id='<?php echo $task->id?>' id='task-<?php echo $task->id?>' data-type='task'>
<?php
$childrenAB = empty($task->parent) ? '' : "<span class='label'>" . $lang->task->childrenAB . '</span> ';
echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), "#{$task->id}{$childrenAB}{$task->name}", '', 'class="title kanbaniframe" title="' . $task->name . '"');
$childrenAB = empty($task->parent) ? '' : "<span class='label label-light label-badge'>" . $lang->task->childrenAB . '</span> ';
echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), "{$childrenAB}{$task->name}", '', 'class="title kanbaniframe" title="' . $task->name . '"');
?>
<div class='info'>
<?php
$assignedToRealName = "<span class='text'>" . zget($realnames, $task->assignedTo) . "</span>";
if(empty($task->assignedTo)) $assignedToRealName = "<span class='text-primary text'>{$lang->task->noAssigned}</span>";
$assignedToRealName = "<span>" . zget($realnames, $task->assignedTo) . "</span>";
if(empty($task->assignedTo)) $assignedToRealName = "<span class='text-primary'>{$lang->task->noAssigned}</span>";
echo html::a($this->createLink('task', 'assignTo', "projectID={$task->project}&taskID={$task->id}", '', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', 'class="btn btn-icon-left kanbaniframe task-assignedTo"');?>
<?php if(isset($task->delay)):?>
<span class="status-delayed"> <?php echo $lang->task->delayed;?></span>
@@ -143,7 +143,7 @@ $account = $this->app->user->account;
<?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), "<i class='icon-bug'></i> #{$bug->id}{$bug->title}", '', 'class="title kanbaniframe" title="' . $bug->title . '"');?>
<div class='info'>
<?php
$assignedToRealName = "<span class='text'>" . zget($realnames, $bug->assignedTo) . "</span>";
$assignedToRealName = "<span>" . zget($realnames, $bug->assignedTo) . "</span>";
if(empty($task->assignedTo)) $assignedToRealName = "<span class='text-primary text'>{$lang->task->noAssigned}</span>";
echo html::a($this->createLink('bug', 'assignTo', "bugID={$bug->id}", '', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', 'class="btn btn-icon-left kanbaniframe bug-assignedTo"');?>
<span class='status-<?php echo $bug->status;?>' title='<?php echo $lang->bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></span>
module/testtask/js/linkcase.js
-1
View File
@@ -1 +0,0 @@
$(function(){ajaxGetSearchForm();})
module/testtask/view/browse.html.php
+10 -10
View File
@@ -22,16 +22,16 @@ $status = $this->session->testTaskVersionStatus;
<?php if($this->config->global->flow != 'onlyTest'):?>
<div id="mainMenu" class='clearfix'>
<div class="btn-toolbar pull-left">
<div class='btn-group'>
<?php $viewName = $scope == 'local'? $productName : $lang->testtask->all;?>
<a href='javascript:;' class='btn btn-link' data-toggle='dropdown'><span class='text'><?php echo $viewName;?></span> <span class='caret'></span></a>
<ul class='dropdown-menu' style='max-height:240px;overflow-y:auto'>
<?php
echo "<li>" . html::a(inlink('browse', "productID=$productID&branch=0&type=all,$status"), $lang->testtask->all) . "</li>";
echo "<li>" . html::a(inlink('browse', "productID=$productID&branch=$branch&type=local,$status"), $productName) . "</li>";
?>
</ul>
</div>
<div class='btn-group'>
<?php $viewName = $scope == 'local'? $productName : $lang->testtask->all;?>
<a href='javascript:;' class='btn btn-link' data-toggle='dropdown'><span class='text'><?php echo $viewName;?></span> <span class='caret'></span></a>
<ul class='dropdown-menu' style='max-height:240px;overflow-y:auto'>
<?php
echo "<li>" . html::a(inlink('browse', "productID=$productID&branch=0&type=all,$status"), $lang->testtask->all) . "</li>";
echo "<li>" . html::a(inlink('browse', "productID=$productID&branch=$branch&type=local,$status"), $productName) . "</li>";
?>
</ul>
</div>
<?php echo html::a(inlink('browse', "productID=$productID&branch=$branch&type=$scope,wait"), "<span class='text'>{$lang->testtask->wait}</span>", '', "id='waitTab' class='btn btn-link'");?>
<?php echo html::a(inlink('browse', "productID=$productID&branch=$branch&type=$scope,doing"), "<span class='text'>{$lang->testtask->testing}</span>", '', "id='doingTab' class='btn btn-link'");?>
<?php echo html::a(inlink('browse', "productID=$productID&branch=$branch&type=$scope,blocked"), "<span class='text'>{$lang->testtask->blocked}</span>", '', "id='blockedTab' class='btn btn-link'");?>
module/testtask/view/linkcase.html.php
+16 -17
View File
@@ -15,55 +15,54 @@
<div class='btn-toolbar pull-left'>
<?php common::printBack($this->session->testtaskList, 'btn btn-link');?>
<div class='divider'></div>
<div class='page-title'>
<span class='label label-id'><?php echo $task->id;?></span>
<?php echo $task->name;?>
</div>
</div>
<div class='btn-toolbar pull-right'>
<?php
$lang->testtask->linkCase = $lang->testtask->linkByStory;
common::printLink('testtask', 'linkCase', "taskID=$taskID&type=bystory", $lang->testtask->linkByStory, '', "class='btn btn-primary'");
$allActive = $type == 'all' ? 'btn-active-text' : '';
$bystoryActive = $type == 'bystory' ? 'btn-active-text' : '';
common::printLink('testtask', 'linkCase', "taskID=$taskID&type=all", "<span class='text'>" . $lang->testtask->allCases . '</span>', '', "class='btn btn-link {$allActive}'");
common::printLink('testtask', 'linkCase', "taskID=$taskID&type=bystory", "<span class='text'>" . $lang->testtask->linkByStory . '</span>', '', "class='btn btn-link {$bystoryActive}'");
echo "<span class='dropdown'>";
echo "<button class='btn btn-primary' type='button' data-toggle='dropdown'>{$lang->testtask->linkBySuite} <span class='caret'></span></button>";
echo "<div class='btn-group'>";
$suitViewName = $type == 'bysuite'? $suiteList[$param]->name : $lang->testtask->linkBySuite;
echo "<a href='javascript:;' class='btn btn-link' data-toggle='dropdown'><span class='text'>{$suitViewName}</span> <span class='caret'></span></a>";
echo "<ul class='dropdown-menu' style='max-height:240px;overflow-y:auto'>";
if($suiteList)
{
foreach($suiteList as $suiteID => $suite)
{
$active = ($type == 'bysuite' and (int)$param == $suiteID) ? "class='active'" : '';
$suiteName = $suite->name;
if($suite->type == 'public') $suiteName .= " <span class='label label-info'>{$lang->testsuite->authorList[$suite->type]}</span>";
echo "<li $active>" . html::a(inlink('linkCase', "taskID=$taskID&type=bysuite&param=$suiteID"), $suiteName) . "</li>";
echo "<li>" . html::a(inlink('linkCase', "taskID=$taskID&type=bysuite&param=$suiteID"), $suiteName) . "</li>";
}
}
else
{
echo "<li>" . html::a('###', $lang->testsuite->noticeNone) . "</li>";
}
echo "</ul></span>";
echo "</ul></div>";
echo "<span class='dropdown'>";
echo "<button class='btn btn-primary' type='button' data-toggle='dropdown'>{$lang->testtask->linkByBuild} <span class='caret'></span></button>";
echo "<div class='btn-group'>";
$buildViewName = $type == 'bybuild'? zget($testTask, $param) : $lang->testtask->linkByBuild;
echo "<a href='javascript:;' class='btn btn-link' data-toggle='dropdown'><span class='text'>{$buildViewName}</span> <span class='caret'></span></a>";
echo "<ul class='dropdown-menu' style='max-height:240px;overflow-y:auto'>";
if($testTask)
{
foreach($testTask as $tmpID => $tmpTitle)
{
$active = ($type == 'bybuild' and (int)$param == $tmpID) ? "class='active'" : '';
echo "<li $active>" . html::a(inlink('linkCase', "taskID=$taskID&type=bybuild&param=$tmpID"), $tmpTitle) . "</li>";
echo "<li>" . html::a(inlink('linkCase', "taskID=$taskID&type=bybuild&param=$tmpID"), $tmpTitle) . "</li>";
}
}
else
{
echo "<li>" . html::a('###', $lang->testtask->noticeNoOther) . "</li>";
}
echo "</ul></span>";
echo "</ul></div>";
?>
<?php echo "<a class='btn btn-link querybox-toggle' id='bysearchTab'><i class='icon icon-search muted'></i>{$lang->testcase->bySearch}</a>";?>
</div>
</div>
<div id='mainContent' class='main-content'>
<div class="cell" id="queryBox"></div>
<form class='main-table table-case' data-ride='table' method='post'>
<table class='table'>
<div class="table-header">
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long