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:
liugang
2018-05-10 17:43:45 +08:00
parent 4ad2bdac02 39c95c823d
commit fa6ed57b81
26 changed files with 285 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/lang/en.php
+1 -1
View File
@@ -350,7 +350,7 @@ $lang->block->typeList->testtask['done'] = 'Done';
$lang->block->typeList->testtask['all'] = 'All';
$lang->block->modules['product']->moreLinkList = new stdclass();
$lang->block->modules['product']->moreLinkList->list = 'product|all|product=&status=%s';
$lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s';
$lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s';
$lang->block->modules['project']->moreLinkList = new stdclass();
$lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project=';
module/block/lang/zh-cn.php
+1 -1
View File
@@ -350,7 +350,7 @@ $lang->block->typeList->testtask['done'] = '已测版本';
$lang->block->typeList->testtask['all'] = '全部';
$lang->block->modules['product']->moreLinkList = new stdclass();
$lang->block->modules['product']->moreLinkList->list = 'product|all|product=&status=%s';
$lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s';
$lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s';
$lang->block->modules['project']->moreLinkList = new stdclass();
$lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project=';
module/block/view/todoblock.html.php
+45 -2
View File
@@ -10,14 +10,15 @@
* @link http://www.ranzhi.org
*/
?>
<div class='block-todoes'>
<div class='block-todoes' id="block <?php echo ($block->block)?>">
<div class='panel-body'>
<div class="todoes-input">
<div class="todo-form-trigger"><input type="text" placeholder="<?php echo $lang->todo->lblClickCreate?>" class="form-control"></div>
<form class="form-horizontal todoes-form layer" method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'create', 'date=today&account=&from=block');?>'>
<h3><?php echo $lang->todo->create . $lang->todo->common;?></h3>
<div class="form-group">
<div class="col-sm-12"><input required type="text" placeholder="<?php echo $lang->todo->name?>" class="form-control" name="name"></div>
<label for="todoName" class="col-sm-2"><?php echo $lang->todo->name?></label>
<div class="col-sm-9 required"><input type="text" class="form-control" name="name"></div>
</div>
<div class="form-group">
<label for="todoPri" class="col-sm-2"><?php echo $lang->todo->pri?></label>
@@ -82,6 +83,46 @@
<script>
$(function()
{
// Todoes block
if(!$.fn.blockTodoes)
{
$.fn.blockTodoes = function()
{
return this.each(function()
{
var $block = $(this);
if($block.data('blockTodoes')) return;
$block.data('blockTodoes', 1);
var $form = $block.find('form');
var $titleInput = $form.find('[name="name"]');
var toggleForm = function(toggle)
{
if(toggle === undefined)
{
toggle = !$block.hasClass('show-form');
}
$block.toggleClass('show-form', toggle);
if(toggle)
{
setTimeout(function() {$titleInput.focus();}, 50);
}
};
$block.on('click', '.todo-form-trigger', function()
{
toggleForm($(this).data('trigger'));
});
$form.timeSpanControl(
{
onChange: function($control)
{
$control.trigger('chosen:updated');
}
});
});
};
}
$('ul.todoes li .todo-check').click(function()
{
var $liTag = $(this).closest('li');
@@ -94,6 +135,8 @@
if(isFinished) $liTag.removeClass('active');
});
});
$('.block-todoes').blockTodoes();
});
function ajaxCreateTodo(obj)
module/build/view/view.html.php
+4 -4
View File
@@ -51,10 +51,10 @@ tbody tr td:first-child input{display:none;}
</div>
<div id='mainContent' class='main-content'>
<?php if($this->config->global->flow == 'onlyTest'):?>
<fieldset>
<legend><?php echo $lang->build->desc;?></legend>
<div class='article-content'><?php echo $build->desc;?></div>
</fieldset>
<div class='detail'>
<div class='detail-title'><?php echo $lang->build->desc;?></div>
<div class='detail-content article-content'><?php echo $build->desc;?></div>
</div>
<?php echo $this->fetch('file', 'printFiles', array('files' => $build->files, 'fieldset' => 'true'));?>
<?php include '../../common/view/action.html.php';?>
<div class='actions'>
module/entry/view/create.html.php
+4 -9
View File
@@ -39,18 +39,13 @@
</tr>
<tr>
<th><?php echo $lang->entry->ip;?></th>
<td><?php echo html::input('ip', '', "class='form-control' title='{$lang->entry->note->ip}' placeholder='{$lang->entry->note->ip}'");?></td>
<td>
<div class='input-group'>
<?php echo html::input('ip', '', "class='form-control' title='{$lang->entry->note->ip}' placeholder='{$lang->entry->note->ip}'");?>
<div class='input-group-addon'>
<div class='checkbox-primary'>
<input type="checkbox" id="allIP" name="allIP" value="1" />
<label for='allIP'><?php echo $lang->entry->note->allIP;?></label>
</div>
</div>
<div class='checkbox-primary'>
<input type="checkbox" id="allIP" name="allIP" value="1" />
<label for='allIP'><?php echo $lang->entry->note->allIP;?></label>
</div>
</td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->entry->desc;?></th>
module/entry/view/edit.html.php
+4 -8
View File
@@ -38,15 +38,11 @@
</tr>
<tr>
<th><?php echo $lang->entry->ip;?></th>
<td><?php echo html::input('ip', $entry->ip, "class='form-control' title='{$lang->entry->note->ip}' placeholder='{$lang->entry->note->ip}'");?></td>
<td>
<div class='input-group'>
<?php echo html::input('ip', $entry->ip, "class='form-control' title='{$lang->entry->note->ip}' placeholder='{$lang->entry->note->ip}'");?>
<div class='input-group-addon'>
<div class='checkbox-primary'>
<input type="checkbox" id="allIP" name="allIP" value="1" />
<label for='allIP'><?php echo $lang->entry->note->allIP;?></label>
</div>
</div>
<div class='checkbox-primary'>
<input type="checkbox" id="allIP" name="allIP" value="1" />
<label for='allIP'><?php echo $lang->entry->note->allIP;?></label>
</div>
</td>
</tr>
module/my/view/project.html.php
+36 -38
View File
@@ -19,43 +19,41 @@
<?php if(common::hasPriv('project', 'create')) echo html::a(helper::createLink('project', 'create'), "<i class='icon-plus'></i> " . $lang->my->home->createProject, '', "class='btn'") ?>
</div>
</div>
<div id="mainContent">
<form class='main-table'>
<table class="table has-sort-head table-fixed" id='projectList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-160px'><?php echo $lang->project->code;?></th>
<th class="text-left"><?php echo $lang->project->name;?></th>
<th class='w-date'><?php echo $lang->project->begin;?></th>
<th class='w-date'><?php echo $lang->project->end;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
<th class='w-user'><?php echo $lang->team->role;?></th>
<th class='w-date'><?php echo $lang->team->join;?></th>
<th class='w-110px'><?php echo $lang->team->hours;?></th>
</tr>
</thead>
<tbody>
<?php foreach($projects as $project):?>
<?php $projectLink = $this->createLink('project', 'browse', "projectID=$project->id");?>
<tr>
<td><?php echo html::a($projectLink, $project->id);?></td>
<td class='text-left'><?php echo $project->code;?></td>
<td class='text-left'><?php echo html::a($projectLink, $project->name);?></td>
<td><?php echo $project->begin;?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='project-delay'><?php echo $lang->project->delayed;?></td>
<?php else:?>
<td class='project-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
<?php endif;?>
<td><?php echo $project->role;?></td>
<td><?php echo $project->join;?></td>
<td><?php echo $project->hours;?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</form>
<div id="mainContent" class='main-table'>
<table class="table has-sort-head table-fixed" id='projectList'>
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-160px'><?php echo $lang->project->code;?></th>
<th class="text-left"><?php echo $lang->project->name;?></th>
<th class='w-date'><?php echo $lang->project->begin;?></th>
<th class='w-date'><?php echo $lang->project->end;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
<th class='w-user'><?php echo $lang->team->role;?></th>
<th class='w-date'><?php echo $lang->team->join;?></th>
<th class='w-110px'><?php echo $lang->team->hours;?></th>
</tr>
</thead>
<tbody>
<?php foreach($projects as $project):?>
<?php $projectLink = $this->createLink('project', 'browse', "projectID=$project->id");?>
<tr>
<td><?php echo html::a($projectLink, $project->id);?></td>
<td class='text-left'><?php echo $project->code;?></td>
<td class='text-left'><?php echo html::a($projectLink, $project->name);?></td>
<td><?php echo $project->begin;?></td>
<td><?php echo $project->end;?></td>
<?php if(isset($project->delay)):?>
<td class='project-delay'><?php echo $lang->project->delayed;?></td>
<?php else:?>
<td class='project-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
<?php endif;?>
<td><?php echo $project->role;?></td>
<td><?php echo $project->join;?></td>
<td><?php echo $project->hours;?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
<?php include '../../common/view/footer.html.php';?>
module/my/view/score.html.php
+30 -32
View File
@@ -20,37 +20,35 @@
<?php common::printLink('score', 'rule', '', $lang->my->scoreRule, '', "class='btn btn-primary'");?>
</div>
</div>
<div id="mainContent">
<form class='main-table'>
<table class="table table-fixed">
<thead>
<tr>
<th class="w-200px"><?php echo $lang->score->time; ?></th>
<th class="w-150px"><?php echo $lang->score->module; ?></th>
<th class="w-150px"><?php echo $lang->score->method; ?></th>
<th class="w-100px"><?php echo $lang->score->before; ?></th>
<th class="w-100px"><?php echo $lang->score->score; ?></th>
<th class="w-100px"><?php echo $lang->score->after; ?></th>
<th><?php echo $lang->score->desc; ?></th>
</tr>
</thead>
<tbody>
<?php foreach($scores as $score):?>
<tr>
<td><?php echo $score->time; ?></td>
<td><?php echo $lang->score->modules[$score->module]; ?></td>
<td><?php echo $lang->score->methods[$score->module][$score->method]; ?></td>
<td><?php echo $score->before; ?></td>
<td><?php echo $score->score; ?></td>
<td><?php echo $score->after; ?></td>
<td><?php echo $score->desc; ?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php if($scores):?>
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</form>
<div id="mainContent" class='main-table'>
<table class="table table-fixed">
<thead>
<tr>
<th class="w-200px"><?php echo $lang->score->time; ?></th>
<th class="w-150px"><?php echo $lang->score->module; ?></th>
<th class="w-150px"><?php echo $lang->score->method; ?></th>
<th class="w-100px"><?php echo $lang->score->before; ?></th>
<th class="w-100px"><?php echo $lang->score->score; ?></th>
<th class="w-100px"><?php echo $lang->score->after; ?></th>
<th><?php echo $lang->score->desc; ?></th>
</tr>
</thead>
<tbody>
<?php foreach($scores as $score):?>
<tr>
<td><?php echo $score->time; ?></td>
<td><?php echo $lang->score->modules[$score->module]; ?></td>
<td><?php echo $lang->score->methods[$score->module][$score->method]; ?></td>
<td><?php echo $score->before; ?></td>
<td><?php echo $score->score; ?></td>
<td><?php echo $score->after; ?></td>
<td><?php echo $score->desc; ?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php if($scores):?>
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/my/view/testtask.html.php
+44 -46
View File
@@ -22,52 +22,50 @@
?>
</div>
</div>
<div id="mainContent">
<form class='main-table'>
<table class="table has-sort-head table-fixed" id='taskList'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
<th> <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
<th> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
<th class='w-90px'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
<th class='w-90px'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
<th class='w-80px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-150px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<tr>
<td class="c-id"><?php printf('%03d', $task->id);?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
<td class='nobr'><?php echo $task->projectName?></td>
<td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td class='status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
<td class='c-actions'>
<?php
common::printIcon('testtask', 'cases', "taskID=$task->id", 'play', 'list', 'sitemap');
common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list', 'link');
common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list');
<div id="mainContent" class='main-table'>
<table class="table has-sort-head table-fixed" id='taskList'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
<th> <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
<th> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
<th class='w-90px'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
<th class='w-90px'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
<th class='w-80px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-150px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<tr>
<td class="c-id"><?php printf('%03d', $task->id);?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
<td class='nobr'><?php echo $task->projectName?></td>
<td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td class='status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
<td class='c-actions'>
<?php
common::printIcon('testtask', 'cases', "taskID=$task->id", 'play', 'list', 'sitemap');
common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list', 'link');
common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list');
if(common::hasPriv('testtask', 'delete'))
{
$deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
}
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php if($tasks):?>
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</form>
if(common::hasPriv('testtask', 'delete'))
{
$deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
}
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php if($tasks):?>
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/product/lang/zh-cn.php
+1 -1
View File
@@ -34,7 +34,7 @@ $lang->product->otherInfo = '其他信息';
$lang->product->plans = '计划数';
$lang->product->releases = '发布数';
$lang->product->docs = '文档数';
$lang->product->bugs = '相关BUG';
$lang->product->bugs = '相关Bug';
$lang->product->projects = "关联{$lang->projectCommon}数";
$lang->product->cases = '用例数';
$lang->product->builds = 'BUILD数';
module/product/view/all.html.php
+8 -9
View File
@@ -56,7 +56,7 @@
<div class="main-col">
<div class="cell" id="queryBox"></div>
<form class="main-table table-product" data-ride="table" method="post" id='productsForm' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
<?php $canOrder = (common::hasPriv('product', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
<?php $canOrder = (common::hasPriv('product', 'updateOrder'))?>
<?php $canBatchEdit = common::hasPriv('product', 'batchEdit'); ?>
<table class="table has-sort-head table-fixed" id='productList'>
<?php $vars = "productID=$productID&line=$line&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
@@ -73,11 +73,11 @@
<th><?php common::printOrderLink('name', $orderBy, $vars, $lang->product->name);?></th>
<th class='w-80px text-left'><?php common::printOrderLink('line', $orderBy, $vars, $lang->product->line);?></th>
<th class='w-80px'><?php echo $lang->product->activeStories;?></th>
<th class='w-80px'><?php echo $lang->product->changedStories;?></th>
<th class='w-90px'><?php echo $lang->product->changedStories;?></th>
<th class='w-70px'><?php echo $lang->product->draftStories;?></th>
<th class='w-80px'><?php echo $lang->product->closedStories;?></th>
<th class='w-80px'><?php echo $lang->product->plans;?></th>
<th class='w-80px'><?php echo $lang->product->releases;?></th>
<th class='w-90px'><?php echo $lang->product->closedStories;?></th>
<th class='w-70px'><?php echo $lang->product->plans;?></th>
<th class='w-70px'><?php echo $lang->product->releases;?></th>
<th class='w-80px'><?php echo $lang->product->bugs;?></th>
<th class='w-80px'><?php echo $lang->product->unResolvedBugs;?></th>
<th class='w-80px'><?php echo $lang->product->assignToNullBugs;?></th>
@@ -89,7 +89,7 @@
<tbody>
<?php foreach($productStats as $product):?>
<tr data-id='<?php echo $product->id ?>' data-order='<?php echo $product->code;?>'>
<td class='cell-id'>
<td class='c-id'>
<?php if($canBatchEdit):?>
<?php echo html::checkbox('productIDList', array($product->id => sprintf('%03d', $product->id)));?>
<?php else:?>
@@ -97,7 +97,7 @@
<?php endif;?>
</td>
<td title='<?php echo $product->name?>'><?php echo html::a($this->createLink('product', 'view', 'product=' . $product->id), $product->name);?></td>
<td><?php echo zget($lines, $product->line, '');?></td>
<td title='<?php echo zget($lines, $product->line, '')?>'><?php echo zget($lines, $product->line, '');?></td>
<td class='text-center'><?php echo $product->stories['active'];?></td>
<td class='text-center'><?php echo $product->stories['changed'];?></td>
<td class='text-center'><?php echo $product->stories['draft'];?></td>
@@ -108,7 +108,7 @@
<td class='text-center'><?php echo $product->unResolved;?></td>
<td class='text-center'><?php echo $product->assignToNull;?></td>
<?php if($canOrder):?>
<td class='sort-handler'><i class="icon icon-move"></i></td>
<td class='c-actions sort-handler'><i class="icon icon-move"></i></td>
<?php endif;?>
</tr>
<?php endforeach;?>
@@ -122,7 +122,6 @@
<?php echo html::submitButton($lang->edit, '', 'btn');?>
</div>
<?php endif;?>
<?php if(!$canOrder and common::hasPriv('product', 'updateOrder')) echo html::a(inlink('all', "productID=$productID&line=$line&status=$status&order=order_desc&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->product->updateOrder, '' , "class='btn'");?>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
module/productplan/view/create.html.php
+4 -8
View File
@@ -39,15 +39,11 @@
</tr>
<tr>
<th><?php echo $lang->productplan->begin;?></th>
<td><?php echo html::input('begin', formatTime($begin), "class='form-control form-date'");?></td>
<td>
<div class='input-group'>
<?php echo html::input('begin', formatTime($begin), "class='form-control form-date'");?>
<span class='input-group-addon'>
<div class='checkbox-primary'>
<input type='checkbox' id='future' name='future' value='1' />
<label for='future'><?php echo $lang->productplan->future;?></label>
</div>
</span>
<div class='checkbox-primary'>
<input type='checkbox' id='future' name='future' value='1' />
<label for='future'><?php echo $lang->productplan->future;?></label>
</div>
</td>
</tr>
module/productplan/view/edit.html.php
+5 -9
View File
@@ -42,16 +42,12 @@
</tr>
<tr>
<th><?php echo $lang->productplan->begin;?></th>
<td><?php echo html::input('begin', $plan->begin != '2030-01-01' ? formatTime($plan->begin) : '', "class='form-control form-date'");?></td>
<td>
<div class='input-group'>
<?php echo html::input('begin', $plan->begin != '2030-01-01' ? formatTime($plan->begin) : '', "class='form-control form-date'");?>
<?php $checked = $plan->begin == '2030-01-01' || $plan->end == '2030-01-01' ? "checked='checked'" : '';?>
<span class='input-group-addon'>
<div class='checkbox-primary'>
<input type='checkbox' id='future' name='future' value='1' <?php echo $checked;?> />
<label for='future'><?php echo $lang->productplan->future;?></label>
</div>
</span>
<?php $checked = $plan->begin == '2030-01-01' || $plan->end == '2030-01-01' ? "checked='checked'" : '';?>
<div class='checkbox-primary'>
<input type='checkbox' id='future' name='future' value='1' <?php echo $checked;?> />
<label for='future'><?php echo $lang->productplan->future;?></label>
</div>
</td>
</tr>
module/project/view/fixfirst.html.php
+9 -2
View File
@@ -12,6 +12,9 @@
?>
<?php include '../../common/view/header.lite.html.php';?>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2><?php echo $lang->project->fixFirst;?></h2>
</div>
<form target='hiddenwin' method='post'>
<table class='table table-form'>
<tr>
@@ -21,12 +24,16 @@
<?php echo html::input('estimate', !empty($firstBurn->estimate) ? $firstBurn->estimate : (!empty($firstBurn->left) ? $firstBurn->left : ''), "class='form-control' placeholder='{$lang->project->placeholder->totalLeft}' autocomplete='off'")?>
<span class='input-group-addon fix-border'>
<div class='checkbox-primary'>
<input id='withLeft' type='checkbox' checked name='withLeft' value='1' />
<label for='withLeft'><?php echo $lang->project->fixFirstWithLeft?></label>
<input id='withLeft' type='checkbox' checked name='withLeft' value='1' />
<label for='withLeft'><?php echo $lang->project->fixFirstWithLeft?></label>
</div>
</span>
<span class='input-group-btn'><?php echo html::submitButton();?></span>
</div>
</td>
</tr>
<tr>
<td>
<div class='alert alert-info'><?php echo $lang->project->totalEstimate . ' : ' . $project->totalEstimate . $lang->project->workHour;?></div>
</td>
</tr>
module/release/view/export.html.php
+18 -19
View File
@@ -32,25 +32,24 @@ function closeWindow()
i ++;
}
</script>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['export']);?></span>
<strong><?php echo $lang->export;?></strong>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2><?php echo $lang->export;?></h2>
</div>
<form method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 10px 5%'>
<table class='w-p100'>
<tr>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->setFileName;?></span>
<?php echo html::input('fileName', '', "class='form-control' autocomplete='off'");?>
<span class='input-group-addon'>.html</span>
<?php echo html::select('type', $lang->release->exportTypeList, 'all', "class='form-control'")?>
</div>
</td>
<td><?php echo html::submitButton($lang->export);?></td>
</tr>
</table>
</form>
</div>
<form class='form-condensed' method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 40px 5%'>
<table class='w-p100'>
<tr>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->setFileName;?></span>
<?php echo html::input('fileName', '', "class='form-control' autocomplete='off'");?>
<span class='input-group-addon'>.html</span>
<?php echo html::select('type', $lang->release->exportTypeList, 'all', "class='form-control'")?>
</div>
</td>
<td><?php echo html::submitButton($lang->export);?></td>
</tr>
</table>
</form>
<?php include '../../common/view/footer.lite.html.php';?>
module/release/view/view.html.php
+10 -10
View File
@@ -98,13 +98,13 @@
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
<tr>
<td class='c-id'>
<?php if($canBatchUnlink):?>
<div class="checkbox-primary">
<?php if($canBatchUnlink):?>
<input type='checkbox' name='unlinkStories[]' value='<?php echo $story->id;?>'/>
<label></label>
<?php endif;?>
<?php echo sprintf('%03d', $story->id);?>
</div>
<?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 class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
@@ -169,13 +169,13 @@
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr>
<td class='c-id'>
<?php if($canBatchUnlink):?>
<div class="checkbox-primary">
<?php if($canBatchUnlink):?>
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<label></label>
<?php endif;?>
<?php echo sprintf('%03d', $bug->id);?>
</div>
<?php endif;?>
<?php echo sprintf('%03d', $bug->id);?>
</td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
<td><span class='status-<?php echo $bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></td>
@@ -239,13 +239,13 @@
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr>
<td class='c-id'>
<?php if($canBatchUnlink):?>
<div class="checkbox-primary">
<?php if($canBatchUnlink):?>
<input type='checkbox' name='unlinkBugs[]' value='<?php echo $bug->id;?>'/>
<label></label>
<?php endif;?>
<?php echo sprintf('%03d', $bug->id);?>
</div>
<?php endif;?>
<?php echo sprintf('%03d', $bug->id);?>
</td>
<td><span class='severity<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
@@ -350,7 +350,7 @@
</div>
</div>
<style>
.tabs .tab-content .tab-pane .action{position: absolute; right: <?php echo ($countStories or $countBugs or $countLeftBugs) ? '80px' : '-1px'?>; top: 0px;}
.tabs .tab-content .tab-pane .action{position: absolute; right: <?php echo ($countStories or $countBugs or $countLeftBugs) ? '100px' : '-1px'?>; top: 0px;}
</style>
<?php js::set('param', helper::safe64Decode($param))?>
<?php js::set('link', $link)?>
module/score/view/rule.html.php
+2 -2
View File
@@ -18,8 +18,8 @@
<?php echo html::a($this->createLink('my', 'score'), $lang->score->common, '', "class='btn btn-primary'");?>
</div>
</div>
<div id="mainContent">
<table class="main-table table has-sort-head table-fixed">
<div id="mainContent" class='main-table'>
<table class="table has-sort-head table-fixed">
<thead>
<tr>
<th class="w-150px"><?php echo $lang->score->module;?></th>
module/story/css/edit.css
+1
View File
@@ -1,3 +1,4 @@
.col-side .chosen-container .chosen-drop {width: 216px!important}
.col-side .chosen-container {width: 218px!important}
#linkStoriesBox > li ,#childStoriesBox > li {margin-left:-56px}
.table-form>tbody>tr>th{padding-top:7px;}
module/story/view/edit.html.php
+1 -1
View File
@@ -48,7 +48,7 @@
</div>
<div id='linkStoriesBOX'><?php echo html::hidden('linkStories', $story->linkStories);?></div>
<div id='childStoriesBOX'><?php echo html::hidden('childStories', $story->childStories);?></div>
<div class='actions actions-form'>
<div class='actions actions-form text-center'>
<?php
echo html::hidden('lastEditedDate', $story->lastEditedDate);
echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');
module/story/view/linkstory.html.php
+13 -6
View File
@@ -22,9 +22,9 @@
</h2>
</div>
<div id='queryBox' class='show'></div>
<form method='post' target='hiddenwin' id='linkStoryForm' class='main-table table-story' data-ride="table">
<form method='post' target='hiddenwin' id='linkStoryForm' class='main-table table-story'>
<?php if($stories2Link):?>
<table class='table' id='storyList'>
<?php if($stories2Link):?>
<thead>
<tr>
<th class='c-id'>
@@ -45,13 +45,13 @@
<?php $storyCount = 0;?>
<?php foreach($stories2Link as $story2Link):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story2Link->id");?>
<tr class='text-center'>
<tr>
<td class='c-id'>
<div class="checkbox-primary">
<input type='checkbox' name='stories[]' value='<?php echo $story2Link->id;?>'/>
<label></label>
<?php echo html::a($storyLink, sprintf('%03d', $story2Link->id));?>
</div>
<?php echo html::a($storyLink, sprintf('%03d', $story2Link->id));?>
</td>
<td><span class='<?php echo 'pri' . zget($lang->story->priList, $story2Link->pri, $story2Link->pri)?>'><?php echo zget($lang->story->priList, $story2Link->pri, $story2Link->pri);?></span></td>
<td><?php echo html::a($this->createLink('product', 'browse', "productID=$story2Link->product&branch=$story2Link->branch"), $products[$story2Link->product], '_blank');?></td>
@@ -74,7 +74,14 @@
<?php endif;?>
</form>
</div>
<script type='text/javascript'>
$(function(){ajaxGetSearchForm();});
<script>
$(function()
{
ajaxGetSearchForm();
<?php if($stories2Link):?>
$('#linkStoryForm').table();
setTimeout(function(){$('#linkStoryForm .table-footer').removeClass('fixed-footer');}, 100);
<?php endif;?>
});
</script>
<?php include '../../common/view/footer.html.php';?>
module/task/css/create.css
-2
View File
@@ -1,2 +0,0 @@
.input-control.has-icon-right > .form-control{padding-right: 50px;}
.input-control-icon-right{width: 50px;}
module/task/js/create.js
+18 -20
View File
@@ -199,27 +199,25 @@ $(document).ready(function()
return false;
}
});
});
/* show team menu. */
$('[name^=multiple]').change(function()
{
if($(this).prop('checked'))
/* show team menu. */
$('[name^=multiple]').change(function()
{
$('#assignedTo, #assignedTo_chosen').addClass('hidden');
$('.team-group').removeClass('hidden');
$('#estimate').attr('readonly', true);
}
else
if($(this).prop('checked'))
{
$('#assignedTo, #assignedTo_chosen').addClass('hidden');
$('.team-group').removeClass('hidden');
$('#estimate').attr('readonly', true);
}
else
{
$('#assignedTo, #assignedTo_chosen').removeClass('hidden');
$('.team-group').addClass('hidden');
$('#estimate').attr('readonly', false);
}
});
$('#modalTeam').on('show', function()
{
$('#assignedTo, #assignedTo_chosen').removeClass('hidden');
$('.team-group').addClass('hidden');
$('#estimate').attr('readonly', false);
}
});
$(".team-group[data-toggle='modalTeam']").css('cursor', 'pointer');
$(".team-group[data-toggle='modalTeam']").click(function()
{
$('#modalTeam').modal('show');
adjustSortBtn();
adjustSortBtn();
});
});
module/task/view/create.html.php
+10 -12
View File
@@ -38,16 +38,14 @@
<div class="input-group" id="dataPlanGroup">
<?php echo html::select('assignedTo[]', $members, $task->assignedTo, "class='form-control chosen'");?>
<?php echo html::input('teamMember', '', "class='form-control team-group fix-border hidden' readonly='readonly'");?>
<span class="input-group-addon team-group hidden" data-toggle='modalTeam'><?php echo $lang->task->team;?></span>
<label class='input-group-addon affair'><input type='checkBox' name='multiple' id="multipleBox" value='1'/> <?php echo $lang->task->multipleAB;?></label>
<span class='input-group-btn <?php if($task->type !== 'affair') echo 'hidden';?>' id='selectAllUser'>
<button type='button' class='btn'>
<?php echo $lang->task->selectAllUser;?>
</button>
</span>
<span class="input-group-btn team-group hidden"><a class="btn br-0" href="#modalTeam" data-toggle="modal"><?php echo $lang->task->team;?></a></span>
</div>
</td>
<td>
<div class="checkbox-primary affair">
<input type="checkbox" name="multiple" value="1" id="multipleBox"><label for="multipleBox" class="no-margin"><?php echo $lang->task->multipleAB;?></label>
</div>
<button id='selectAllUser' type="button" class="btn btn-link<?php if($task->type !== 'affair') echo ' hidden';?>"><?php echo $lang->task->selectAllUser;?></button>
</td>
</tr>
<?php if(strpos(",$showFields,", ',story,') !== false and $this->config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
@@ -68,13 +66,13 @@
<tr>
<th><?php echo $lang->task->name;?></th>
<td colspan='3'>
<div class="input-control has-icon-left has-icon-right">
<div class="input-control has-icon-right">
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
<ul class="dropdown-menu clearfix">
<li class="heading"><?php echo $lang->task->colorTag;?><i class="icon icon-close"></i></li>
</ul>
<input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-left" data-update-color="#title" data-provide="colorpicker">
<input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#name" data-provide="colorpicker">
</div>
<?php echo html::input('name', $task->name, "class='form-control' autocomplete='off' required");?>
<?php if($this->config->global->flow != 'onlyTask'):?>
@@ -192,9 +190,9 @@
<span class='input-group-addon'><?php echo $lang->task->hour;?></span>
</div>
</td>
<td class='w-90px'>
<a href='javascript:;' class='btn btn-move-up btn-sm'><i class='icon-arrow-up'></i></a>
<a href='javascript:;' class='btn btn-move-down btn-sm'><i class='icon-arrow-down'></i></a>
<td class='w-70px'>
<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>
</tr>
<?php endfor;?>
module/testreport/view/browse.html.php
+4 -1
View File
@@ -13,7 +13,10 @@
<?php include '../../common/view/header.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='pull-left btn-toolbar'>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->testreport->browse;?></span></span>
<span class='btn btn-link btn-active-text'>
<span class='text'><?php echo $lang->testreport->browse;?></span>
<span class="label label-light label-badge"><?php echo $pager->recTotal;?></span>
</span>
</div>
</div>
<div id='mainContent' class='main-table'>
www/js/zui/min.js
+11 -11
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long