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:
Catouse
2018-05-24 17:06:07 +08:00
parent 4c38efb845 7dc82af32f
commit a40d9e5b13
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/view/browse.html.php
+10 -2
View File
@@ -36,9 +36,17 @@
<?php if($menuItem->name == 'more'):?>
<?php
echo '<div class="btn-group">';
echo html::a('javascript:;', $menuItem->text . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link'");
$active = '';
$current = $menuItem->text;
$storyBrowseType = $this->session->storyBrowseType;
if(isset($lang->product->moreSelects[$storyBrowseType]))
{
$active = 'btn-active-text';
$current = "<span class='text'>{$lang->product->moreSelects[$storyBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
}
echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link $active'");
echo "<ul class='dropdown-menu'>";
foreach ($lang->product->moreSelects as $key => $value)
foreach($lang->product->moreSelects as $key => $value)
{
echo '<li' . ($key == $this->session->storyBrowseType ? " class='active'" : '') . '>';
echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=$key" . $queryParam), $value);
module/project/view/task.html.php
+9 -4
View File
@@ -69,11 +69,16 @@ js::set('browseType', $browseType);
{
echo "<div class='btn-group'>";
$taskBrowseType = isset($status) ? $this->session->taskBrowseType : '';
$current = zget($lang->project->statusSelects, $taskBrowseType, '');
if(empty($current)) $current = $menuItem->text;
echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link'");
$current = $menuItem->text;
$active = '';
if(isset($lang->project->statusSelects[$taskBrowseType]))
{
$current = "<span class='text'>{$lang->project->statusSelects[$taskBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
$active = 'btn-active-text';
}
echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link $active'");
echo "<ul class='dropdown-menu'>";
foreach ($lang->project->statusSelects as $key => $value)
foreach($lang->project->statusSelects as $key => $value)
{
if($key == '') continue;
echo '<li' . ($key == $taskBrowseType ? " class='active'" : '') . '>';