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-07-19 15:35:45 +08:00
parent d6291e05e3 a56ab4ec35
commit 44a8a98c34
10 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browse.html.php
+2 -2
View File
@@ -44,7 +44,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
$menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name;
$label = "<span class='text'>{$menuItem->text}</span>";
$label .= $menuBrowseType == $browseType ? "<span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
$label .= $menuBrowseType == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
$active = $menuBrowseType == $browseType ? 'btn-active-text' : '';
if($menuItem->name == 'my')
@@ -92,7 +92,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
$moreLabelActive = '';
if(isset($lang->bug->moreSelects[$browseType]))
{
$moreLabel = "<span class='text'>{$lang->bug->moreSelects[$browseType]}</span><span class='label label-light label-badge'>{$pager->recTotal}</span>";
$moreLabel = "<span class='text'>{$lang->bug->moreSelects[$browseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
$moreLabelActive = 'btn-active-text';
}
echo "<div class='btn-group'><a href='javascript:;' data-toggle='dropdown' class='btn btn-link {$moreLabelActive}'>{$moreLabel} <span class='caret'></span></a>";
module/product/view/all.html.php
+1 -1
View File
@@ -23,7 +23,7 @@
foreach($lang->product->featureBar['all'] as $key => $label)
{
$label = "<span class='text'>{$label}</span>";
$label .= $key == $status ? "<span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
$label .= $key == $status ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
$active = $key == $status ? 'btn-active-text' : '';
echo html::a(inlink("all", "productID={$productID}&line=&status={$key}"), $label, '', "class='btn btn-link {$active}' id='{$key}'");
}
module/product/view/build.html.php
+1 -1
View File
@@ -15,7 +15,7 @@
<?php if($config->global->flow == 'full'):?>
<div id='mainMenu' class='clearfix'>
<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>
<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>
module/productplan/view/browse.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
<?php foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem):?>
<?php if(isset($menuItem->hidden)) continue;?>
<?php $label = "<span class='text'>{$menuItem->text}</span>";?>
<?php $label .= $menuItem->name == $browseType ? "<span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';?>
<?php $label .= $menuItem->name == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';?>
<?php $active = $menuItem->name == $browseType ? 'btn-active-text' : '';?>
<?php echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType={$menuItem->name}"), $label, '', "class='btn btn-link $active' id='{$menuItem->name}'");?>
<?php endforeach;?>
module/project/view/story.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<?php endif;?>
</div>
<div class="btn-toolbar pull-left">
<?php if(common::hasPriv('project', 'story')) echo html::a($this->createLink('project', 'story', "projectID=$project->id"), "<span class='text'>{$lang->story->allStories}</span><span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "class='btn btn-link btn-active-text'");?>
<?php if(common::hasPriv('project', 'story')) echo html::a($this->createLink('project', 'story', "projectID=$project->id"), "<span class='text'>{$lang->story->allStories}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "class='btn btn-link btn-active-text'");?>
<?php if(common::hasPriv('project', 'storykanban')) echo html::a($this->createLink('project', 'storykanban', "projectID=$project->id"), "<span class='text'>{$lang->project->kanban}</span>", '', "class='btn btn-link'");?>
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->product->searchStory;?></a>
</div>
module/project/view/storykanban.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
<?php $total = 0;?>
<?php foreach($stories as $colStories) $total += count($colStories);?>
<?php if(common::hasPriv('project', 'story')) echo html::a($this->createLink('project', 'story', "projectID=$project->id"), "<span class='text'>{$lang->story->allStories}</span>", '', "class='btn btn-link'");?>
<?php if(common::hasPriv('project', 'storykanban')) echo html::a($this->createLink('project', 'storykanban', "projectID=$project->id"), "<span class='text'>{$lang->project->kanban}</span><span class='label label-light label-badge'>{$total}</span>", '', "class='btn btn-link btn-active-text'");?>
<?php if(common::hasPriv('project', 'storykanban')) echo html::a($this->createLink('project', 'storykanban', "projectID=$project->id"), "<span class='text'>{$lang->project->kanban}</span> <span class='label label-light label-badge'>{$total}</span>", '', "class='btn btn-link btn-active-text'");?>
</div>
<div class="btn-toolbar pull-right">
<div class='btn-group'>
module/project/view/task.html.php
+1 -1
View File
@@ -82,7 +82,7 @@ js::set('browseType', $browseType);
elseif($menuType != 'status' and $menuType != 'QUERY')
{
$label = "<span class='text'>{$menuItem->text}</span>";
$label .= $menuType == $browseType ? "<span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
$label .= $menuType == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
$active = $menuType == $browseType ? 'btn-active-text' : '';
echo html::a(inlink('task', "project=$projectID&type=$menuType"), $label, '', "id='{$menuType}' class='btn btn-link $active'");
}
module/testcase/view/browse.html.php
+1 -1
View File
@@ -216,6 +216,6 @@ js::set('suiteID', $suiteID);
</div>
<script>
$('#module' + moduleID).closest('li').addClass('active');
$('#' + caseBrowseType + 'Tab').addClass('btn-active-text').find('.text').after("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
$('#' + caseBrowseType + 'Tab').addClass('btn-active-text').find('.text').after(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
</script>
<?php include '../../common/view/footer.html.php';?>
module/testsuite/view/library.html.php
+1 -1
View File
@@ -210,7 +210,7 @@ js::set('flow', $config->global->flow);
<script>
$('#module' + moduleID).addClass('active');
<?php if($config->global->flow == 'full'):?>
$('#<?php echo $this->session->libBrowseType?>Tab').addClass('btn-active-text').append("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
$('#<?php echo $this->session->libBrowseType?>Tab').addClass('btn-active-text').append(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
<?php endif;?>
if(flow == 'onlyTest')
{
module/testtask/view/browse.html.php
+1 -1
View File
@@ -118,5 +118,5 @@ $status = $this->session->testTaskVersionStatus;
<div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</div>
<script>$(function(){$('#<?php echo $status?>Tab').addClass('btn-active-text').append("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>")})</script>
<script>$(function(){$('#<?php echo $status?>Tab').addClass('btn-active-text').append(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>")})</script>
<?php include '../../common/view/footer.html.php';?>