From 2d0b26df15504af96b0b49ec417a36df63234472 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Tue, 2 Jul 2013 08:33:44 +0000
Subject: [PATCH]  * finish task#1475.

---
 module/product/lang/en.php                   |  3 ++
 module/product/lang/zh-cn.php                |  3 ++
 module/product/view/ajaxgetdropmenu.html.php | 36 +++++++++++++-------
 www/js/my.full.js                            |  8 +++--
 www/theme/default/style.css                  |  6 +++-
 5 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 5127661da9..8242735902 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -20,6 +20,9 @@ $lang->product->read   = "Info";
 $lang->product->delete = "Delete";
 $lang->product->close  = "Close";
 $lang->product->select = '--select product--';
+$lang->product->mine   = 'I charge : ';
+$lang->product->other  = 'Other : ';
+$lang->product->closed = 'Closed&raquo;';
 
 $lang->product->basicInfo = 'Basic info';
 $lang->product->otherInfo = 'Other info';
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 8d8c009a6b..19172f7ae9 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -20,6 +20,9 @@ $lang->product->read   = "产品详情";
 $lang->product->delete = "删除产品";
 $lang->product->close  = "关闭";
 $lang->product->select = '--请选择产品--';
+$lang->product->mine   = '我负责：';
+$lang->product->other  = '其他：';
+$lang->product->closed = '已关闭&raquo;';
 
 $lang->product->basicInfo = '基本信息';
 $lang->product->otherInfo = '其他信息';
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 85571dd208..8b33aa54ce 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -2,25 +2,35 @@
 <?php js::set('module', $module);?>
 <?php js::set('method', $method);?>
 <?php js::set('extra', $extra);?>
-<input type='text' id='search' value='' onkeyup='searchItems(this.value, "product", productID, module, method, extra)' placeholder='<?php echo $this->app->loadLang('search')->search->common;?>'>
+<input type='text' class='gray' id='search' value='' onkeyup='searchItems(this.value, "product", productID, module, method, extra)' placeholder='<?php echo $this->app->loadLang('search')->search->common;?>'>
 
 <div id='searchResult'>
   <div id='defaultMenu' class='f-left'>
     <ul>
     <?php
-      foreach($products as $product)
-      {
-          $isOwner = $product->PO == $this->app->user->account or $product->QD == $this->app->user->account or $product->RD == $this->app->user->account;
-          if($product->status == 'normal' and $isOwner) echo "<li>" . html::a(sprintf($link, $product->id), $product->name). "</li>";
-      }
-      foreach($products as $product)
-      {
-          $isOwner = $product->PO == $this->app->user->account or $product->QD == $this->app->user->account or $product->RD == $this->app->user->account;
-          if($product->status == 'normal' and !$isOwner) echo "<li>" . html::a(sprintf($link, $product->id), $product->name). "</li>";
-      }
+    $i = 0;
+    foreach($products as $product)
+    {
+        if($product->status == 'normal' and $product->PO == $this->app->user->account) 
+        {
+            if(!$i) echo "<span class='black'>{$lang->product->mine}</span>";
+            echo "<li>" . html::a(sprintf($link, $product->id), $product->name, '', "class='mine'"). "</li>";
+            $i++;
+        }
+    }
+
+    if($i) echo "<span class='black'>{$lang->product->other}</span>";
+    $class = $i ? "class='other'" : '';
+    foreach($products as $product)
+    {
+        if($product->status == 'normal' and !($product->PO == $this->app->user->account))
+        {
+            echo "<li>" . html::a(sprintf($link, $product->id), $product->name, '', "$class"). "</li>";
+        }
+    }
     ?>
     </ul>
-    <div class='a-right'><a id='more' onClick='showMore()'><?php echo $lang->more;?>&raquo;</a></div>
+    <div class='a-right'><a class='gray' id='more' onClick='switchMore()'><?php echo $lang->product->closed;?></a></div>
   </div>
 
   <div id='moreMenu' class='hidden f-left'>
@@ -28,7 +38,7 @@
     <?php
       foreach($products as $product)
       {
-          if($product->status == 'closed') echo "<li>" . html::a(sprintf($link, $product->id), $product->name). "</li>";
+          if($product->status == 'closed') echo "<li>" . html::a(sprintf($link, $product->id), $product->name, '', "class='closed'"). "</li>";
       }
     ?>
     </ul>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 42c31e6ce7..562d167581 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -138,6 +138,8 @@ var showMenu = 0; //Showing or hiding drop menu.
 function showDropMenu(objectType, objectID, module, method, extra)
 {
     if(showMenu == 1) { showMenu = 0; return $("#dropMenu").hide();};
+    $('#wrap').click(function(){return $("#dropMenu").hide();});
+
     $.get(createLink(objectType, 'ajaxGetDropMenu', "objectID=" + objectID + "&module=" + module + "&method=" + method + "&extra=" + extra), function(data){ $('#dropMenu').html(data);});
     var offset = $('#currentItem').offset();
     $("#dropMenu").css({ top:offset.top + $('#currentItem').height() + "px", left:offset.left });
@@ -172,14 +174,14 @@ function searchItems(keywords, objectType, objectID, module, method, extra)
 }
 
 /**
- * Show more items. 
+ * Show or hide more items. 
  * 
  * @access public
  * @return void
  */
-function showMore()
+function switchMore()
 {
-    $('#moreMenu').removeClass('hidden');
+    $('#moreMenu').toggle(0, function(){$('#moreMenu').css('width', $('#defaultMenu').width())});
     $('#search').focus();
 }
 
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index c2d828ec5a..8bd539903e 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -260,6 +260,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 
 /*-----------------------COLOR SETTING----------------------------*/
 .white   {color:white;}
+.black   {color:black;}
 .red     {color:red;}
 .blue    {color:blue}
 .yellow  {color:yellow;}
@@ -323,8 +324,11 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 
 #dropMenu, #dropMenu ul {background:#f1f1f1; height:auto}
 #dropMenu ul {line-height:24px; max-height:320px; overflow-y:auto}
-#dropMenu li {float:none;}
+#dropMenu li {float:none; padding-left:12px}
 #dropMenu, #dropMenu li {text-align: left}
+#dropMenu li a:hover {font-weight: bold}
+#dropMenu li a.mine   {color:#1a59b6}
+#dropMenu li a.other, #dropMenu li a.closed, #dropMenu #more{color:gray; font-size:12px}
 
 #projectID {background:#e5e5e5; border:1px solid #e5e5e5}