From 020b26d2d91455110be6c3ab7baadd7ac6b8dba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Thu, 13 Sep 2018 09:52:28 +0800
Subject: [PATCH 1/3] * Fix bug.

---
 module/action/css/trash.css | 2 +-
 module/common/model.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/action/css/trash.css b/module/action/css/trash.css
index d1cdb48332..223c5f01e1 100755
--- a/module/action/css/trash.css
+++ b/module/action/css/trash.css
@@ -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;}
diff --git a/module/common/model.php b/module/common/model.php
index 0ffeac792f..ef3acb40f7 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -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>';
         }

From 2ddb4a35d12d7f43d127114f73af05179a20ea20 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 13 Sep 2018 10:29:23 +0800
Subject: [PATCH 2/3] * Fix report default button.

---
 module/bug/view/report.html.php      | 2 +-
 module/task/view/report.html.php     | 2 +-
 module/testtask/view/report.html.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php
index 2f72726d84..d36e89d741 100644
--- a/module/bug/view/report.html.php
+++ b/module/bug/view/report.html.php
@@ -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>
diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php
index f430f92a38..8bdd3d8b03 100644
--- a/module/task/view/report.html.php
+++ b/module/task/view/report.html.php
@@ -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>
diff --git a/module/testtask/view/report.html.php b/module/testtask/view/report.html.php
index a46441056b..e58a9a3699 100644
--- a/module/testtask/view/report.html.php
+++ b/module/testtask/view/report.html.php
@@ -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>

From ae2183f901063500b6ef088caa918f997d322da9 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 13 Sep 2018 10:42:30 +0800
Subject: [PATCH 3/3] * Fix testtask groupcase pri width.

---
 module/testtask/view/groupcase.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index 25e5bfef83..85a77c5e82 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -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>