From 3c8a5cc6fd73fd19019aeb7f0804c918464c6e7d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 29 Jan 2015 16:03:32 +0800
Subject: [PATCH]  * finish task #2202.

---
 module/bug/css/create.css             | 2 ++
 module/common/view/chosen.html.php    | 2 +-
 module/story/css/batchcreate.css      | 1 +
 module/story/css/batchedit.css        | 1 +
 module/story/css/create.css           | 1 +
 module/task/css/batchcreate.css       | 3 +++
 module/task/css/batchedit.css         | 1 +
 module/task/js/batchcreate.js         | 9 +--------
 module/task/view/batchcreate.html.php | 7 +++----
 module/testcase/css/batchcreate.css   | 2 ++
 module/testcase/css/batchedit.css     | 1 +
 module/testcase/css/create.css        | 1 +
 module/user/css/batchcreate.css       | 1 +
 module/user/css/batchedit.css         | 1 +
 14 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 module/user/css/batchcreate.css
 create mode 100644 module/user/css/batchedit.css

diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index f1ea6d96d3..3175a7db60 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -13,3 +13,5 @@
 #tplBox li {position: relative;}
 #tplBox li .btn-delete {position: absolute; right: 0; top: 0; display: block; width: 40px; text-align:center;}
 #tplBox li .tpl-name {padding-right: 40px;}
+
+#module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
diff --git a/module/common/view/chosen.html.php b/module/common/view/chosen.html.php
index 7043ac27d8..a1c26d0c61 100755
--- a/module/common/view/chosen.html.php
+++ b/module/common/view/chosen.html.php
@@ -9,7 +9,7 @@ if($config->debug)
 <script> 
 noResultsMatch       = '<?php echo $lang->noResultsMatch;?>';
 chooseUsersToMail    = '<?php echo $lang->chooseUsersToMail;?>';
