From 6684f4a8178a05af6218800cf6808343d5ba4b8f Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Wed, 19 Sep 2018 15:57:00 +0800
Subject: [PATCH] * Finish task #4738.

---
 module/bug/css/create.css            |  2 +-
 module/testcase/css/create.css       |  5 +-
 module/testcase/js/create.js         |  8 +++
 module/testcase/view/create.html.php | 88 ++++++++++++++--------------
 4 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index cc207943c9..0656bd6036 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -43,4 +43,4 @@
 .title-group.required > .required:after {display: block; right: 29px; top: 5px;}
 .title-group .chosen-container {width: 1%!important; min-width: 70px;}
 .title-group #severity + .chosen-container > .chosen-single {border-radius: 0!important;}
-.title-group #pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;}
\ No newline at end of file
+.title-group #pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;}
diff --git a/module/testcase/css/create.css b/module/testcase/css/create.css
index af9bd03773..79198f764d 100644
--- a/module/testcase/css/create.css
+++ b/module/testcase/css/create.css
@@ -36,4 +36,7 @@
 
 #branch {border-left-width: 0px;}
 
-.input-group-addon.w-80px{min-width:80px;}
\ No newline at end of file
+.input-group-addon.w-80px{min-width:80px;}
+
+.title-group.required:after {display: none;}
+.title-group.required > .required:after {display: block; right: 29px; top: 5px;}
diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js
index d465914bfa..0842f98025 100644
--- a/module/testcase/js/create.js
+++ b/module/testcase/js/create.js
@@ -158,4 +158,12 @@ $(function()
     });
 
     initSteps();
+
+    $('#pri').on('change', function()
+    {   
+        var $select = $(this);
+        var $selector = $select.closest('.pri-selector');
+        var value = $select.val();
+        $selector.find('.pri-text').html('<span class="label-pri label-pri-' + value + '" title="' + value + '">' + value + '</span>');    
+    });
 })
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index be05db82cf..b87238cd01 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -83,53 +83,55 @@
         <tr>
           <th><?php echo $lang->testcase->title;?></th>
           <td colspan='2'>
-            <div class="input-control has-icon-right">
-              <?php echo html::input('title', $caseTitle, "class='form-control' autocomplete='off'");?>
-              <div class="colorpicker">
-                <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
-                <ul class="dropdown-menu clearfix">
-                <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
-                </ul>
-                <input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#title"  data-provide="colorpicker">
+            <div class="input-group title-group">
+              <div class="input-control has-icon-right">
+                <?php echo html::input('title', $caseTitle, "class='form-control' autocomplete='off'");?>
+                <div class="colorpicker">
+                  <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+                  <ul class="dropdown-menu clearfix">
+                  <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
+                  </ul>
+                  <input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#title"  data-provide="colorpicker">
+                </div>
               </div>
+              <?php if(strpos(",$showFields,", ',pri,') !== false): // begin print pri selector?>
+              <span class="input-group-addon fix-border br-0"><?php echo $lang->testcase->pri;?></span>
+              <?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'");?>
+              <?php else: ?>
+              <div class="input-group-btn pri-selector" data-type="pri">
+                <button type="button" class="btn dropdown-toggle br-0" data-toggle="dropdown">
+                  <span class="pri-text"><span class="label-pri label-pri-<?php echo empty($pri) ? '0' : $pri?>" title="<?php echo $pri?>"><?php echo $pri?></span></span> &nbsp;<span class="caret"></span>
+                </button>
+                <div class='dropdown-menu pull-right'>
+                  <?php echo html::select('pri', (array)$priList, $pri, "class='form-control' data-provide='labelSelector' data-label-class='label-pri'");?>
+                </div>
+              </div>
+              <?php endif; ?>
+              <?php endif; // end print pri selector ?>
+              <?php if(!$this->testcase->forceNotReview()):?>
+                  <span class="input-group-addon fix-border br-0"><?php echo html::checkbox('forceNotReview', $lang->testcase->forceNotReview, '', "id='forceNotReview0'");?></span>
+              <?php endif;?>
             </div>
           </td>
         </tr>
-        <?php if(!$this->testcase->forceNotReview()):?>
-        <tr>
-          <th></th>
-          <td><?php echo html::checkbox('forceNotReview', $lang->testcase->forceNotReview, '', "id='forceNotReview0'");?></td>
-        </tr>
-        <?php endif;?>
-        <?php if(strpos(",$showFields,", ',pri,') !== false):?>
-        <tr>
-          <th><?php echo $lang->testcase->pri;?></th>
-          <td>
-            <?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' data-label-class='label-pri'");?>
-            <?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>