From 6fe63dcc592ec4ec8f858cfe1e6aa7473c19f9c9 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Tue, 22 Nov 2016 13:42:41 +0800
Subject: [PATCH]  * finish task #2781.

---
 module/bug/css/browse.css             |  8 +++++--
 module/bug/js/browse.js               |  2 +-
 module/bug/view/browse.html.php       | 23 +++++++++++--------
 module/my/css/common.css              |  8 +++++--
 module/my/js/common.js                |  2 +-
 module/my/view/bug.html.php           |  7 +++---
 module/my/view/story.html.php         |  7 +++---
 module/product/css/browse.css         |  9 ++++++--
 module/product/js/browse.js           |  5 ++--
 module/product/view/browse.html.php   | 33 ++++++++++++++++-----------
 module/productplan/css/view.css       |  9 +++++---
 module/productplan/js/view.js         |  2 +-
 module/productplan/view/view.html.php | 33 ++++++++++++++++-----------
 module/project/css/task.css           |  9 ++++++--
 module/project/js/task.js             |  2 +-
 module/project/view/task.html.php     | 15 +++++++-----
 module/testcase/css/browse.css        |  9 ++++++--
 module/testcase/js/browse.js          |  2 +-
 module/testcase/view/browse.html.php  |  8 ++++---
 19 files changed, 123 insertions(+), 70 deletions(-)

diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css
index 8a01602e3b..f0bd370a0f 100644
--- a/module/bug/css/browse.css
+++ b/module/bug/css/browse.css
@@ -5,7 +5,11 @@
 .confirm1 {color:green; font-size:9px}
 .red{color:red;}
 
-.dropdown-menu.with-search {padding-bottom: 34px; min-width: 150px; overflow: hidden; max-height: 305px}
-.dropdown-menu > .menu-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
+.dropdown-menu.with-search {padding: 0; min-width: 150px; overflow: hidden; max-height: 302px;}
 .dropdown-menu > .menu-search .input-group {width:100%;}
 .dropdown-menu > .menu-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
