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

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

Browse Source
This commit is contained in:
tengfei
2018-05-22 13:48:01 +08:00
parent c4a8f46313 a39675dc22
commit 83d7c1430c
82 changed files with 198 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/bugblock.html.php
+2 -2
View File
@@ -42,9 +42,9 @@
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td class='c-id-xs'><?php echo $bug->id;?></td>
<?php if($longBlock):?>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $bug->pri?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
<?php endif;?>
<td class='c-severity'><span class='label-severity' data-severity='<?php echo zget($lang->bug->severityList, $bug->severity);?>'></span></td>
<td class='c-severity'><span class='label-severity' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo zget($lang->bug->severityList, $bug->severity);?>'></span></td>
<td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
<td class='c-status' title='<?php echo zget($lang->bug->statusList, $bug->status)?>'>
<span class="status-<?php echo $bug->status?>">
module/block/view/caseblock.html.php
+1 -1
View File
@@ -46,7 +46,7 @@
<?php if($longBlock):?>
<td class='c-id-xs'><?php echo $case->id;?></td>
<?php endif;?>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $case->pri?>'><?php echo zget($lang->case->priList, $case->pri, $case->pri)?></span></td>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $case->pri?>' title='<?php echo zget($lang->case->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->case->priList, $case->pri, $case->pri)?></span></td>
<td class='c-title text-left' style='color: <?php echo $case->color?>' title='<?php echo $case->title?>'><?php echo $case->title?></td>
<?php if($longBlock):?>
<td class='c-runtime'><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
module/block/view/storyblock.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
<?php if($longBlock):?>
<td class="c-id-xs"><?php echo $story->id;?></td>
<?php endif;?>
<td class="c-pri"><span class="label-pri label-pri-<?php echo $story->pri?>"><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td class="c-pri"><span class="label-pri label-pri-<?php echo $story->pri?>" title="<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>"><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td class="c-name" style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
<?php if($longBlock):?>
<td class='c-estimate text-center'><?php echo $story->estimate?></td>
module/block/view/taskblock.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td class='c-id-xs'><?php echo $task->id;?></td>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $task->pri;?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
<td class='c-pri'><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
<td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo $task->name?></td>
<?php if($longBlock):?>
<td class='c-estimate text-center'><?php echo $task->estimate?></td>
module/bug/model.php
+1 -1
View File
@@ -2435,7 +2435,7 @@ class bugModel extends model
echo "<span class='label-severity' data-severity='{$bug->severity}' title='" . zget($this->lang->bug->severityList, $bug->severity) . "'></span>";
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $bug->pri . "'>";
echo "<span class='label-pri label-pri-" . $bug->pri . "' title='" . zget($this->lang->bug->priList, $bug->pri, $bug->pri) . "'>";
echo zget($this->lang->bug->priList, $bug->pri, $bug->pri);
echo "</span>";
break;
module/bug/view/linkbugs.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
</div>
<?php printf('%03d', $bug2Link->id);?>
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug2Link->pri?>'><?php echo zget($lang->bug->priList, $bug2Link->pri, $bug2Link->pri);?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug2Link->pri?>' title='<?php echo zget($lang->bug->priList, $bug2Link->pri, $bug2Link->pri);?>'><?php echo zget($lang->bug->priList, $bug2Link->pri, $bug2Link->pri);?></span></td>
<td><?php echo html::a($this->createLink('product', 'browse', "productID=$bug2Link->product&branch=$bug2Link->branch"), $products[$bug2Link->product], '_blank');?></td>
<td class='text-left nobr' title="<?php echo $bug2Link->title?>"><?php echo html::a($bugLink, $bug2Link->title);?></td>
<td><?php echo zget($lang->bug->statusList, $bug->status, '');?></td>
module/bug/view/view.html.php
+1 -1
View File
@@ -113,7 +113,7 @@
</tr>
<tr>
<th><?php echo $lang->bug->pri;?></th>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
</tr>
<tr>
<th><?php echo $lang->bug->status;?></th>
module/build/view/linkbug.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<td class='c-id text-left'>
<?php echo html::checkbox('bugs', array($bug->id => sprintf('%03d', $bug->id)), ($bug->status == 'resolved' or $bug->status == 'closed') ? $bug->id : '');?>
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td style='overflow:visible;padding-top:1px;padding-bottom:1px;'><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? $users[$bug->resolvedBy] : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?></td>
module/build/view/linkstory.html.php
+1 -1
View File
@@ -45,7 +45,7 @@
<td class='c-id text-left'>
<?php echo html::checkbox('stories', array($story->id => sprintf('%03d', $story->id)), ($story->stage == 'developed' or $story->status == 'closed') ? $story->id : '');?>
</td>
<td><span class='label-pri label-pri-<?php echo $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td><span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $users[$story->assignedTo];?></td>
module/build/view/view.html.php
+1 -1
View File
@@ -120,7 +120,7 @@ tbody tr td:first-child input{display:none;}
<?php printf('%03d', $story->id);?>
<?php endif;?>
</td>
<td><span class='label-pri label-pri-<?php echo $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td><span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $story->estimate;?></td>
module/common/model.php
+2 -2
View File
@@ -196,7 +196,7 @@ class commonModel extends model
if(strpos($this->server->http_user_agent, 'Trident') !== false)
{
echo "<a href='$denyLink' id='denylink' style='display:none'>deny</a>";
echo "<script language='javascript'>document.getElementById('denylink').click();</script>";
echo "<script>document.getElementById('denylink').click();</script>";
}
else
{
@@ -668,7 +668,7 @@ class commonModel extends model
global $lang;
if(!commonModel::hasPriv('action', 'comment', $object)) return false;
echo html::commonButton('<i class="icon icon-chat-line"></i> ' . $lang->action->create, "title='$lang->comment'", 'btn btn-link pull-right btn-comment');
echo html::commonButton('<i class="icon icon-chat-line"></i> ' . $lang->action->create, '', 'btn btn-link pull-right btn-comment');
echo <<<EOD
<div class="modal fade modal-comment">
<div class="modal-dialog">
module/common/view/datatable.fix.html.php
+1 -1
View File
@@ -7,7 +7,7 @@ $(function()
$("a[data-toggle='showModuleModal']").click(function(){$('#showModuleModal').modal('show')});
<?php endif;?>
var $btnToolbar = $('#main #mainContent form.main-table .table-header .btn-toolbar:first');
var $btnToolbar = $('#main .table-header .btn-toolbar:first');
if($btnToolbar.length > 0)
{
<?php $mode = isset($this->config->datatable->$datatableId->mode) ? $this->config->datatable->$datatableId->mode : 'table';?>
module/common/view/header.html.php
+2 -1
View File
@@ -19,7 +19,8 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
<div class='container'>
<hrgroup id='heading'>
<?php if(empty($this->config->sso->redirect)):?>
<h1 id='companyname' title='<?php printf($lang->welcome, $app->company->name);?>'><?php printf($lang->welcome, $app->company->name);?></h1>
<?php $heading = sprintf($lang->welcome, $app->company->name);?>
<h1 id='companyname' title='<?php echo $heading . strlen($heading);?>'<?php if(strlen($heading) > 36) echo " class='long-name'" ?>><?php echo $heading;?></h1>
<?php endif;?>
</hrgroup>
<nav id='navbar'><?php commonModel::printMainmenu($this->moduleName);?></nav>
module/common/view/kindeditor.html.php
+1 -1
View File
@@ -16,7 +16,7 @@ js::set('kuid', $uid);
<link rel="stylesheet" href="<?php echo $jsRoot;?>kindeditor/themes/default/default.css" />
<script src='<?php echo $jsRoot;?>kindeditor/kindeditor-min.js' type='text/javascript'></script>
<script src='<?php echo $jsRoot;?>kindeditor/lang/<?php echo $editorLang;?>.js' type='text/javascript'></script>
<script language='javascript'>
<script>
var editor = <?php echo json_encode($editor);?>;
var bugTools =
module/common/view/treetable.html.php
+1 -1
View File
@@ -3,4 +3,4 @@
css::import($defaultTheme . 'treetable.css');
js::import($jsRoot . 'jquery/treetable/min.js');
?>
<script language='javascript'>$(function() { $("#treetable").treeTable({clickableNodeNames:true,initialState:"expanded"})})</script>
<script>$(function() { $("#treetable").treeTable({clickableNodeNames:true,initialState:"expanded"})})</script>
module/common/view/ueditor.html.php
+3 -3
View File
@@ -13,9 +13,9 @@ $editorLang = isset($editorLangs[$app->getClientLang()]) ? $editorLangs[$app->
$uid = uniqid('');
js::set('kuid', $uid);
?>
<script type="text/javascript" charset="utf-8" src="<?php echo $this->app->getWebRoot() . "js/"?>ueditor/ueditor.config.js"></script>
<script type="text/javascript" charset="utf-8" src="<?php echo $this->app->getWebRoot() . "js/"?>ueditor/ueditor.all.min.js"> </script>
<script language='javascript'>
<script charset="utf-8" src="<?php echo $this->app->getWebRoot() . "js/"?>ueditor/ueditor.config.js"></script>
<script charset="utf-8" src="<?php echo $this->app->getWebRoot() . "js/"?>ueditor/ueditor.all.min.js"> </script>
<script>
var editor = <?php echo json_encode($editor);?>;
var toolbars = [[
module/doc/config.php
+1 -1
View File
@@ -20,7 +20,7 @@ $config->doc->custom->objectLibs = $config->doc->customObjectLibs;
$config->doc->editor = new stdclass();
$config->doc->editor->create = array('id' => 'content', 'tools' => 'fullTools');
$config->doc->editor->edit = array('id' => 'content', 'tools' => 'fullTools');
$config->doc->editor->view = array('id' => 'comment,lastComment', 'tools' => 'fullTools');
$config->doc->editor->view = array('id' => 'comment,lastComment', 'tools' => 'simple');
$config->doc->markdown = new stdclass();
$config->doc->markdown->create = array('id' => 'contentMarkdown', 'tools' => 'withchange');
module/doc/view/view.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/ueditor.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php echo css::internal($keTableCSS);?>
<?php $browseLink = $this->session->docList ? $this->session->docList : inlink('browse');?>
<div id="mainMenu" class="clearfix">
module/file/view/printfiles.html.php
+1 -1
View File
@@ -11,7 +11,7 @@ $sessionString .= session_name() . '=' . session_id();
<style>
.files-list>li>a {display: inline;}
</style>
<script language='Javascript'>
<script>
$(function(){
$(".edit").modalTrigger({width:350, type:'iframe'});
})
module/misc/view/checkupdate.html.php
+1 -1
View File
@@ -4,7 +4,7 @@
<body <?php if($browser != 'opera') echo "bgcolor='transparent'";?> style='color:white; font-size:13px; text-align:center'>
<?php if($note):?>
<?php echo $note;?>
<script language='javascript'>window.parent.document.getElementById('updater').className=''</script>
<script>window.parent.document.getElementById('updater').className=''</script>
<?php endif;?>
</body>
</html>
module/my/view/bug.html.php
+2 -2
View File
@@ -59,8 +59,8 @@
<?php endif;?>
<?php printf('%03d', $bug->id);?>
</td>
<td><span class='<?php echo 'label-severity';?>' data-severity='<?php echo $bug->severity;?>'></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
<td><span class='<?php echo 'label-severity';?>' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>'></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
<td><?php echo zget($lang->bug->typeList, $bug->type, '');?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
module/my/view/story.html.php
+1 -1
View File
@@ -63,7 +63,7 @@
<?php endif;?>
<?php printf('%03d', $story->id);?>
</td>
<td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='c-product'><?php echo $story->productTitle;?></td>
<td class='c-name nobr'><?php echo html::a($storyLink, $story->title, null, "style='color: $story->color'");?></td>
<td class='c-plan'><?php echo $story->planTitle;?></td>
module/my/view/task.html.php
+1 -1
View File
@@ -64,7 +64,7 @@
<?php endif;?>
<?php printf('%03d', $task->id);?>
</td>
<td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>'><?php echo zget($lang->task->priList, $task->pri);?></span></td>
<td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri);?></span></td>
<td class='c-project' title="<?php echo $task->projectName;?>"><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
<td class='c-name'>
<?php if(!empty($task->team)) echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';?>
module/my/view/testcase.html.php
+1 -1
View File
@@ -71,7 +71,7 @@
<?php endif;?>
<?php printf('%03d', $case->id);?>
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $case->pri?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $case->pri?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title, null, "style='color: $case->color'");?></td>
<td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
<td><?php echo zget($users, $case->openedBy);?></td>
module/my/view/todo.html.php
+1 -1
View File
@@ -79,7 +79,7 @@
</td>
<td class="c-date"><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
<td class="c-type"><?php echo $lang->todo->typeList[$todo->type];?></td>
<td class="c-pri"> <span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
<td class="c-pri"> <span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
<td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
<td class="c-begin"><?php echo $todo->begin;?></td>
<td class="c-end"><?php echo $todo->end;?></td>
module/product/js/browse.js
+1 -34
View File
@@ -4,40 +4,7 @@ $(function()
$('.popoverStage').mouseout(function(){$(this).popover('hide')});
if($('#storyList thead th.w-title').width() < 150) $('#storyList thead th.w-title').width(150);
$(document).on('click', "#storyList tbody tr, .table-footer .check-all, #storyList thead .check-all", function(){showCheckedSummary();});
$(document).on('change', "#storyList :checkbox", function(){showCheckedSummary();});
$(document).on('click', "#datatable-storyList table tr", function(){showCheckedSummary();});
})
function showCheckedSummary()
{
var $summary = $('#main #mainContent form.main-table .table-header .table-statistic');
var checkedTotal = 0;
var checkedEstimate = 0;
var checkedCase = 0;
$('[name^="storyIDList"]').each(function()
{
if($(this).prop('checked'))
{
checkedTotal += 1;
var taskID = $(this).val();
$tr = $("#storyList tbody tr[data-id='" + taskID + "']");
checkedEstimate += Number($tr.data('estimate'));
if(Number($tr.data('cases')) > 0) checkedCase += 1;
}
});
if(checkedTotal > 0)
{
rate = Math.round(checkedCase / checkedTotal * 10000) / 100 + '' + '%';
summary = checkedSummary.replace('%total%', checkedTotal)
.replace('%estimate%', checkedEstimate)
.replace('%rate%', rate)
$summary.html(summary);
}
}
});
function setQueryBar(queryID, title)
{
module/product/view/browse.html.php
+33 -5
View File
@@ -99,9 +99,8 @@
</div>
<div class="main-col">
<div class="cell" id="queryBox"></div>
<form class="main-table table-story" data-ride="table" method="post" id='productStoryForm'>
<div class="table-header">
<div class="table-statistic"><?php echo $summary;?></div>
<form class="main-table table-story skip-iframe-modal" method="post" id='productStoryForm'>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
</div>
<?php
@@ -317,6 +316,7 @@
</div>
<?php endif;?>
</div>
<div class="table-statistic"><?php echo $summary;?></div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php elseif(common::hasPriv('story', 'create')):?>
@@ -327,8 +327,7 @@
</form>
</div>
</div>
<?php js::set('checkedSummary', $lang->product->checkedSummary);?>
<script language='javascript'>
<script>
var moduleID = <?php echo $moduleID?>;
$('#module<?php echo $moduleID;?>').addClass('active');
<?php if($browseType == 'bysearch'):?>
@@ -343,5 +342,34 @@ else
ajaxGetSearchForm();
}
<?php endif;?>
$(function()
{
// Update table summary text
var checkedSummary = '<?php echo $lang->product->checkedSummary?>';
$('#productStoryForm').table(
{
statisticCreator: function(table)
{
var $checkedRows = table.$.find('tbody>tr.checked');
var checkedTotal = $checkedRows.length;
if(!checkedTotal) return;
var checkedEstimate = 0;
var checkedCase = 0;
$checkedRows.each(function()
{
var $row = $(this);
var data = $row.data();
checkedEstimate += data.estimate;
checkedCase += data.cases;
});
var rate = Math.round(checkedCase / checkedTotal * 10000) / 100 + '' + '%';
return checkedSummary.replace('%total%', checkedTotal)
.replace('%estimate%', checkedEstimate)
.replace('%rate%', rate);
}
});
});
</script>
<?php include '../../common/view/footer.html.php';?>
module/product/view/roadmap.html.php
+1 -1
View File
@@ -47,7 +47,7 @@
<div class="block">
<span class="title"><?php echo isset($roadmap->build) ? $roadmap->name : $roadmap->title;?></span>
<span class="date"><?php echo isset($roadmap->build) ? $roadmap->date : ($roadmap->end == '2030-01-01' ? $lang->productplan->future : $roadmap->begin . '~' . $roadmap->end);?></span>
<span class="info text-ellipsis" title="<?php echo strip_tags($roadmap->desc);?>"><?php echo $roadmap->desc;?>&nbsp;</span>
<span class="info text-ellipsis">&nbsp;</span>
</div>
</a>
</li>
module/productplan/view/linkbug.html.php
+1 -1
View File
@@ -42,7 +42,7 @@
<td class='c-id text-left'>
<?php echo html::checkbox('bugs', array($bug->id => sprintf('%03d', $bug->id)));?>
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->assignedTo];?></td>
module/productplan/view/linkstory.html.php
+1 -1
View File
@@ -46,7 +46,7 @@
<td class='c-id text-left'>
<?php echo html::checkbox('stories', array($story->id => sprintf('%03d', $story->id)));?>
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td><?php echo $story->planTitle;?></td>
<td title='<?php echo $modules[$story->module]?>'><?php echo $modules[$story->module];?></td>
<td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
module/productplan/view/view.html.php
+2 -2
View File
@@ -132,7 +132,7 @@
<?php endif;?>
</td>
<?php if($canOrder):?><td class='sort-handler'><i class='icon-move'></i></td><?php endif;?>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left nobr'><?php echo zget($modulePairs, $story->module, '');?></td>
<td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($viewLink , $story->title);?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
@@ -370,7 +370,7 @@
<?php printf('%03d', $bug->id);?>
<?php endif;?>
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->assignedTo);?></td>
module/project/css/common.css
+1
View File
@@ -18,6 +18,7 @@
.table td.has-child > .task-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s;}
.table td.has-child > .task-toggle > .icon:before {text-align: left;}
.table td.has-child > .task-toggle.collapsed > .icon {transform: rotate(-90deg);}
.main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
.chosen-container-single .chosen-single > span{max-width:200px;}
module/project/css/grouptask.css
+2 -1
View File
@@ -12,4 +12,5 @@
.segment + .segment > .segment-value {padding-left: 10px;}
.segment-title {color: #828A9D; font-size: 12px;}
.segment-value {font-weight: bold;}
.c-assign a{height:30px}
.group-menu > .dropdown > .dropdown-menu{right: 0; width: 100%;}
module/project/css/kanban.css
+1
View File
@@ -31,3 +31,4 @@
#kanban .table-grouped tbody > tr:hover {background: transparent;}
#kanban .c-boards, #kanban td.c-side {border-bottom: 1px solid #eee;}
#kanban .group-info > span + span {display: inline-block; margin-left: 8px;}
#kanban th.c-board {color: #3c4353; font-weight: bold;}
module/project/css/storykanban.css
+2
View File
@@ -31,3 +31,5 @@
#kanban .table-grouped tbody > tr:hover {background: transparent;}
#kanban .c-boards, #kanban td.c-side {border-bottom: 1px solid #eee;}
#kanban .group-info > span + span {display: inline-block; margin-left: 8px;}
#kanban th.c-board {color: #3c4353; font-weight: bold;}
.story-estimate{margin-right: 5px;}
module/project/js/task.js
-48
View File
@@ -4,10 +4,6 @@ $(function()
if(browseType == 'bysearch') ajaxGetSearchForm();
if($('#taskList thead th.w-name').width() < 150) $('#taskList thead th.w-name').width(150);
$(document).on('click', "#taskList tbody tr, .table-footer .check-all, #taskList thead .check-all", function(){showCheckedSummary();});
$(document).on('change', "#taskList :checkbox", function(){showCheckedSummary();});
$(document).on('click', "#datatable-taskList table tr", function(){showCheckedSummary();});
});
function setQueryBar(queryID, title)
@@ -16,49 +12,5 @@ function setQueryBar(queryID, title)
$tagTab.before("<li id='QUERY" + queryID + "Tab' class='active'><a href='" + createLink('project', 'task', "projectID=" + projectID + "&browseType=bysearch&param=" + queryID) + "'>" + title + "</a></li>");
}
function showCheckedSummary()
{
var $summary = $('#main #mainContent form.main-table .table-header .table-statistic');
var checkedTotal = 0;
var checkedWait = 0;
var checkedDoing = 0;
var checkedEstimate = 0;
var checkedConsumed = 0;
var checkedLeft = 0;
$('[name^="taskIDList"]').each(function()
{
if($(this).prop('checked'))
{
var taskID = $(this).val();
$tr = $("#taskList tbody tr[data-id='" + taskID + "']");
checkedTotal += 1;
var taskStatus = $tr.data('status');
if(taskStatus == 'wait') checkedWait += 1;
if(taskStatus == 'doing') checkedDoing += 1;
if(!$tr.hasClass('table-children'))
{
if(taskStatus != 'cancel')
{
checkedEstimate += Number($tr.data('estimate'));
checkedConsumed += Number($tr.data('consumed'));
}
if(taskStatus != 'cancel' && taskStatus != 'closed') checkedLeft += Number($tr.data('left'));
}
}
});
if(checkedTotal > 0)
{
summary = checkedSummary.replace('%total%', checkedTotal).replace('%wait%', checkedWait)
.replace('%doing%', checkedDoing)
.replace('%estimate%', checkedEstimate)
.replace('%consumed%', checkedConsumed)
.replace('%left%', checkedLeft);
$summary.html(summary);
}
}
$('#module' + moduleID).addClass('active');
$('#product' + productID).addClass('active');
module/project/view/bug.html.php
+3 -3
View File
@@ -61,8 +61,8 @@
<?php printf('%03d', $bug->id);?>
<?php endif;?>
</td>
<td><span class='<?php echo 'label-severity';?>' data-severity='<?php echo $bug->severity;?>'></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td><span class='<?php echo 'label-severity';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left' title="<?php echo $bug->title?>"><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?></td>
<td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
<td class='c-assignedTo has-btn text-left'>
@@ -70,7 +70,7 @@
<?php $params = "bugID=$bug->id";?>
<?php $class = $bug->assignedTo == $this->app->user->account ? 'text-red' : 'text-primary';?>
<?php if(common::hasPriv('bug', 'assignTo')):?>
<?php echo html::a($this->createLink('bug', 'assignTo', $params, '', 'true'), "<i class='icon icon-hand-right'></i> <span class='$class'>$assignedTo</span>", '', "class='iframe btn btn-icon-left'");?>
<?php echo html::a($this->createLink('bug', 'assignTo', $params, '', 'true'), "<i class='icon icon-hand-right'></i> <span class='$class'>$assignedTo</span>", '', "class='iframe btn btn-icon-left btn-sm'");?>
<?php else:?>
<?php echo $assignedTo;?>
<?php endif;?>
module/project/view/grouptask.html.php
+7 -4
View File
@@ -76,7 +76,10 @@
<tr class="divider">
<th class="c-side text-left has-btn group-menu">
<div class="dropdown">
<a href="" data-toggle="dropdown" class="btn text-left btn-block btn-link"><?php echo zget($lang->project->groups, $groupBy, null);?> <i class="icon icon-caret-down hl-primary text-primary pull-right"></i></a>
<a href="" data-toggle="dropdown" class="btn text-left btn-block btn-link clearfix">
<span class='pull-left'><?php echo zget($lang->project->groups, $groupBy, null);?></span>
<i class="icon icon-caret-down hl-primary text-primary pull-right"></i>
</a>
<ul class="dropdown-menu">
<?php foreach($lang->project->groups as $key => $value):?>
<?php
@@ -151,8 +154,8 @@
</td>
<?php endif;?>
<td class='c-id-sm'><?php echo $task->id;?></td>
<td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td class="c-name">
<td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td class="c-name" title="<?php echo $task->name;?>">
<?php
if(!empty($task->team)) echo '<span class="label label-light label-badge">' . $lang->task->multipleAB . '</span> ';
if(!empty($task->parent)) echo '<span class="label label-light label-badge">' . $lang->task->childrenAB . '</span> ';
@@ -162,7 +165,7 @@
</td>
<td class="c-status"><span class='status-<?php echo $task->status;?>'><span class="label label-dot"></span> <?php echo $lang->task->statusList[$task->status];?></span></td>
<?php $assignedToRealName = $task->assignedToRealName ? $task->assignedToRealName : $lang->task->noAssigned;?>
<td class="c-assign text-left has-btn"><?php echo html::a($this->createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", 'html', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', "class='iframe btn btn-icon-left' $assignedToClass");?></td>
<td class="c-assign text-left has-btn"><?php echo html::a($this->createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", 'html', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', "class='iframe btn btn-icon-left btn-sm' $assignedToClass");?></td>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<td class="c-hours em"><?php echo $task->estimate;?></td>
<td class="c-hours em"><?php echo $task->consumed;?></td>
module/project/view/importbug.html.php
+1 -1
View File
@@ -55,7 +55,7 @@ var browseType = '<?php echo $browseType;?>';
<?php echo sprintf('%03d', $bug->id) . html::hidden("id[$bug->id]", $bug->id);?>
</td>
<td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'", true, true);?></td>
<td><span class='status-<?php echo $bug->status?>'><span class='label label-dot'></span> <?php echo $lang->bug->statusList[$bug->status];?></span></td>
<td style='overflow:visible'><?php echo html::select("pri[$bug->id]", $lang->task->priList, 3, "class='form-control chosen'");?></td>
module/project/view/importtask.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<?php printf('%03d', $task->id);?>
</td>
<td><?php echo substr($projects[$task->project], 2);?></td>
<td><span class='label-pri label-pri-<?php echo $task->pri;?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td class='text-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
<td <?php echo $class;?>><?php echo $task->assignedToRealName;?></td>
<td><?php echo $task->left;?></td>
module/project/view/linkstory.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
<?php echo html::checkbox('stories', array($story->id => sprintf('%03d', $story->id)));?>
<?php echo html::hidden("products[$story->id]", $story->product);?>
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left' title='<?php echo $products[$story->product]->name?>'><?php echo html::a($this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch"), $products[$story->product]->name, '_blank');?></td>
<td class='text-left' title='<?php echo zget($modules, $story->module, '')?>'><?php echo zget($modules, $story->module, '')?></td>
<td class='text-left nobr' title="<?php echo $story->title?>"><?php echo html::a($storyLink, $story->title);?></td>
module/project/view/preview.html.php
+1 -1
View File
@@ -228,7 +228,7 @@ $dataType = '';
<canvas id='burnChart' data-bezier-curve='false' data-responsive='true'></canvas>
</div>
</body>
<script language='Javascript'>
<script>
function initBurnChar()
{
var data =
module/project/view/story.html.php
+1 -1
View File
@@ -133,7 +133,7 @@
<?php if($canOrder):?>
<td class='sort-handler'><i class='icon-move'></i></td>
<?php endif;?>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left' title="<?php echo $story->title?>">
<?php if(isset($branchGroups[$story->product][$story->branch])) echo "<span class='label label-info label-badge'>" . $branchGroups[$story->product][$story->branch] . '</span>';?>
<?php echo html::a($storyLink,$story->title, null, "style='color: $story->color'");?>
module/project/view/task.html.php
+47 -5
View File
@@ -139,9 +139,8 @@ js::set('browseType', $browseType);
</div>
<div class="main-col">
<div class="cell" id="queryBox"></div>
<form class="main-table table-task" data-ride="table" method="post" id='projectTaskForm'>
<div class="table-header">
<div class="table-statistic"><?php echo $summary;?></div>
<form class="main-table table-task skip-iframe-modal" method="post" id='projectTaskForm'>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
</div>
<?php
@@ -276,13 +275,13 @@ js::set('browseType', $browseType);
</div>
<?php endif;?>
</div>
<div class="table-statistic"><?php echo $summary;?></div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
</div>
</div>
<?php js::set('checkedSummary', $lang->project->checkedSummary);?>
<?php js::set('replaceID', 'taskList')?>
<script>
<?php if($browseType == 'bysearch'):?>
@@ -295,6 +294,49 @@ if($shortcut.size() > 0)
}
<?php endif;?>
statusActive = '<?php echo isset($lang->project->statusSelects[$this->session->taskBrowseType]);?>';
if(statusActive) $('#statusTab').addClass('active')
if(statusActive) $('#statusTab').addClass('active');
$(function()
{
// Update table summary text
var checkedSummary = '<?php echo $lang->project->checkedSummary?>';
$('#projectTaskForm').table(
{
statisticCreator: function(table)
{
var $checkedRows = table.$.find('tbody>tr.checked');
var checkedTotal = $checkedRows.length;
if(!checkedTotal) return;
var checkedWait = 0;
var checkedDoing = 0;
var checkedEstimate = 0;
var checkedConsumed = 0;
var checkedLeft = 0;
$checkedRows.each(function()
{
var $row = $(this);
var data = $row.data();
var status = data.status;
if(status === 'wait') checkedWait++;
if(status === 'doing') checkedDoing++;
if(!$row.hasClass('table-children'))
{
if(status !== 'cancel')
{
checkedEstimate += Number(data.estimate);
checkedConsumed += Number(data.consumed);
}
if(status != 'cancel' && status != 'closed') checkedLeft += Number(data.left);
}
});
return checkedSummary.replace('%total%', checkedTotal).replace('%wait%', checkedWait)
.replace('%doing%', checkedDoing)
.replace('%estimate%', checkedEstimate)
.replace('%consumed%', checkedConsumed)
.replace('%left%', checkedLeft);
}
})
});
</script>
<?php include '../../common/view/footer.html.php';?>
module/project/view/treestory.html.php
+1 -1
View File
@@ -116,7 +116,7 @@
</tr>
<tr>
<th><?php echo $lang->story->pri;?></th>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
</tr>
<tr>
<th><?php echo $lang->story->estimate;?></th>
module/release/view/linkbug.html.php
+1 -1
View File
@@ -46,7 +46,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<td class='c-id text-left'>
<?php echo html::checkbox('bugs', array($bug->id => sprintf('%03d', $bug->id)), ($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') ? $bug->id : '');?>
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
module/release/view/linkstory.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
</div>
<?php printf('%03d', $story->id);?>
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
module/release/view/view.html.php
+1 -1
View File
@@ -102,7 +102,7 @@
<?php endif;?>
<?php echo sprintf('%03d', $story->id);?>
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $story->estimate;?></td>
module/search/model.php
+1 -1
View File
@@ -73,7 +73,7 @@ class searchModel extends model
if($andOr != 'AND' and $andOr != 'OR') $andOr = 'AND';
/* Set operator. */
$value = $this->post->$valueName;
$value = trim($this->post->$valueName);
$operator = $this->post->$operatorName;
if(!isset($this->lang->search->operators[$operator])) $operator = '=';
module/search/view/buildform.html.php
+2 -2
View File
@@ -93,7 +93,7 @@ foreach($fieldParams as $fieldName => $param)
echo "<td class='w-110px' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '</td>';
/* Print operator. */
echo "<td class='w-80px'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
echo "<td class='w-90px'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
/* Print value. */
echo "<td id='valueBox$fieldNO' style='overflow:visible'>";
@@ -153,7 +153,7 @@ foreach($fieldParams as $fieldName => $param)
echo "<td class='w-110px' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '</td>';
/* Print operator. */
echo "<td class='w-80px'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
echo "<td class='w-90px'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
/* Print value. */
echo "<td id='valueBox$fieldNO'>";
module/story/model.php
+1 -1
View File
@@ -2363,7 +2363,7 @@ class storyModel extends model
echo html::checkbox('storyIDList', array($story->id => sprintf('%03d', $story->id)));
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $story->pri . "'>";
echo "<span class='label-pri label-pri-" . $story->pri . "' title='" . zget($this->lang->story->priList, $story->pri, $story->pri) . "'>";
echo zget($this->lang->story->priList, $story->pri, $story->pri);
echo "</span>";
break;
module/story/view/header.html.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<script language='Javascript'>
<script>
function loadProduct(productID)
{
loadProductBranches(productID)
module/story/view/review.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include './header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<script language='Javascript'>
<script>
var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : print($story->openedBy);?>';
</script>
<div class='main-content' id='mainContent'>
module/story/view/view.html.php
+1 -1
View File
@@ -144,7 +144,7 @@
</tr>
<tr>
<th><?php echo $lang->story->pri;?></th>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
</tr>
<tr>
<th><?php echo $lang->story->estimate;?></th>
module/story/view/zerocase.html.php
+1 -1
View File
@@ -50,7 +50,7 @@
</div>
<?php printf('%03d', $story->id);?>
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
<td class='text-left' title="<?php echo $story->title?>"><nobr><?php echo html::a($viewLink, $story->title);?></nobr></td>
<td title="<?php echo $story->planTitle?>"><?php echo $story->planTitle;?></td>
<td><?php echo $lang->story->sourceList[$story->source];?></td>
module/task/js/common.js
+7 -2
View File
@@ -2,7 +2,7 @@
function checkLeft()
{
value = $("#left").val();
if(isNaN(parseInt(value)) || value == 0)
if(isNaN(parseInt(value)) || value == 0)
{
if(confirm(confirmFinish))
{
@@ -54,7 +54,12 @@ $('#modalTeam .btn').click(function()
time += estimate;
}
$('#teamMember').val(team);
$('#teamMember').val(team).attr('title', team);
$('#estimate').val(time);
})
});
$('a.btn-move-add').on('click', function () {
var html = $("#modalTeam table.table tr").eq(-2).html();
$("#modalTeam table.table tr:last").before('<tr>' + html + '</tr>');
});
module/task/model.php
+7 -4
View File
@@ -2319,12 +2319,15 @@ class taskModel extends model
case 'assignedTo':
$btnTextClass = '';
$assignedToText = zget($users, $task->assignedTo);
$btnTextClass = 'text-primary';
if(empty($task->assignedTo)) $assignedToText = $this->lang->task->noAssigned;
if($task->assignedTo == $account) $btnTextClass = 'text-red';
$btnTextClass = '';
if(empty($task->assignedTo))
{
$btnTextClass = 'text-primary';
$assignedToText = $this->lang->task->noAssigned;
} else if($task->assignedTo == $account) $btnTextClass = 'text-red';
$btnClass = $assignedToText == 'closed' ? ' disabled' : '';
echo html::a(helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-icon-left{$btnClass}'");
echo html::a(helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-icon-left btn-sm {$btnClass}'");
break;
case 'assignedDate':
echo substr($task->assignedDate, 5, 11);
module/task/view/create.html.php
+6 -5
View File
@@ -23,7 +23,7 @@
</div>
</div>
<form class='load-indicator main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
<table class='table table-form'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->task->type;?></th>
<td><?php echo html::select('type', $lang->task->typeList, $task->type, "class='form-control chosen' onchange='setOwners(this.value)' required");?></td><td></td><td></td>
@@ -53,7 +53,7 @@
<th><?php echo $lang->task->story;?></th>
<td colspan='3'>
<?php if(empty($stories)):?>
<span id='story'><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('project', 'linkStory', "projectID=$project->id"), $lang->project->linkStory, '_blank'), html::a("javascript:loadStories($project->id)", $lang->refresh));?></span>
<span id='story'><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('project', 'linkStory', "projectID=$project->id"), $lang->project->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($project->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
<?php else:?>
<div class='input-group'>
<?php echo html::select('story', $stories, $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
@@ -104,9 +104,9 @@
?>
<td colspan='<?php echo $hasCustomPri ? 1 : 3 ?>'>
<?php if($hasCustomPri):?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control chosen chosen-simple'");?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control chosen chosen-simple'");?>
<?php else: ?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control' data-provide='labelSelector'");?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control' data-provide='labelSelector'");?>
<?php endif; ?>
</td>
</tr>
@@ -190,7 +190,8 @@
<span class='input-group-addon'><?php echo $lang->task->hour;?></span>
</div>
</td>
<td class='w-70px'>
<td class='w-90px'>
<a class='btn btn-move-add btn-icon btn-sm'><i class='icon-plus'></i></a>
<a class='btn btn-move-up btn-sm btn-icon'><i class='icon-arrow-up'></i></a>
<a class='btn btn-move-down btn-sm btn-icon'><i class='icon-arrow-down'></i></a>
</td>
module/task/view/edit.html.php
+3 -2
View File
@@ -250,8 +250,9 @@
</div>
</td>
<td class='w-90px'>
<a href='javascript:;' class='btn btn-icon btn-move-up btn-sm'><i class='icon-arrow-up'></i></a>
<a href='javascript:;' class='btn btn-icon btn-move-down btn-sm'><i class='icon-arrow-down'></i></a>
<a class='btn btn-move-add btn-icon btn-sm'><i class='icon-plus'></i></a>
<a class='btn btn-icon btn-move-up btn-sm'><i class='icon-arrow-up'></i></a>
<a class='btn btn-icon btn-move-down btn-sm'><i class='icon-arrow-down'></i></a>
</td>
</tr>
<?php endfor;?>
module/task/view/view.html.php
+1 -1
View File
@@ -215,7 +215,7 @@
</tr>
<tr>
<th><?php echo $lang->task->pri;?></th>
<td><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>'><?php echo $task->pri == '0' ? $lang->task->noData : zget($lang->task->priList, $task->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo $task->pri == '0' ? $lang->task->noData : zget($lang->task->priList, $task->pri)?></span></td>
</tr>
<tr>
<th><?php echo $lang->task->mailto;?></th>
module/testcase/model.php
+1 -1
View File
@@ -1311,7 +1311,7 @@ class testcaseModel extends model
echo html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id)));
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $case->pri . "'>";
echo "<span class='label-pri label-pri-" . $case->pri . "' title='" . zget($this->lang->testcase->priList, $case->pri, $case->pri) . "'>";
echo zget($this->lang->testcase->priList, $case->pri, $case->pri);
echo "</span>";
break;
module/testcase/view/groupcase.html.php
+1 -1
View File
@@ -55,7 +55,7 @@
</td>
<?php endif;?>
<td class='c-id-sm'><?php echo $case->id;?></td>
<td><span class='label-pri <?php echo 'label-pri-' . $case->pri;?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
<td class='text-left'><?php if(!common::printLink('testcase', 'view', "case=$case->id", $case->title)) echo $case->title;?></td>
<td><?php echo zget($lang->case->typeList, $case->type, '');?></td>
<td><?php echo zget($users, $case->lastRunner);?></td>
module/testcase/view/importfromlib.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
<?php if($branches):?>
<td><?php echo html::select("branch[{$case->id}]", $branches, $branch, "class='form-control'")?></td>
<?php endif;?>
<td><span class='label-pri <?php echo 'label-pri-' . $case->pri;?>'><?php echo $case->pri == '0' ? '' : zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo $case->pri == '0' ? '' : zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
<td class='text-left nobr'><?php if(!common::printLink('testcase', 'view', "caseID=$case->id", $case->title)) echo $case->title;?></td>
<?php $libModule = zget($libModules, $case->module, '');?>
<td class='text-left' title='<?php echo $libModule?>'><?php echo $libModule;?></th>
module/testcase/view/view.html.php
+1 -1
View File
@@ -168,7 +168,7 @@
</tr>
<tr>
<th><?php echo $lang->testcase->pri;?></th>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>'><?php echo zget($lang->testcase->priList, $case->pri)?></span></td>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri)?></span></td>
</tr>
<tr>
<th><?php echo $lang->testcase->status;?></th>
module/testreport/view/blockbugs.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<?php foreach($bugs as $bug):?>
<tr>
<td><?php echo $bug->id . html::hidden('bugs[]', $bug->id)?></td>
<td><span class='label-pri label-pri-<?php echo $bug->pri?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
<td><span class='label-pri label-pri-<?php echo $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
<td class='text-left' title='<?php echo $bug->title?>'><?php echo html::a($sysURL . $this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
module/testreport/view/blockcases.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
<?php foreach($cases as $case):?>
<tr>
<td><?php echo $case->id . html::hidden('cases[]', $case->id)?></td>
<td><span class='label-pri label-pri-<?php echo $case->pri?>'><?php echo zget($lang->testcase->priList, $case->pri);?></span></td>
<td><span class='label-pri label-pri-<?php echo $case->pri?>' title='<?php echo zget($lang->testcase->priList, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri);?></span></td>
<td class='text-left' title='<?php echo $case->title?>'><?php echo html::a($sysURL . $this->createLink('testcase', 'view', "caseID=$case->id", '', true), $case->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
<td><?php echo zget($users, $case->assignedTo);?></td>
module/testreport/view/blocklegacybugs.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<?php foreach($legacyBugs as $bug):?>
<tr>
<td><?php echo $bug->id?></td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
<td class='text-left' title='<?php echo $bug->title?>'><?php echo html::a($sysURL . $this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
module/testreport/view/blockstories.html.php
+1 -1
View File
@@ -17,7 +17,7 @@
<?php foreach($stories as $story):?>
<tr>
<td><?php echo $story->id . html::hidden('stories[]', $story->id)?></td>
<td><span class='label-pri lable-pri-<?php echo $story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span></td>
<td><span class='label-pri lable-pri-<?php echo $story->pri?>' title='<?php echo zget($lang->story->priList, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri);?></span></td>
<td class='text-left' title='<?php echo $story->title?>'><?php echo html::a($sysURL . $this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
module/testsuite/view/library.html.php
+1 -1
View File
@@ -164,7 +164,7 @@ js::set('flow', $this->config->global->flow);
<?php echo sprintf('%03d', $case->id);?>
<?php endif;?>
</td>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
<td class='text-left' title="<?php echo $case->title?>">
<?php if($modulePairs and $case->module) echo "<span title='{$lang->testcase->module}' class='label label-info label-badge'>{$modulePairs[$case->module]}</span> ";?>
<?php $viewLink = $this->createLink('testcase', 'view', "caseID=$case->id&version=$case->version");?>
module/testsuite/view/linkcase.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<?php echo html::checkbox('cases', array($case->id => sprintf('%03d', $case->id)));?>
</td>
<td><?php echo html::select("versions[$case->id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'class="form-control"');?> </td>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td class='text-left'>
<?php
echo $case->title . ' ( ';
module/testsuite/view/view.html.php
+1 -1
View File
@@ -81,7 +81,7 @@
<?php printf('%03d', $case->id);?>
<?php endif;?>
</td>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td class='text-left' title='<?php echo $modules[$case->module]?>'><?php echo $modules[$case->module];?></td>
<td class='text-left nobr' title='<?php echo $case->title;?>'>
<?php if($case->branch) echo "<span class='label label-info label-badge'>{$branches[$case->branch]}</span>"?>
module/testtask/model.php
+1 -1
View File
@@ -1166,7 +1166,7 @@ class testtaskModel extends model
//}
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $run->pri . "'>";
echo "<span class='label-pri label-pri-" . $run->pri . "' title='" . zget($this->lang->testcase->priList, $run->pri, $run->pri) . "'>";
echo zget($this->lang->testcase->priList, $run->pri, $run->pri);
echo "</span>";
break;
module/testtask/view/groupcase.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
</td>
<?php endif;?>
<td class='c-id-sm'><?php echo $run->case;?></td>
<td><span class='label-pri <?php echo 'label-pri-' . $run->pri;?>'><?php echo zget($lang->testcase->priList, $run->pri, $run->pri);?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $run->pri;?>' title='<?php echo zget($lang->testcase->priList, $run->pri, $run->pri);?>'><?php echo zget($lang->testcase->priList, $run->pri, $run->pri);?></span></td>
<td class='text-left'><?php if(!common::printLink('testcase', 'view', "case=$run->case", $run->title)) echo $run->title;?></td>
<td><?php echo zget($lang->testcase->typeList, $run->type, '');?></td>
<td><?php echo zget($users, $run->assignedTo);?></td>
module/testtask/view/linkcase.html.php
+1 -1
View File
@@ -96,7 +96,7 @@
<?php echo html::checkbox('cases', array($case->id => sprintf('%03d', $case->id)));?>
</td>
<td class='text-center'><?php echo html::select("versions[$case->id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'class="form-control"');?> </td>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td><span class='label-pri label-pri-<?php echo $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td class='text-left'>
<?php
echo $case->title . ' ( ';
module/todo/view/create.html.php
+1 -1
View File
@@ -140,7 +140,7 @@
</div>
</div>
<script language='Javascript'>
<script>
var nowTime = '<?php echo $time?>';
var today = '<?php echo date('Y-m-d')?>';
var start = '<?php echo key($times)?>';
module/todo/view/edit.html.php
+1 -1
View File
@@ -144,4 +144,4 @@
</form>
</div>
<?php include './footer.html.php';?>
<script language='Javascript'>switchDateFeature(document.getElementById('dateSwitcher'));</script>
<script>switchDateFeature(document.getElementById('dateSwitcher'));</script>
www/js/zui/min.js
+4 -4
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/fonts/ZentaoIcon.eot
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.svg
+2 -14
View File
File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 87 KiB

www/theme/zui/fonts/ZentaoIcon.ttf
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.woff
BIN
View File
Binary file not shown.