From 8c05dd59f464470e7a3f4cc64b3c4e29b58edc5d Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Mon, 7 Mar 2016 14:07:49 +0800
Subject: [PATCH]  * improve UI of forms for create action.

---
 module/bug/css/create.css            |  7 +++++--
 module/bug/view/create.html.php      | 30 ++++++++++++++++++++++++++++
 module/story/css/create.css          |  2 ++
 module/story/view/create.html.php    | 17 +++++++++++++++-
 module/task/css/create.css           |  2 ++
 module/task/view/create.html.php     | 15 ++++++++++++++
 module/testcase/css/create.css       |  2 ++
 module/testcase/view/create.html.php | 15 ++++++++++++++
 8 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index b7597cc6b5..9db9925cfc 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -17,9 +17,10 @@
 #module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
 #openedBuild_chosen.chosen-container .chosen-drop {min-width: 450px; border-top: 1px solid #ddd!important}
 #module + .chosen-container-single .chosen-single,
-#openedBuild + .chosen-container-multi .chosen-choices {border-top-left-radius: 0; border-bottom-left-radius: 0; margin-left: -1px;}
+#task + .chosen-container-single .chosen-single,
+#openedBuild + .chosen-container-multi .chosen-choices {border-top-left-radius: 0; border-bottom-left-radius: 0;}
 #openedBuild + .chosen-container-multi .chosen-choices,
