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

Merge branch '289_language' of https://gitlab.zcorp.cc/easycorp/zentaopms into 289_language

Browse Source
This commit is contained in:
caoyanyi
2023-02-23 10:13:11 +08:00
parent 22faecf1a4 9358865db4
commit 59527ae349
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+1
View File
@@ -1256,6 +1256,7 @@ EOF;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->browseType = $browseType;
$this->view->mode = 'ticket';
$this->display();
}
module/my/view/feedback.html.php
+8 -3
View File
@@ -22,10 +22,15 @@
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php
$recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
echo html::a(inlink($app->rawMethod, "mode=$mode&type=assigntome"), "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>" . ($browseType == 'assigntome' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($browseType == 'assigntome' ? ' btn-active-text' : '') . "'");
foreach($lang->my->featureBar[$app->rawMethod]['feedback'] as $key => $name)
{
$label = "<span class='text'>{$name}</span>";
$label .= $key == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
$active = $key == $browseType ? 'btn-active-text' : '';
echo html::a(inlink($app->rawMethod, "mode=$mode&type=$key"), $label, '', "class='btn btn-link $active'");
}
?>
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
</div>
</div>
<div id="mainContent">
module/my/view/ticket.html.php
+9 -4
View File
@@ -11,15 +11,20 @@
*/
?>
<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
<?php js::set('mode', 'ticket');?>
<?php js::set('mode', $mode);?>
<?php js::set('rawMethod', $app->rawMethod);?>
<div id='mainMenu' class="clearfix">
<div class="btn-toolbar pull-left">
<?php
$recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
echo html::a(inlink($app->rawMethod, "mode=ticket&type=assignedtome"), "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>" . ($browseType == 'assignedtome' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($browseType == 'assignedtome' ? ' btn-active-text' : '') . "'");
foreach($lang->my->featureBar[$app->rawMethod]['ticket'] as $key => $name)
{
$label = "<span class='text'>{$name}</span>";
$label .= $key == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
$active = $key == $browseType ? 'btn-active-text' : '';
echo html::a(inlink($app->rawMethod, "mode=$mode&type=$key"), $label, '', "class='btn btn-link $active'");
}
?>
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
</div>
</div>
<div id='mainContent' class="main-row fade">