From d95c372d312756c5bb06e7e02cb73b25a0d502ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Mon, 14 May 2018 09:54:57 +0800
Subject: [PATCH 1/2] * Task#4119

---
 module/testcase/view/create.html.php | 39 ++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 66e9208b6a..e734e65ed7 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -28,8 +28,8 @@
     <table class='table table-form'>
       <tbody>
         <tr>
-          <th class='w-80px'><?php echo $lang->testcase->product;?></th>
-          <td class='w-p45-f'>
+          <th><?php echo $lang->testcase->product;?></th>
+          <td>
             <div class='input-group'>
               <?php echo html::select('product', $products, $productID, "onchange='loadAll(this.value);' class='form-control chosen'");?>
               <?php if($this->session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:120px'");?>
@@ -104,13 +104,36 @@
         <?php if(strpos(",$showFields,", ',pri,') !== false):?>
         <tr>
           <th><?php echo $lang->testcase->pri;?></th>
-          <td><?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='form-control minw-80px chosen'");?></td>
+          <td colspan="2">
+            <?php
+            $hasCustomPri = false;
+            foreach($lang->testcase->priList as $priKey => $priValue)
+            {
+                if(!empty($priKey) and (string)$priKey != (string)$priValue)
+                {
+                    $hasCustomPri = true;
+                    break;
+                }
+            }
+            $priList = $lang->testcase->priList;
+            if(end($priList))
+            {
+                unset($priList[0]);
+                $priList[0] = '';
+            }
+            ?>
+            <?php if($hasCustomPri):?>
+                <?php echo html::select('pri', (array)$priList, $pri, "class='form-control chosen'");?>
+            <?php else: ?>
+                <?php echo html::select('pri', (array)$priList, $pri, "class='form-control' data-provide='labelSelector'");?>
+            <?php endif; ?>
+          </td>
         </tr>
         <?php endif;?>
         <tr>
           <th><?php echo $lang->testcase->precondition;?></th>
           <td colspan='2'><?php echo html::textarea('precondition', $precondition, " rows='2' class='form-control'");?></td>
-        </tr>  
+        </tr>
         <tr>
           <th><?php echo $lang->testcase->steps;?></th>
           <td colspan='2'>
@@ -171,18 +194,18 @@
                 <?php endforeach; ?>
               </tbody>
             </table>
-          </td> 
+          </td>
         </tr>
         <?php if(strpos(",$showFields,", ',keywords,') !== false):?>
         <tr>
           <th><?php echo $lang->testcase->keywords;?></th>
           <td colspan='2'><?php echo html::input('keywords', $keywords, "class='form-control' autocomplete='off'");?></td>
-        </tr>  
+        </tr>
         <?php endif;?>
          <tr>
           <th><?php echo $lang->testcase->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
-        </tr>  
+        </tr>
       </tbody>
       <tfoot>
         <tr>
@@ -190,7 +213,7 @@
             <?php
             echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');
             echo ' &nbsp; ';
-            echo html::backButton($lang->goback, '', 'btn btn-wide btn-gray');
+            echo html::backButton($lang->goback, '', 'btn btn-wide');
             ?>
           </td>
         </tr>

From 14f54e7f371703103b56b7e3eafe6487c41271c2 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 14 May 2018 10:07:31 +0800
Subject: [PATCH 2/2]  * adjust for login page.

---
 module/user/view/login.html.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php
index 413f209634..395bcfb9b2 100644
--- a/module/user/view/login.html.php
+++ b/module/user/view/login.html.php
@@ -46,10 +46,9 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
                   <td id="keeplogin"><?php echo html::checkBox('keepLogin', $lang->user->keepLogin, $keepLogin);?></td>
                 </tr>
                 <tr>
-                  <th></th>
-                  <td class="form-actions">
+                  <td class="form-actions" colspan='2'>
                   <?php 
-                  echo html::submitButton($lang->login);
+                  echo html::submitButton($lang->login, '', 'btn btn-primary btn-wide');
                   if($app->company->guest) echo html::linkButton($lang->user->asGuest, $this->createLink($config->default->module));
                   echo html::hidden('referer', $referer);
                   echo html::a(inlink('reset'), $lang->user->resetPassword);