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:
滔哥
2018-05-23 17:30:58 +08:00
parent ca13dc8c93 ef4f1e99e6
commit d311af3c76
35 changed files with 158 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/view/trash.html.php
+9 -4
View File
@@ -21,8 +21,8 @@
</div>
</div>
<div id='mainContent' class='main-content'>
<div class='main-table'>
<div id='mainContent'>
<div class='main-table' data-ride='table'>
<table class='table has-sort-head'>
<?php $vars = "type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<thead>
@@ -38,13 +38,18 @@
<tbody>
<?php foreach($trashes as $action):?>
<?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
<tr class='text-center'>
<tr>
<td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
<td><?php echo $action->objectID;?></td>
<td class='text-left'>
<?php
$methodName = $module == 'caselib' ? 'libview' : 'view';
$params = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
$methodName = 'view';
if($module == 'caselib')
{
$methodName = 'libview';
$module = 'testsuite';
}
if($module == 'doclib' or $module == 'module')
{
echo $action->objectName;
module/block/css/dashboard.css
+1 -2
View File
@@ -1,4 +1,3 @@
.block-statistic .nav-stacked {overflow: auto; max-height: 220px;}
.nav > li > .btn {padding: 0 5px; line-height: 24px; margin: 3px; color: #3C4353;}
.dashboard .panel-body {max-height: 400px;overflow: auto;}
.dashboard .panel-body {max-height: 400px; overflow: auto;}
module/block/view/dashboard.html.php
+1 -1
View File
@@ -18,7 +18,7 @@ $useGuest = $this->app->user->account == 'guest';
?>
<?php include '../../common/view/tablesorter.html.php';?>
<div class='dashboard' id='dashboard' data-confirm-remove-block='<?php echo $lang->block->confirmRemoveBlock;?>'>
<div>
<div class="row">
<div class='col-md-8 col-main'>
<?php foreach($longBlocks as $index => $block):?>
<?php if(isset($config->block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?>
module/bug/view/browse.html.php
+1 -1
View File
@@ -380,7 +380,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
</div>
<?php elseif(common::hasPriv('bug', 'create')):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->bug->noBug;?></span> <?php common::printLink('bug', 'create', "productID={$productID}", "<i class='icon icon-plus'> </i>" . $lang->bug->create, '', "class='btn btn-info'");?></p>
<p><span class="text-muted"><?php echo $lang->bug->noBug;?></span> <?php common::printLink('bug', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info'");?></p>
</div>
<?php endif;?>
</form>
module/bug/view/view.html.php
-2
View File
@@ -336,8 +336,6 @@ $convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&b
common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy');
common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin');
?>
<?php else:?>
<?php common::printBack($browseLink);?>
<?php endif;?>
</div>
</div>
module/company/view/browse.html.php
+2 -2
View File
@@ -27,8 +27,8 @@ js::set('confirmDelete', $lang->user->confirmDelete);
</div>
<div class='btn-toolbar pull-right'>
<?php common::printIcon('group', 'create', '', '', 'button', '', '', 'iframe', true, "data-width='550px'");?>
<?php common::printLink('user', 'batchCreate', "dept={$deptID}", "<i class='icon icon-plus'> </i>" . $lang->user->batchCreate, '', "class='btn btn-secondary'");?>
<?php common::printLink('user', 'create', "dept={$deptID}", "<i class='icon icon-plus'> </i>" . $lang->user->create, '', "class='btn btn-primary'");?>
<?php common::printLink('user', 'batchCreate', "dept={$deptID}", "<i class='icon icon-plus'></i> " . $lang->user->batchCreate, '', "class='btn btn-secondary'");?>
<?php common::printLink('user', 'create', "dept={$deptID}", "<i class='icon icon-plus'></i> " . $lang->user->create, '', "class='btn btn-primary'");?>
</div>
</div>
<div id='mainContent' class='main-row'>
module/cron/lang/zh-cn.php
+1 -1
View File
@@ -37,7 +37,7 @@ $lang->cron->confirmDelete = '是否删除该计划任务？';
$lang->cron->confirmTurnon = '是否关闭计划任务？';
$lang->cron->introduction = <<<EOD
<p>计划任务功能可以定时执行诸如更新燃尽图、备份等操作，免除自己布置计划任务。</p>
<p>该功能还有待完善，所以默认关闭该功能</p>
<p>该功能还有待完善，所以默认关闭该功能。</p>
EOD;
$lang->cron->confirmOpen = <<<EOD
<p>是否开启该功能？<a href="%s" target='hiddenwin'><strong>打开计划任务</strong></a></p>
module/custom/view/set.html.php
+5 -5
View File
@@ -21,9 +21,9 @@ $itemRow = <<<EOT
<td>
<input type='text' class="form-control" autocomplete='off' value="" name="values[]">
</td>
<td class='text-left'>
<a href="javascript:void(0)" class='btn-icon' onclick="addItem(this)"><i class='icon-plus'></i></a>
<a href="javascript:void(0)" class='btn-icon' onclick="delItem(this)"><i class='icon-remove'></i></a>
<td class='c-actions'>
<a href="javascript:void(0)" class='btn btn-link' onclick="addItem(this)"><i class='icon-plus'></i></a>
<a href="javascript:void(0)" class='btn btn-link' onclick="delItem(this)"><i class='icon-trash'></i></a>
</td>
</tr>
EOT;
@@ -54,9 +54,9 @@ EOT;
<?php if(($module == 'story' or $module == 'testcase') and $field == 'review'):?>
<table class='table table-form mw-800px'>
<tr>
<th class='w-120px'><?php echo $lang->custom->storyReview;?></th>
<th class='w-80px'><?php echo $lang->custom->storyReview;?></th>
<td><?php echo html::radio('needReview', $lang->custom->reviewList, $needReview);?></td>
<td class='w-100px'></td>
<td></td>
</tr>
<tr <?php if($needReview and $module == 'testcase') echo "class='hidden'"?>>
<th><?php echo $lang->custom->forceReview;?></th>
module/group/view/browse.html.php
+35 -35
View File
@@ -23,47 +23,47 @@
<?php endif;?>
</div>
</div>
<div id='mainContent' class='main-content'>
<div id='mainContent' class='main-table'>
<table class='table' id='groupList'>
<thead>
<tr>
<th class='w-id text-center'><?php echo $lang->group->id;?></th>
<th class='w-100px'><?php echo $lang->group->name;?></th>
<th class='w-300px'><?php echo $lang->group->desc;?></th>
<th><?php echo $lang->group->users;?></th>
<th class='c-actions text-center'><?php echo $lang->actions;?></th>
<th class='w-id text-center'><?php echo $lang->group->id;?></th>
<th class='w-130px'><?php echo $lang->group->name;?></th>
<th class='w-300px'><?php echo $lang->group->desc;?></th>
<th><?php echo $lang->group->users;?></th>
<th class='c-actions text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php foreach($groups as $group):?>
<?php $users = implode(',', $groupUsers[$group->id]);?>
<tr>
<td class='text-center'><?php echo $group->id;?></td>
<td><?php echo $group->name;?></td>
<td title='<?php echo $group->desc?>'><?php echo $group->desc;?></td>
<td title='<?php echo $users;?>'><?php echo $users;?></td>
<td class='c-actions'>
<?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
<?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'eye');?>
<?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
<?php $lang->group->managemember = $lang->group->manageMember;?>
<?php common::printIcon('group', 'managemember', "groupID=$group->id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='750'");?>
<?php common::printIcon('group', 'edit', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
<?php common::printIcon('group', 'copy', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
<?php
if(common::hasPriv('group', 'delete') and $group->role != 'limited')
{
$deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$lang->group->delete}' class='btn'");
}
else
{
echo "<button class='btn disabled'><i class='icon icon-trash disabled' title='{$lang->group->delete}'></i></button>";
}
?>
</td>
</tr>
<?php endforeach;?>
<?php foreach($groups as $group):?>
<?php $users = implode(',', $groupUsers[$group->id]);?>
<tr>
<td class='text-center'><?php echo $group->id;?></td>
<td><?php echo $group->name;?></td>
<td title='<?php echo $group->desc?>'><?php echo $group->desc;?></td>
<td title='<?php echo $users;?>'><?php echo $users;?></td>
<td class='c-actions'>
<?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
<?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'eye');?>
<?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
<?php $lang->group->managemember = $lang->group->manageMember;?>
<?php common::printIcon('group', 'managemember', "groupID=$group->id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='750'");?>
<?php common::printIcon('group', 'edit', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
<?php common::printIcon('group', 'copy', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
<?php
if(common::hasPriv('group', 'delete') and $group->role != 'limited')
{
$deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$lang->group->delete}' class='btn'");
}
else
{
echo "<button class='btn disabled'><i class='icon icon-trash disabled' title='{$lang->group->delete}'></i></button>";
}
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
module/my/view/todo.html.php
+2 -2
View File
@@ -36,8 +36,8 @@
</div>
<div class="btn-toolbar pull-right">
<?php if(common::hasPriv('todo', 'export')) echo html::a(helper::createLink('todo', 'export', "account=$account&orderBy=$orderBy", 'html', true), "<i class='icon-export muted'> </i> " . $lang->todo->export, '', "class='btn btn-link iframe'");?>
<?php common::printLink('todo', 'batchCreate', '', "<i class='icon icon-plus'> </i>" . $lang->todo->batchCreate, '', "id='batchCreate' class='btn btn-secondary iframe' data-width='80%'", '', 'true');?>
<?php common::printLink('todo', 'create', '', "<i class='icon icon-plus'> </i>" . $lang->todo->create, '', "id='create' class='btn btn-primary iframe' data-width='80%'", '', 'true');?>
<?php common::printLink('todo', 'batchCreate', '', "<i class='icon icon-plus'></i> " . $lang->todo->batchCreate, '', "id='batchCreate' class='btn btn-secondary iframe' data-width='80%'", '', 'true');?>
<?php common::printLink('todo', 'create', '', "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "id='create' class='btn btn-primary iframe' data-width='80%'", '', 'true');?>
</div>
</div>
<div id="mainContent">
module/product/view/build.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<div class='btn-toolbar pull-left'>
<a class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->product->build;?></span><span class='label label-light label-badge'><?php echo count($builds);?></span></a>
</div>
<div class='btn-toolbar pull-right'><?php common::printLink('build', 'create', "product=$product->id", "<i class='icon icon-plus'> </i>" . $lang->build->create, '', "class='btn btn-primary'");?></div>
<div class='btn-toolbar pull-right'><?php common::printLink('build', 'create', "product=$product->id", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary'");?></div>
</div>
<div id='mainContent' class='main-table'>
<table class='table' id='buildList'>
module/product/view/index.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php if(empty($products)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'> </i>" . $lang->product->create, '', "class='btn btn-info'");?></p>
<p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'></i> " . $lang->product->create, '', "class='btn btn-info'");?></p>
</div>
<?php else:?>
<?php echo $this->fetch('block', 'dashboard', 'module=product');?>
module/product/view/showerrornone.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'> </i>" . $lang->product->create, '', "class='btn btn-info'");?></p>
<p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'></i> " . $lang->product->create, '', "class='btn btn-info'");?></p>
</div>
<?php include '../../common/view/footer.html.php';?>
module/project/view/bug.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
</div>
<div class="btn-toolbar pull-right">
<?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy", "<i class='icon icon-export muted'> </i>" . $lang->bug->export, '', "class='btn btn-link export'");?>
<?php common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id", "<i class='icon icon-plus'> </i>" . $lang->bug->create, '', "class='btn btn-primary'");?>
<?php common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
</div>
</div>
<div id="mainContent">
module/project/view/build.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
</span>
</div>
<div class="btn-toolbar pull-right">
<?php common::printLink('build', 'create', "project=$project->id", "<i class='icon icon-plus'> </i>" . $lang->build->create, '', "class='btn btn-primary'");?>
<?php common::printLink('build', 'create', "project=$project->id", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary'");?>
</div>
</div>
<div id="mainContent">
module/project/view/story.html.php
+2 -2
View File
@@ -62,8 +62,8 @@
$this->lang->story->create = $this->lang->project->createStory;
if($productID and !$this->loadModel('story')->checkForceReview())
{
common::printLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'> </i>" . $lang->story->batchCreate, '', "class='btn btn-secondary'");
common::printLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'> </i>" . $lang->story->create, '', "class='btn btn-primary'");
common::printLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'></i> " . $lang->story->batchCreate, '', "class='btn btn-secondary'");
common::printLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-primary'");
}
?>
</div>
module/project/view/storykanban.html.php
+1 -1
View File
@@ -36,7 +36,7 @@
}
?>
</div>
<?php if($productID and !$this->loadModel('story')->checkForceReview()) common::printLink('story', 'create', "productID=$productID&branch=&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'> </i>" . $lang->project->createStory, '', "class='btn btn-primary'");?>
<?php if($productID and !$this->loadModel('story')->checkForceReview()) common::printLink('story', 'create', "productID=$productID&branch=&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'></i> " . $lang->project->createStory, '', "class='btn btn-primary'");?>
</div>
</div>
<?php
module/project/view/testtask.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
</div>
<div class="btn-toolbar pull-right">
<?php common::printIcon('testreport', 'browse', "objectID=$projectID&objectType=project", '', 'button','flag');?>
<?php common::printLink('testtask', 'create', "product=0&project=$projectID", "<i class='icon icon-plus'> </i>" . $lang->testtask->create, '', "class='btn btn-primary'");?>
<?php common::printLink('testtask', 'create', "product=0&project=$projectID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?>
</div>
</div>
<div id="mainContent">
module/project/view/view.html.php
-4
View File
@@ -289,10 +289,6 @@
common::printIcon('project', 'edit', $params, $project);
common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin');
}
else
{
common::printBack($browseLink);
}
?>
</div>
<script>
module/report/css/bugcreate.css
+1 -2
View File
@@ -1,2 +1 @@
#product_chosen .chosen-single{width:150px;}
#project_chosen .chosen-single{width:150px;}
module/report/view/bugassign.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<nav class="panel-actions btn-toolbar"></nav>
</div>
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id='bugAssign'>
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id='bugAssign'>
<thead>
<tr class='colhead'>
<th><?php echo $lang->report->user;?></th>
module/report/view/bugcreate.html.php
+19 -17
View File
@@ -11,23 +11,25 @@
</div>
<div class='main-col'>
<div class='cell'>
<div class='with-padding'>
<div class="table-row" id='conditions'>
<div class='col-sm-5'>
<div class='input-group input-group-sm'>
<span class='input-group-addon'><?php echo $lang->report->bugOpenedDate;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='form-control form-date' onchange='changeParams(this)'");?></div>
<span class='input-group-addon fix-border'><?php echo $lang->report->to;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control form-date' onchange='changeParams(this)'");?></div>
</div>
<div class="row" id='conditions'>
<div class='col-sm-4'>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->report->bugOpenedDate;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='form-control form-date' onchange='changeParams(this)'");?></div>
<span class='input-group-addon'><?php echo $lang->report->to;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control form-date' onchange='changeParams(this)'");?></div>
</div>
<div class='col-sm-4'>
<div class='input-group w-200px input-group-sm'>
<span class='input-group-addon'><?php echo $lang->report->product;?></span>
<?php echo html::select('product', $products, $product, "class='form-control chosen' onchange='changeParams(this)'");?>
<span class='input-group-addon fix-border'><?php echo $lang->report->project;?></span>
<?php echo html::select('project', $projects, $project, "class='form-control chosen' onchange='changeParams(this)'");?>
</div>
</div>
<div class='col-sm-4'>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->report->product;?></span>
<?php echo html::select('product', $products, $product, "class='form-control chosen' onchange='changeParams(this)'");?>
</div>
</div>
<div class='col-sm-4'>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->report->project;?></span>
<?php echo html::select('project', $projects, $project, "class='form-control chosen' onchange='changeParams(this)'");?>
</div>
</div>
</div>
@@ -39,7 +41,7 @@
<nav class="panel-actions btn-toolbar"></nav>
</div>
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id="bug">
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id="bug">
<thead>
<tr class='colhead'>
<th><?php echo $lang->bug->openedBy;?></th>
module/report/view/productsummary.html.php
+11 -13
View File
@@ -10,18 +10,16 @@
</div>
<div class='main-col'>
<div class='cell'>
<div class='with-padding'>
<div class="table-row" id='conditions'>
<div class="col-xs text-right side-col text-gray"><?php echo $lang->report->conditions?></div>
<div class='col'>
<div class="checkbox-primary inline-block">
<input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
<label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
</div>
<div class="checkbox-primary inline-block">
<input type="checkbox" name="overduePlan" value="overduePlan" id="overduePlan" <?php if(strpos($conditions, 'overduePlan') !== false) echo "checked='checked'"?> />
<label for="overduePlan"><?php echo $lang->report->overduePlan?></label>
</div>
<div class="table-row" id='conditions'>
<div class="col-xs text-right text-gray text-middle"><?php echo $lang->report->conditions?></div>
<div class='col'>
<div class="checkbox-primary inline-block">
<input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
<label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
</div>
<div class="checkbox-primary inline-block">
<input type="checkbox" name="overduePlan" value="overduePlan" id="overduePlan" <?php if(strpos($conditions, 'overduePlan') !== false) echo "checked='checked'"?> />
<label for="overduePlan"><?php echo $lang->report->overduePlan?></label>
</div>
</div>
</div>
@@ -33,7 +31,7 @@
<nav class="panel-actions btn-toolbar"></nav>
</div>
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id='productList'>
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id='productList'>
<thead>
<tr>
<th class='w-200px'><?php echo $lang->product->name;?></th>
module/report/view/projectdeviation.html.php
+7 -9
View File
@@ -12,14 +12,12 @@
</div>
<div class='main-col'>
<div class='cell'>
<div class='with-padding'>
<div class="table-row" id='conditions'>
<div class='input-group w-400px input-group-sm'>
<span class='input-group-addon'><?php echo $lang->projectCommon . $lang->report->beginAndEnd;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $begin, "class='form-control form-date' onchange='changeDate(this.value, \"$end\")'");?></div>
<span class='input-group-addon'><?php echo $lang->report->to;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $end, "class='form-control form-date' onchange='changeDate(\"$begin\", this.value)'");?></div>
</div>
<div class="table-row" id='conditions'>
<div class='input-group w-400px input-group-sm'>
<span class='input-group-addon'><?php echo $lang->projectCommon . $lang->report->beginAndEnd;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $begin, "class='form-control form-date' onchange='changeDate(this.value, \"$end\")'");?></div>
<span class='input-group-addon'><?php echo $lang->report->to;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $end, "class='form-control form-date' onchange='changeDate(\"$begin\", this.value)'");?></div>
</div>
</div>
</div>
@@ -30,7 +28,7 @@
<nav class="panel-actions btn-toolbar"></nav>
</div>
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id='projectList'>
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id='projectList'>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->report->id;?></th>
module/report/view/workload.html.php
+39 -35
View File
@@ -11,42 +11,46 @@
</div>
<div class='main-col'>
<div class='cell'>
<div class='with-padding'>
<form method='post'>
<div class="table-row" id='conditions'>
<div class='col-2'>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->report->dept;?></span>
<?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='changeParams(this)'");?>
</div>
<form method='post'>
<div class="row" id='conditions'>
<div class='col-sm-2'>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->report->dept;?></span>
<?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='changeParams(this)'");?>
</div>
<div class='col-4'>
<div class='input-group input-group-sm'>
<span class='input-group-addon'><?php echo $lang->report->taskAssignedDate;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
<span class='input-group-addon fix-border'><?php echo $lang->report->to;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
</div>
</div>
<div class='col-2'>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->report->diffDays;?></span>
<?php echo html::input('days', $days, "class='form-control' autocomplete='off' style='text-align:center'");?>
</div>
</div>
<div class='col-2'>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->report->workday;?></span>
<?php echo html::input('workday', $workday, "class='form-control' autocomplete='off' style='width:50px'");?>
</div>
</div>
<div class='col-1'>
<?php echo html::select('assign', $lang->report->assign, $assign, "class='form-control' onchange='changeParams(this)' style='width:90px'");?>
</div>
<div class='col-1 text-right'><?php echo html::submitButton($lang->report->query);?></div>
</div>
</form>
</div>
<div class='col-sm-4'>
<div class='input-group input-group-sm'>
<span class='input-group-addon'><?php echo $lang->report->taskAssignedDate;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
<span class='input-group-addon fix-border'><?php echo $lang->report->to;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
</div>
</div>
<div class='col-sm-2'>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->report->diffDays;?></span>
<?php echo html::input('days', $days, "class='form-control' autocomplete='off' style='text-align:center'");?>
</div>
</div>
<div class='col-sm-4'>
<div class="row">
<div class="col-sm-5">
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->report->workday;?></span>
<?php echo html::input('workday', $workday, "class='form-control' autocomplete='off'");?>
</div>
</div>
<div class="col-sm-4">
<?php echo html::select('assign', $lang->report->assign, $assign, "class='form-control chosen-simple' onchange='changeParams(this)'");?>
</div>
<div class="col-sm-3">
<?php echo html::submitButton($lang->report->query, '', 'btn btn-primary btn-block');?>
</div>
</div>
</div>
</div>
</form>
</div>
<div class='cell'>
<div class='panel'>
@@ -55,7 +59,7 @@
<nav class="panel-actions btn-toolbar"></nav>
</div>
<div data-ride='table'>
<table class='table table-condensed table-striped table-bordered table-fixed' id="workload">
<table class='table table-condensed table-striped table-bordered table-fixed no-margin' id="workload">
<thead>
<tr class='colhead'>
<th class="w-200px"><?php echo $lang->report->user;?></th>
module/score/model.php
+2 -2
View File
@@ -93,7 +93,7 @@ class scoreModel extends model
if(!empty($task->estimate))
{
$rule['score'] = $rule['score'] + round(($task->consumed / 10 * $task->estimate / $task->consumed));
$rule['score'] = $rule['score'] + (empty($task->consumed) ? 0 : round($task->consumed / 10 * $task->estimate / $task->consumed));
}
}
break;
@@ -221,7 +221,7 @@ class scoreModel extends model
$data->time = empty($time) ? helper::now() : $time;
$this->dao->insert(TABLE_SCORE)->data($data)->exec();
$this->dao->update(TABLE_USER)->set("`score`=`score` + " . $rule['score'])->set("`scoreLevel`=`scoreLevel` + " . $rule['score'])->where('account')->eq($account)->exec();
$this->dao->update(TABLE_USER)->set("`score`=`score` + " . (int)$rule['score'])->set("`scoreLevel`=`scoreLevel` + " . (int)$rule['score'])->where('account')->eq($account)->exec();
}
/**
module/search/view/buildform.html.php
+1 -1
View File
@@ -189,7 +189,7 @@ foreach($fieldParams as $fieldName => $param)
<ul>
<?php foreach($queries as $queryID => $queryName):?>
<?php if(empty($queryID)) continue;?>
<li><?php echo html::a("javascript:executeQuery($queryID)", $queryName . (common::hasPriv('search', 'deleteQuery') ? '<i class="icon icon-close"></i>' : ''), '', "class='label user-query' data-query-id='$queryID'");?></li>
<li><?php echo html::a("javascript:executeQuery($queryID)", $queryName . (common::hasPriv('search', 'deleteQuery') ? '<i class="icon icon-close"></i>' : ''), '', "class='label user-query' data-query-id='$queryID' title='{$queryName}'");?></li>
<?php endforeach;?>
</ul>
</td>
module/story/lang/en.php
+1
View File
@@ -96,6 +96,7 @@ $lang->story->copy = "Copy a Story";
$lang->story->total = "Total Stories";
$lang->story->allStories = 'All';
$lang->story->unclosed = 'Unclosed';
$lang->story->deleted = 'Deleted';
$lang->story->ditto = 'Ditto';
$lang->story->dittoNotice = 'This Story does not belong to the same Product as the last Story does!';
module/story/lang/zh-cn.php
+1
View File
@@ -96,6 +96,7 @@ $lang->story->copy = "复制需求";
$lang->story->total = '总需求';
$lang->story->allStories = '所有需求';
$lang->story->unclosed = '未关闭';
$lang->story->deleted = '已删除';
$lang->story->ditto = '同上';
$lang->story->dittoNotice = '该需求与上一需求不属于同一产品！';
module/story/view/view.html.php
+4 -1
View File
@@ -36,7 +36,10 @@
</ul>
</small>
<?php endif; ?>
</div>
<?php if($story->deleted):?>
<span class='label label-danger'><?php echo $lang->story->deleted;?></span>
<?php endif; ?>
</div>
</div>
</div>
<div id="mainContent" class="main-row">
module/task/view/view.html.php
-2
View File
@@ -365,8 +365,6 @@
if(!empty($task->parent)) echo html::a(helper::createLink('task', 'view', "taskID=$task->parent"), "<i class='icon icon-chevron-double-up'></i>", '', "class='btn btn-link' title='{$lang->task->parent}'");
?>
<?php else:?>
<?php common::printBack($browseLink);?>
<?php endif;?>
</div>
</div>
module/testcase/view/browse.html.php
+1 -1
View File
@@ -198,7 +198,7 @@ js::set('branch', $branch);
</div>
<?php elseif(common::hasPriv('testcase', 'create')):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->testcase->noCase;?></span> <?php common::printLink('testcase', 'create', "productID={$productID}", "<i class='icon icon-plus'> </i>" . $lang->testcase->create, '', "class='btn btn-info'");?></p>
<p><span class="text-muted"><?php echo $lang->testcase->noCase;?></span> <?php common::printLink('testcase', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?></p>
</div>
<?php endif;?>
</form>
module/testsuite/view/browse.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
</a>
</div>
<div class="btn-toolbar pull-right">
<?php common::printLink('testsuite', 'create', "product=$productID", "<i class='icon icon-plus'> </i>" . $lang->testsuite->create, '', "class='btn btn-primary'");?>
<?php common::printLink('testsuite', 'create', "product=$productID", "<i class='icon icon-plus'></i> " . $lang->testsuite->create, '', "class='btn btn-primary'");?>
</div>
</div>
<?php endif;?>
module/testtask/view/browse.html.php
+2 -2
View File
@@ -45,12 +45,12 @@ $status = $this->session->testTaskVersionStatus;
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $endTime, "class='form-control form-date' onchange='changeDate(\"$beginTime\", this.value, \"$condition\")'");?></div>
</div>
</div>
<div class="btn-toolbar pull-right"><?php common::printLink('testtask', 'create', "product=$productID", "<i class='icon icon-plus'> </i>" . $lang->testtask->create, '', "class='btn btn-primary'");?></div>
<div class="btn-toolbar pull-right"><?php common::printLink('testtask', 'create', "product=$productID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?></div>
</div>
<?php endif;?>
<?php if($scope == 'local' && $status == 'totalStatus' && empty($tasks)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span> <?php common::printLink('testtask', 'create', "productID={$productID}", "<i class='icon icon-plus'> </i>" . $lang->testtask->create, '', "class='btn btn-info'");?></p>
<p><span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span> <?php common::printLink('testtask', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info'");?></p>
</div>
<?php else:?>
<div id='mainContent' class='main-table'>
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long