+.dropdown-menu > .menu-search .form-control {border: none!important; box-shadow: none!important; border-top: 1px solid #ddd!important;}
+.dropdown-list {display: block; padding: 0; max-height: 270px; overflow-y: auto;}
+.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
+.dropdown-list > li > a:hover,
+.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js
index 550b231de9..b939022371 100644
--- a/module/bug/js/browse.js
+++ b/module/bug/js/browse.js
@@ -9,7 +9,7 @@ $(document).ready(function()
     }).on('keyup change paste', 'input', function()
     {
         var val = $(this).val().toLowerCase();
-        var $options = $(this).closest('ul.dropdown-menu.with-search').find('.option');
+        var $options = $(this).closest('.dropdown-menu.with-search').find('.option');
         if(val == '') return $options.removeClass('hide');
         $options.each(function()
         {
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 5af222fd7c..23f6278747 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -148,14 +148,16 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
                       $withSearch = count($modules) > 8;
                       echo "<li class='dropdown-submenu'>";
                       echo html::a('javascript:;', $lang->bug->moduleAB, '', "id='moduleItem'");
-                      echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                      echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                      echo '<ul class="dropdown-list">';
                       foreach($modules as $moduleId => $module)
                       {
                           $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId");
                           echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
                       }
-                      if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                      echo '</ul></li>';
+                      echo "</ul>";
+                      if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                      echo '</div></li>';
                   }
                   else
                   {
@@ -178,7 +180,8 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
                               $withSearch = count($builds) > 4;
                               echo "<li class='dropdown-submenu'>";
                               echo html::a('javascript:;', $resolution, '', "id='fixedItem'");
-                              echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                              echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                              echo '<ul class="dropdown-list">';
                               unset($builds['']);
                               foreach($builds as $key => $build)
                               {
@@ -187,8 +190,9 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
                                   echo html::a('javascript:;', $build, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
                                   echo "</li>";
                               }
-                              if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                              echo '</ul></li>';
+                              echo "</ul>";
+                              if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                              echo '</div></li>';
                           }
                           else
                           {
@@ -210,15 +214,16 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
                       echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
                       echo "<li class='dropdown-submenu'>";
                       echo html::a('javascript::', $lang->bug->assignedTo, 'id="assignItem"');
-                      echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                      echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                      echo '<ul class="dropdown-list">';
                       foreach ($memberPairs as $key => $value)
                       {
                           if(empty($key)) continue;
                           echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
                       }
-                      if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
                       echo "</ul>";
-                      echo "</li>";
+                      if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                      echo "</div></li>";
                   }
                   else
                   {
diff --git a/module/my/css/common.css b/module/my/css/common.css
index 0b1dda3c8f..cbbfe79103 100644
--- a/module/my/css/common.css
+++ b/module/my/css/common.css
@@ -1,4 +1,8 @@
-.dropdown-menu.with-search {padding-bottom: 34px; min-width: 150px; overflow: hidden; max-height: 305px}
-.dropdown-menu > .menu-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
+.dropdown-menu.with-search {padding: 0; min-width: 150px; overflow: hidden; max-height: 302px;}
 .dropdown-menu > .menu-search .input-group {width:100%;}
 .dropdown-menu > .menu-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
+.dropdown-menu > .menu-search .form-control {border: none!important; box-shadow: none!important; border-top: 1px solid #ddd!important;}
+.dropdown-list {display: block; padding: 0; max-height: 270px; overflow-y: auto;}
+.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
+.dropdown-list > li > a:hover,
+.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
diff --git a/module/my/js/common.js b/module/my/js/common.js
index a79e8f6c74..d6befcca8d 100644
--- a/module/my/js/common.js
+++ b/module/my/js/common.js
@@ -17,7 +17,7 @@ $(function()
     }).on('keyup change paste', 'input', function()
     {
         var val = $(this).val().toLowerCase();
-        var $options = $(this).closest('ul.dropdown-menu.with-search').find('.option');
+        var $options = $(this).closest('.dropdown-menu.with-search').find('.option');
         if(val == '') return $options.removeClass('hide');
         $options.each(function()
         {
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 6027fae3f7..c91d132192 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -99,15 +99,16 @@
                   echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
                   echo "<li class='dropdown-submenu'>";
                   echo html::a('javascript::', $lang->bug->assignedTo, 'id="assignItem"');
-                  echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                  echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                  echo "<ul  class='dropdown-list'>";
                   foreach ($memberPairs as $key => $value)
                   {
                       if(empty($key)) continue;
                       echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
                   }
-                  if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
                   echo "</ul>";
-                  echo "</li>";
+                  if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                  echo "</div></li>";
               }
               else
               {
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index e7c4657655..76910d12ac 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -139,15 +139,16 @@
                   echo html::select('assignedTo', $users, '', 'class="hidden"');
                   echo "<li class='dropdown-submenu'>";
                   echo html::a('javascript::', $lang->story->assignedTo, '', 'id="assignItem"');
-                  echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                  echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                  echo '<ul class="dropdown-list">';
                   foreach ($users as $key => $value)
                   {
                       if(empty($key) or $key == 'closed') continue;
                       echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
                   }
-                  if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
                   echo "</ul>";
-                  echo "</li>";
+                  if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                  echo "</div></li>";
             }
             else
             {
diff --git a/module/product/css/browse.css b/module/product/css/browse.css
index 860fc5cea1..af5d1f4620 100644
--- a/module/product/css/browse.css
+++ b/module/product/css/browse.css
@@ -1,7 +1,12 @@
-.dropdown-menu.with-search {padding-bottom: 34px; min-width: 150px; overflow: hidden; max-height: 305px}
-.dropdown-menu > .menu-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
+.dropdown-menu.with-search {padding: 0; min-width: 150px; overflow: hidden; max-height: 302px;}
 .dropdown-menu > .menu-search .input-group {width:100%;}
 .dropdown-menu > .menu-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
+.dropdown-menu > .menu-search .form-control {border: none!important; box-shadow: none!important; border-top: 1px solid #ddd!important;}
+.dropdown-list {display: block; padding: 0; max-height: 270px; overflow-y: auto;}
+.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
+.dropdown-list > li > a:hover,
+.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
+
 .pl-5px{padding-left:5px;}
 a.removeModule{color:#ddd}
 a.removeModule:hover{color:red}
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index 8178285df8..aed4662921 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -8,8 +8,9 @@ $(function()
         return false;
     }).on('keyup change paste', 'input', function()
     {
-        var val = $(this).val().toLowerCase();
-        var $options = $(this).closest('ul.dropdown-menu.with-search').find('.option');
+        var $input = $(this);
+        var val = $input.val().toLowerCase();
+        var $options = $input.closest('.dropdown-menu.with-search').find('.option');
         if(val == '') return $options.removeClass('hide');
         $options.each(function()
         {
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index b8f26ebbe6..57e905f630 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -175,14 +175,16 @@
                     $withSearch = count($branches) > 8;
                     echo "<li class='dropdown-submenu'>";
                     echo html::a('javascript:;', $lang->product->branchName[$this->session->currentProductType], '', "id='branchItem'");
-                    echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo "<ul class='dropdown-list'>";
                     foreach($branches as $branchID => $branchName)
                     {
                         $actionLink = $this->createLink('story', 'batchChangeBranch', "branchID=$branchID");
                         echo "<li class='option' data-key='$branchID'>" . html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "</li>";
                     }
-                    if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                    echo '</ul></li>';
+                    echo '</ul>';
+                    if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                    echo '</div></li>';
                 }
 
                 if(common::hasPriv('story', 'batchChangeModule'))
@@ -190,14 +192,16 @@
                     $withSearch = count($modules) > 8;
                     echo "<li class='dropdown-submenu'>";
                     echo html::a('javascript:;', $lang->story->moduleAB, '', "id='moduleItem'");
-                    echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo "<ul class='dropdown-list'>";
                     foreach($modules as $moduleId => $module)
                     {
                         $actionLink = $this->createLink('story', 'batchChangeModule', "moduleID=$moduleId");
                         echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
                     }
-                    if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                    echo '</ul></li>';
+                    echo '</ul>';
+                    if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                    echo '</div></li>';
                 }
                 else
                 {
@@ -211,14 +215,16 @@
                     $withSearch = count($plans) > 8;
                     echo "<li class='dropdown-submenu'>";
                     echo html::a('javascript:;', $lang->story->planAB, '', "id='planItem'");
-                    echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo "<ul class='dropdown-list'>";
                     foreach($plans as $planID => $plan)
                     {
                         $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID");
                         echo "<li class='option' data-key='$planID'>" . html::a('#', $plan, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
                     }
-                    if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                    echo '</ul></li>';
+                    echo '</ul>';
+                    if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                    echo '</div></li>';
                 }
                 else
                 {
@@ -247,18 +253,19 @@
                 {
                       $withSearch = count($users) > 10;
                       $actionLink = $this->createLink('story', 'batchAssignTo', "productID=$productID");
-                      echo html::select('assignedTo', $users, '', 'class="hidden"');
                       echo "<li class='dropdown-submenu'>";
+                      echo html::select('assignedTo', $users, '', 'class="hidden"');
                       echo html::a('javascript::', $lang->story->assignedTo, '', 'id="assignItem"');
-                      echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                      echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                      echo '<ul class="dropdown-list">';
                       foreach ($users as $key => $value)
                       {
                           if(empty($key) or $key == 'closed') continue;
                           echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
                       }
-                      if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
                       echo "</ul>";
-                      echo "</li>";
+                      if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control'><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                      echo "</div></li>";
                 }
                 else
                 {
diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css
index dd3bba1d05..88e40fefd5 100644
--- a/module/productplan/css/view.css
+++ b/module/productplan/css/view.css
@@ -9,8 +9,11 @@
 #unlinkBugList, #unlinkStoryList{margin-bottom:5px;}
 input[type=checkbox].ml-10px{margin-left:10px;}
 
-.dropdown-menu {min-width:95px;}
-.dropdown-menu.with-search {padding-bottom: 34px; min-width: 150px; overflow: hidden; max-height: 305px}
-.dropdown-menu > .menu-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
+.dropdown-menu.with-search {padding: 0; min-width: 150px; overflow: hidden; max-height: 302px;}
 .dropdown-menu > .menu-search .input-group {width:100%;}
 .dropdown-menu > .menu-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
+.dropdown-menu > .menu-search .form-control {border: none!important; box-shadow: none!important; border-top: 1px solid #ddd!important;}
+.dropdown-list {display: block; padding: 0; max-height: 270px; overflow-y: auto;}
+.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
+.dropdown-list > li > a:hover,
+.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
diff --git a/module/productplan/js/view.js b/module/productplan/js/view.js
index d90d110829..d62c17a5ad 100644
--- a/module/productplan/js/view.js
+++ b/module/productplan/js/view.js
@@ -33,7 +33,7 @@ $(function()
     }).on('keyup change paste', 'input', function()
     {
         var val = $(this).val().toLowerCase();
-        var $options = $(this).closest('ul.dropdown-menu.with-search').find('.option');
+        var $options = $(this).closest('.dropdown-menu.with-search').find('.option');
         if(val == '') return $options.removeClass('hide');
         $options.each(function()
         {
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 5e2164c8b0..151cf8933c 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -121,7 +121,7 @@
                 </tbody>
                 <tfoot>
                 <tr>
-                  <td colspan='9'>
+                  <td colspan='10'>
                     <div class='table-actions clearfix'>
                       <?php if(count($planStories)):?>
                       <?php echo html::selectButton();?>
@@ -186,14 +186,16 @@
                               $withSearch = count($branches) > 8;
                               echo "<li class='dropdown-submenu'>";
                               echo html::a('javascript:;', $lang->product->branchName[$this->session->currentProductType], '', "id='branchItem'");
-                              echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                              echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                              echo '<ul class="dropdown-list">';
                               foreach($branches as $branchID => $branchName)
                               {
                                   $actionLink = $this->createLink('story', 'batchChangeBranch', "branchID=$branchID");
                                   echo "<li class='option' data-key='$branchID'>" . html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', this)\"") . "</li>";
                               }
-                              if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                              echo '</ul></li>';
+                              echo '</ul>';
+                              if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                              echo '</div></li>';
                           }
 
                           if(common::hasPriv('story', 'batchChangeModule'))
@@ -201,14 +203,16 @@
                               $withSearch = count($modules) > 8;
                               echo "<li class='dropdown-submenu'>";
                               echo html::a('javascript:;', $lang->story->moduleAB, '', "id='moduleItem'");
-                              echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                              echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                              echo '<ul class="dropdown-list">';
                               foreach($modules as $moduleId => $module)
                               {
                                   $actionLink = $this->createLink('story', 'batchChangeModule', "moduleID=$moduleId");
                                   echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin', this)\"") . "</li>";
                               }
-                              if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                              echo '</ul></li>';
+                              echo '</ul>';
+                              if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                              echo '</div></li>';
                           }
                           else
                           {
@@ -223,14 +227,16 @@
                               $withSearch = count($plans) > 8;
                               echo "<li class='dropdown-submenu'>";
                               echo html::a('javascript:;', $lang->story->planAB, '', "id='planItem'");
-                              echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                              echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                              echo '<ul class="dropdown-list">';
                               foreach($plans as $planID => $planName)
                               {
                                   $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID&oldPlanID=$plan->id");
                                   echo "<li class='option' data-key='$planID'>" . html::a('#', $planName, '', "onclick=\"setFormAction('$actionLink','hiddenwin', this)\"") . "</li>";
                               }
-                              if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                              echo '</ul></li>';
+                              echo '</ul>';
+                              if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                              echo '</div></li>';
                           }
                           else
                           {
@@ -262,15 +268,16 @@
                                 echo html::select('assignedTo', $users, '', 'class="hidden"');
                                 echo "<li class='dropdown-submenu'>";
                                 echo html::a('javascript::', $lang->story->assignedTo, '', 'id="assignItem"');
-                                echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                                echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                                echo '<ul class="dropdown-list">';
                                 foreach ($users as $key => $value)
                                 {
                                     if(empty($key) or $key == 'closed') continue;
                                     echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
                                 }
-                                if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
                                 echo "</ul>";
-                                echo "</li>";
+                                if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                                echo "</div></li>";
                           }
                           else
                           {
diff --git a/module/project/css/task.css b/module/project/css/task.css
index bb2b722abf..d855bdf6fb 100644
--- a/module/project/css/task.css
+++ b/module/project/css/task.css
@@ -8,8 +8,13 @@
 .sub-featurebar #bysearchTab.active {padding:0px;}
 .sub-featurebar #bysearchTab.active:hover {background:#fff;}
 
-.dropdown-menu.with-search {padding-bottom: 34px; min-width: 150px; overflow: hidden; max-height: 305px}
-.dropdown-menu > .menu-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
+.dropdown-menu.with-search {padding: 0; min-width: 150px; overflow: hidden; max-height: 302px;}
 .dropdown-menu > .menu-search .input-group {width:100%;}
 .dropdown-menu > .menu-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
+.dropdown-menu > .menu-search .form-control {border: none!important; box-shadow: none!important; border-top: 1px solid #ddd!important;}
+.dropdown-list {display: block; padding: 0; max-height: 270px; overflow-y: auto;}
+.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
+.dropdown-list > li > a:hover,
+.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
+
 .pl-5px{padding-left:5px;}
diff --git a/module/project/js/task.js b/module/project/js/task.js
index 4a1401749a..fc2fc74f7c 100644
--- a/module/project/js/task.js
+++ b/module/project/js/task.js
@@ -12,7 +12,7 @@ $(function()
     }).on('keyup change paste', 'input', function()
     {
         var val = $(this).val().toLowerCase();
-        var $options = $(this).closest('ul.dropdown-menu.with-search').find('.option');
+        var $options = $(this).closest('.dropdown-menu.with-search').find('.option');
         if(val == '') return $options.removeClass('hide');
         $options.each(function()
         {
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index fee3c4f15a..6423acfad4 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -76,14 +76,16 @@ js::set('browseType', $browseType);
                     $withSearch = count($modules) > 10;
                     echo "<li class='dropdown-submenu'>";
                     echo html::a('javascript:;', $lang->task->moduleAB, '', "id='moduleItem'");
-                    echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo '<ul class="dropdown-list">';
                     foreach($modules as $moduleId => $module)
                     {
                         $actionLink = $this->createLink('task', 'batchChangeModule', "moduleID=$moduleId");
                         echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
                     }
-                    if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                    echo '</ul></li>';
+                    echo '</ul>';
+                    if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                    echo '</div></li>';
                 }
                 else
                 {
@@ -98,15 +100,16 @@ js::set('browseType', $browseType);
                     echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
                     echo "<li class='dropdown-submenu'>";
                     echo html::a('javascript::', $lang->task->assignedTo, 'id="assignItem"');
-                    echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                    echo '<ul class="dropdown-list">';
                     foreach ($memberPairs as $key => $value)
                     {
                         if(empty($key)) continue;
                         echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
                     }
-                    if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
                     echo "</ul>";
-                    echo "</li>";
+                    if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                    echo "</div></li>";
                 }
                 echo "</ul></div>";
             }
diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css
index c83a2d9874..e3768a108e 100644
--- a/module/testcase/css/browse.css
+++ b/module/testcase/css/browse.css
@@ -1,7 +1,12 @@
 .w-220px{width:220px}
 
-.dropdown-menu.with-search {padding-bottom: 34px; min-width: 150px; overflow: hidden; max-height: 305px}
-.dropdown-menu > .menu-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
+.dropdown-menu.with-search {padding: 0; min-width: 150px; overflow: hidden; max-height: 302px;}
 .dropdown-menu > .menu-search .input-group {width:100%;}
 .dropdown-menu > .menu-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
+.dropdown-menu > .menu-search .form-control {border: none!important; box-shadow: none!important; border-top: 1px solid #ddd!important;}
+.dropdown-list {display: block; padding: 0; max-height: 270px; overflow-y: auto;}
+.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
+.dropdown-list > li > a:hover,
+.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
+
 .pl-5px{padding-left:5px;}
diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js
index 9bc4c3fc8c..dbb1877696 100644
--- a/module/testcase/js/browse.js
+++ b/module/testcase/js/browse.js
@@ -34,7 +34,7 @@ $(document).ready(function()
     }).on('keyup change paste', 'input', function()
     {
         var val = $(this).val().toLowerCase();
-        var $options = $(this).closest('ul.dropdown-menu.with-search').find('.option');
+        var $options = $(this).closest('.dropdown-menu.with-search').find('.option');
         if(val == '') return $options.removeClass('hide');
         $options.each(function()
         {
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 258bbe3306..30514bc2a3 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -75,14 +75,16 @@ js::set('batchDelete',    $lang->testcase->confirmBatchDelete);
                       $withSearch = count($modules) > 8;
                       echo "<li class='dropdown-submenu'>";
                       echo html::a('javascript:;', $lang->testcase->moduleAB, '', "id='moduleItem'");
-                      echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search' : '') . "'>";
+                      echo "<div class='dropdown-menu" . ($withSearch ? ' with-search' : '') . "'>";
+                      echo '<ul class="dropdown-list">';
                       foreach($modules as $moduleId => $module)
                       {
                           $actionLink = $this->createLink('testcase', 'batchChangeModule', "moduleID=$moduleId");
                           echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
                       }
-                      if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                      echo '</ul></li>';
+                      echo '</ul>';
+                      if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
+                      echo '</div></li>';
                   }
                   else
                   {