From 1b72bf4723593e0b2da018fce726adde05ea21c6 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Thu, 6 Nov 2014 14:53:01 +0800
Subject: [PATCH]  * ajusted ui of batch assign to dropmenu.

---
 module/project/css/task.css       |  4 ++++
 module/project/js/task.js         | 15 +++++++++++++++
 module/project/view/task.html.php | 20 +++++---------------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/module/project/css/task.css b/module/project/css/task.css
index e058a9d4bc..ac34ba8693 100644
--- a/module/project/css/task.css
+++ b/module/project/css/task.css
@@ -7,3 +7,7 @@
 table .dropdown-menu{width:auto; max-width:1000px;}
 table .dropdown-menu tr{border:0px;}
 table .dropdown-menu tr td{border:0px; border-right: 1px dotted #ddd; border-bottom: 1px dotted #ddd;}
+
+.assign-menu {min-width: 150px; padding-bottom: 34px; overflow: hidden; max-height: 305px}
+.assign-menu > .assign-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
+.assign-menu > .assign-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
diff --git a/module/project/js/task.js b/module/project/js/task.js
index b0367af308..c65a0dd4ec 100644
--- a/module/project/js/task.js
+++ b/module/project/js/task.js
@@ -2,6 +2,21 @@ $(function()
 {
     setOuterBox();
     if(browseType == 'bysearch') ajaxGetSearchForm();
+
+
+    $('.assign-menu').click(function(e)
+    {
+        e.stopPropagation();
+        return false;
+    }).on('keyup change paste', 'input', function()
+    {
+        var val = $(this).val().toLowerCase();
+        $('.assign-menu > .option').each(function()
+        {
+            var $option = $(this);
+            $option.toggleClass('hide', $option.text().toLowerCase().indexOf(val) < 0 && $option.data('key').toLowerCase().indexOf(val) < 0);
+        });
+    });
 });
 
 $('#module' + moduleID).addClass('active');
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 62d20c2710..ee622fc453 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -166,23 +166,13 @@
                     echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
                     echo "<li class='dropdown-submenu'>";
                     echo html::a('javascript::', $lang->task->assignedTo, 'id="assignItem"');
-                    echo "<table class='dropdown-menu'>";
-                    $perNum   = 10;
-                    $tableNum = (count($memberPairs) / $perNum);
-                    for($i = 0; $i < $perNum; $i++)
+                    echo "<ul class='dropdown-menu assign-menu'>";
+                    foreach ($memberPairs as $key => $value)
                     {
-                        echo "<tr>";
-                        for($j = 0; $j < $tableNum; $j++)
-                        {
-                            list($key, $val) = each($memberPairs);
-                            if($key === 0 || $key != '')
-                            {
-                                echo "<td>" . html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $val, '', '') . '</td>';
-                            }
-                        }
-                        echo "</tr>";
+                        echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
                     }
-                    echo "</table>";
+                    if(count($memberPairs) > 10) echo "<li class='assign-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>";
                 }
                 echo "</ul></div>";