-#mailto + .chosen-container-multi .chosen-choices {border-top-right-radius: 0; border-bottom-right-radius: 0; margin-left: -1px;}
+#mailto + .chosen-container-multi .chosen-choices {border-top-right-radius: 0; border-bottom-right-radius: 0;}
 
 .dropdown-pris > .btn {background-color: #fff; text-shadow: none}
 
@@ -28,3 +29,5 @@
 
 #contactListGroup .input-group-btn > .btn {margin-left: -1px!important;}
 #contactListGroup .input-group-btn > .btn:first-child {border-left: none}
+
+.minw-80px {min-width: 80px;}
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 6cb3b3d5c1..83a3d2cb6b 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -102,6 +102,20 @@ js::set('refresh', $lang->refresh);
             <div class='col-table'>
               <div class='input-group'>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->bug->severity;?></span>
+                <?php
+                $isAllNumberPri = true;
+                foreach ($lang->bug->severityList as $value)
+                {
+                    if(!empty($value) && !is_numeric($value))
+                    {
+                        $isAllNumberPri = false;
+                        break;
+                    }
+                }
+                ?>
+                <?php if(!$isAllNumberPri):?>
+                <?php echo html::select('pri', (array)$lang->bug->severityList, $severity, "class='form-control minw-80px'");?> 
+                <?php else: ?>
                 <div class='input-group-btn dropdown-pris' data-prefix='severity'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
                     <span class='pri-text'></span> &nbsp;<span class='caret'></span>
@@ -109,7 +123,22 @@ js::set('refresh', $lang->refresh);
                   <ul class='dropdown-menu pull-right'></ul>
                   <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='hide'");?>
                 </div>
+                <?php endif; ?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->bug->pri;?></span>
+                <?php
+                $isAllNumberPri = true;
+                foreach ($lang->bug->priList as $value)
+                {
+                    if(!empty($value) && !is_numeric($value))
+                    {
+                        $isAllNumberPri = false;
+                        break;
+                    }
+                }
+                ?>
+                <?php if(!$isAllNumberPri):?>
+                <?php echo html::select('pri', (array)$lang->bug->priList, $pri, "class='form-control minw-80px'");?> 
+                <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
                     <span class='pri-text'></span> &nbsp;<span class='caret'></span>
@@ -117,6 +146,7 @@ js::set('refresh', $lang->refresh);
                   <ul class='dropdown-menu pull-right'></ul>
                   <?php echo html::select('pri', $lang->bug->priList, '', "class='hide'");?>
                 </div>
+                <?php endif; ?>
               </div>
             </div>
           </div>
diff --git a/module/story/css/create.css b/module/story/css/create.css
index 168ca0b892..1354ae1af4 100644
--- a/module/story/css/create.css
+++ b/module/story/css/create.css
@@ -11,3 +11,5 @@ select {border:1px solid #ccc}
 #title.form-control {border-top-right-radius: 0; border-bottom-right-radius: 0}
 
 .dropdown-pris > .btn {background-color: #fff;}
+
+.minw-80px {min-width: 80px;}
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 55e87637d8..1003b67d75 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -90,13 +90,28 @@
             <div class='col-table w-250px'>
               <div class="input-group">
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->story->pri;?></span>
+                <?php
+                $isAllNumberPri = true;
+                foreach ($lang->story->priList as $value)
+                {
+                    if(!empty($value) && !is_numeric($value))
+                    {
+                        $isAllNumberPri = false;
+                        break;
+                    }
+                }
+                ?>
+                <?php if(!$isAllNumberPri):?>
+                <?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='form-control minw-80px'");?> 
+                <?php else: ?>
                 <div class='input-group-btn dropdown-pris' data-set='0,1,2,3,4'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
                     <span class='pri-text'></span> &nbsp;<span class='caret'></span>
                   </button>
                   <ul class='dropdown-menu pull-right'></ul>
-                  <?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='hide'");?>
+                  <?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='hide'");?> 
                 </div>
+                <?php endif; ?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->story->estimateAB;?></span>
                 <?php echo html::input('estimate', $estimate, "class='form-control'");?>
               </div>
diff --git a/module/task/css/create.css b/module/task/css/create.css
index f9fc89351b..eb141dbaf6 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -1,2 +1,4 @@
 .dropdown-pris > .btn {background-color: #fff;}
 #mailto + .chosen-container-multi .chosen-choices {border-top-left-radius: 0; border-bottom-left-radius: 0}
+
+.minw-80px {min-width: 80px;}
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 18861b184f..c6dfde1e12 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -61,6 +61,20 @@
             <div class='col-table w-250px'>
               <div class="input-group">
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->task->pri;?></span>
+                <?php
+                $isAllNumberPri = true;
+                foreach ($lang->task->priList as $value)
+                {
+                    if(!empty($value) && !is_numeric($value))
+                    {
+                        $isAllNumberPri = false;
+                        break;
+                    }
+                }
+                ?>
+                <?php if(!$isAllNumberPri):?>
+                <?php echo html::select('pri', (array)$lang->task->priList, $pri, "class='form-control minw-80px'");?> 
+                <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
                     <span class='pri-text'></span> &nbsp;<span class='caret'></span>
@@ -68,6 +82,7 @@
                   <ul class='dropdown-menu pull-right'></ul>
                   <?php echo html::select('pri', (array)$lang->task->priList, $pri, "class='hide'");?>
                 </div>
+                <?php endif; ?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->task->estimateAB;?></span>
                 <?php echo html::input('estimate', $estimate, "class='form-control' placeholder='{$lang->task->hour}'");?>
               </div>
diff --git a/module/testcase/css/create.css b/module/testcase/css/create.css
index ca2285ab8b..f4691f7040 100644
--- a/module/testcase/css/create.css
+++ b/module/testcase/css/create.css
@@ -27,3 +27,5 @@
 
 #moduleIdBox .input-group-btn > .btn {margin-left: -1px!important;}
 #moduleIdBox .input-group-btn > .btn:first-child {border-left: none}
+
+.minw-80px {min-width: 80px;}
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 6acb2633f7..2d3a7609c0 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -81,6 +81,20 @@
             <div class='col-table'>
               <div class='input-group'>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->testcase->pri;?></span>
+                <?php
+                $isAllNumberPri = true;
+                foreach ($lang->testcase->priList as $value)
+                {
+                    if(!empty($value) && !is_numeric($value))
+                    {
+                        $isAllNumberPri = false;
+                        break;
+                    }
+                }
+                ?>
+                <?php if(!$isAllNumberPri):?>
+                <?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='form-control minw-80px'");?> 
+                <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
                     <span class='pri-text'></span> &nbsp;<span class='caret'></span>
@@ -88,6 +102,7 @@
                   <ul class='dropdown-menu pull-right'></ul>
                   <?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='hide'");?>
                 </div>
+                <?php endif; ?>
               </div>
             </div>
           </div>