-defaultChosenOptions = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 1, width: '100%', placeholder_text_single: ' ', placeholder_text_multiple: ' ', search_contains: true};
+defaultChosenOptions = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 1, placeholder_text_single: ' ', placeholder_text_multiple: ' ', search_contains: true};
 $(document).ready(function()
 {
     $("#mailto").attr('data-placeholder', chooseUsersToMail);
diff --git a/module/story/css/batchcreate.css b/module/story/css/batchcreate.css
index e69de29bb2..93ad909786 100644
--- a/module/story/css/batchcreate.css
+++ b/module/story/css/batchcreate.css
@@ -0,0 +1 @@
+.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
diff --git a/module/story/css/batchedit.css b/module/story/css/batchedit.css
index f4aace4f45..8bcaf7accf 100644
--- a/module/story/css/batchedit.css
+++ b/module/story/css/batchedit.css
@@ -1 +1,2 @@
 #suhosinInfo {margin-bottom: 0;}
+.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
diff --git a/module/story/css/create.css b/module/story/css/create.css
index 9692b612a0..935c7a68ab 100644
--- a/module/story/css/create.css
+++ b/module/story/css/create.css
@@ -1,2 +1,3 @@
 #mailto {width:90.3%}
 select {border:1px solid #ccc}
+#module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css
index 06987c1328..5a3f69b9d9 100644
--- a/module/task/css/batchcreate.css
+++ b/module/task/css/batchcreate.css
@@ -4,3 +4,6 @@
 .outer .chosen-container-single + .input-group-btn > .btn {border-left: 0}
 .outer .input-group {display: block; padding-right: 29px; max-width: 100%;}
 .outer .input-group-btn {display: block; position: absolute; right: 0; width: 29px; top: 0}
+.chosen-container[id^="story"] {width: 200px;}
+.chosen-container[id^="story"] .chosen-drop {min-width: 450px;!important}
+.chosen-container[id^="module"] .chosen-drop {min-width: 400px;!important}
diff --git a/module/task/css/batchedit.css b/module/task/css/batchedit.css
index e69de29bb2..9ef9eaa117 100644
--- a/module/task/css/batchedit.css
+++ b/module/task/css/batchedit.css
@@ -0,0 +1 @@
+.chosen-container[id^="module"] .chosen-drop {min-width: 400px;!important}
diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js
index 5ac9a589b9..776f965f4f 100755
--- a/module/task/js/batchcreate.js
+++ b/module/task/js/batchcreate.js
@@ -1,9 +1,3 @@
-var storyChosenOptions = $.extend({}, defaultChosenOptions, {drop_width: 400, width: '200px'});
-
-$(function() {
-    for(i = 0; i < batchCreateNum; i++) $("#story" + i).chosen(storyChosenOptions);
-});
-
 /* Get select of stories.*/
 function setStories(moduleID, projectID, num)
 {
@@ -15,8 +9,7 @@ function setStories(moduleID, projectID, num)
         $('#story' + num).replaceWith(stories);
         if(moduleID == 0) $('#story' + num).append("<option value='ditto'>" + ditto + "</option>")
         $('#story' + num).val(storyID);
-        $('#story' + num + '_chosen').remove();
-        $("#story" + num).chosen(storyChosenOptions);
+        $("#story" + num).chosen(defaultChosenOptions);
     });
 }
 
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 58dba0e996..d8bc7a5b1b 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -1,17 +1,16 @@
 <?php
 /**
- * The batch create view of story module of ZenTaoPMS.
+ * The batch create view of task module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv11.html)
  * @author      Yangyang Shi <shiyangyang@cnezsoft.com>
- * @package     story
+ * @package     task
  * @version     $Id$
  * @link        http://www.zentao.net
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php js::set('batchCreateNum', $config->task->batchCreate);?>
 <div id='titlebar'>
   <div class='heading'>
     <span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
@@ -61,7 +60,7 @@
       <td style='overflow:visible'><?php echo html::select("module[$i]", $modules, $module, "class='form-control chosen' onchange='setStories(this.value, $project->id, $i)'")?></td>
       <td style='overflow: visible'>
         <div class='input-group'>
-        <?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control' onchange='setStoryRelated($i)'");?>
+        <?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated($i)'");?>
         <span class='input-group-btn'>
         <a href='javascript:copyStoryTitle(<?php echo $i;?>)' class='btn' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-angle-right'></i></a>
         </span>
diff --git a/module/testcase/css/batchcreate.css b/module/testcase/css/batchcreate.css
index d834da99d9..32d56f3f82 100644
--- a/module/testcase/css/batchcreate.css
+++ b/module/testcase/css/batchcreate.css
@@ -2,3 +2,5 @@
 .w-180px{width:180px}
 .half-left {text-align:right}
 .half-right{text-align:left}
+.chosen-container[id^="module"] .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
+.chosen-container[id^="story"] .chosen-drop {min-width: 450px; border-top: 1px solid #ddd!important}
diff --git a/module/testcase/css/batchedit.css b/module/testcase/css/batchedit.css
index b78baac20e..df6b376c7a 100755
--- a/module/testcase/css/batchedit.css
+++ b/module/testcase/css/batchedit.css
@@ -1,2 +1,3 @@
 .w-340px {width:340px}
 .chosen  {z-index:99}
+.chosen-container[id^="module"] .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
diff --git a/module/testcase/css/create.css b/module/testcase/css/create.css
index 661d26ce26..5845b45cc4 100644
--- a/module/testcase/css/create.css
+++ b/module/testcase/css/create.css
@@ -14,3 +14,4 @@
 #story_chosen .chosen-results > li.no-results {cursor: pointer;}
 #story_chosen .chosen-results > li.no-results:hover {color: #1a4f85; background-color: #ddd;}
 #story_chosen .chosen-results > li.no-results > span {font-weight: bold;}
+#module_chosen .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
diff --git a/module/user/css/batchcreate.css b/module/user/css/batchcreate.css
new file mode 100644
index 0000000000..655a1401aa
--- /dev/null
+++ b/module/user/css/batchcreate.css
@@ -0,0 +1 @@
+.chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important}
diff --git a/module/user/css/batchedit.css b/module/user/css/batchedit.css
new file mode 100644
index 0000000000..655a1401aa
--- /dev/null
+++ b/module/user/css/batchedit.css
@@ -0,0 +1 @@
+.chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important}