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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-09-13 10:55:43 +08:00
parent 5e5dd8f21a ae2183f901
commit a98a04033c
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/css/trash.css
+1 -1
View File
@@ -1,2 +1,2 @@
.table-footer .table-actions{width:auto;visibility:visible;opacity:1;}
.table-footer .table-actions{width:auto;visibility:visible;opacity:1;white-space: nowrap;}
.table-footer .table-actions .text{line-height:28px;}
module/bug/view/report.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<div class='cell'>
<div class='btn-toolbar'>
<?php foreach($lang->report->typeList as $type => $typeName):?>
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-cog'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-circle'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
<?php endforeach;?>
<div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
</div>
module/common/model.php
+1 -1
View File
@@ -611,7 +611,7 @@ class commonModel extends model
if($moduleName != 'index')
{
if(!isset($lang->menu->$mainMenu)) return;
$menuLink = $mainMenu == 'admin' ? $lang->adminMenu : $lang->menu->$mainMenu;
$menuLink = $lang->menu->$mainMenu;
list($menuLabel, $module, $method) = explode('|', $menuLink);
echo '<li>' . html::a(helper::createLink($module, $method), $menuLabel) . '</li>';
}
module/task/view/report.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<div class='cell'>
<div class='btn-toolbar'>
<?php foreach($lang->report->typeList as $type => $typeName):?>
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-cog'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-circle'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
<?php endforeach;?>
<div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
</div>
module/testtask/view/groupcase.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
</div>
</th>
<th class='c-id-sm'><?php echo $lang->idAB;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th class='w-80px'> <?php echo $lang->priAB;?></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-80px'> <?php echo $lang->typeAB;?></th>
<th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>
module/testtask/view/report.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<div class='cell'>
<div class='btn-toolbar'>
<?php foreach($lang->report->typeList as $type => $typeName):?>
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-cog'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-circle'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
<?php endforeach;?>
<div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
</div>