From 2544b973ca6819cb0ab227d9a80542f2bffecdf9 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Wed, 20 Jun 2018 13:37:38 +0800
Subject: [PATCH]  * fix paste text lines in batch create form not work.

---
 module/bug/js/batchcreate.js                  |  5 +-
 module/bug/js/common.js                       | 13 ++---
 module/bug/view/batchcreate.html.php          | 26 +++++-----
 module/common/view/pastetext.html.php         | 26 +++++++---
 module/story/view/batchcreate.html.php        |  4 +-
 module/task/view/batchcreate.html.php         | 47 +++++++++--------
 module/testcase/control.php                   |  2 +-
 module/testcase/js/common.js                  |  2 +-
 module/testcase/view/batchcreate.html.php     | 50 +++++++++++--------
 module/testcase/view/exporttemplet.html.php   |  2 +-
 module/testsuite/js/common.js                 |  2 +-
 .../testsuite/view/batchcreatecase.html.php   | 42 +++++++++-------
 12 files changed, 127 insertions(+), 94 deletions(-)

diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js
index eb3c063969..91cfc514d4 100644
--- a/module/bug/js/batchcreate.js
+++ b/module/bug/js/batchcreate.js
@@ -1,8 +1,9 @@
 $(function()
 {
-    $(".chosenBox select").chosen(defaultChosenOptions);
     removeDitto();//Remove 'ditto' in first row.
-    if($('#batchCreateForm table thead tr th.c-title').width() < 150) $('#batchCreateForm table thead tr th.c-title').width(150);
+
+    var $titleCol = $('#batchCreateForm table thead tr th.c-title');
+    if($titleCol.width() < 150) $titleCol.width(150);
 })
 
 /**
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 0dfe01be23..9e565e87a2 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -1,13 +1,14 @@
 $(function()
 {
-    $('#subNavbar a[data-toggle=dropdown]').parent().addClass('dropdown dropdown-hover');
+    var page = window.page || '';
+    var flow = window.flow;
 
-    if(typeof page == 'undefined') page = '';
+    $('#subNavbar a[data-toggle=dropdown]').parent().addClass('dropdown dropdown-hover');
     if(page == 'create')
     {
-        productID  = $('#product').val();
-        moduleID   = $('#module').val();
-        assignedto = $('#assignedTo').val();
+        var productID  = $('#product').val();
+        var moduleID   = $('#module').val();
+        var assignedto = $('#assignedTo').val();
         changeProductConfirmed = true;
         oldStoryID             = $('#story').val() || 0;
         oldProjectID           = 0;
@@ -23,7 +24,7 @@ $(function()
         $("#story, #task, #mailto").chosen(defaultChosenOptions);
     }
 
-    if(flow != 'full')
+    if(window.flow != 'full')
     {
         $('.querybox-toggle').click(function()
         {
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 502f6b7b32..d908ec85fa 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -19,7 +19,7 @@
     </h2>
     <div class="pull-right btn-toolbar">
       <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=bug&params=' . helper::safe64Encode("productID=$productID&projectID=$projectID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-info' data-width='70%'")?>
-      <button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
+      <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=bug&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
     </div>
@@ -138,7 +138,7 @@
             <td>
               <div class='input-group'>
                 <div class="input-control has-icon-right">
-                  <?php echo html::input("title[$i]", '', "class='form-control' autocomplete='off'");?>
+                  <?php echo html::input("title[$i]", '', "class='form-control title-import' autocomplete='off'");?>
                   <div class="colorpicker">
                     <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
                     <ul class="dropdown-menu clearfix">
@@ -172,35 +172,35 @@
     </div>
   </form>
 </div>
-<table class='hide' id='trTemp'>
+<table class='template' id='trTemp'>
   <tbody>
     <tr>
       <td>%s</td>
-      <td class='<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[%s]", $branches, $branch, "class='form-control' onchange='setBranchRelated(this.value, $productID, \"%s\")'");?></td>
+      <td class='<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[%s]", $branches, $branch, "class='form-control chosen' onchange='setBranchRelated(this.value, $productID, \"%s\")'");?></td>
       <td><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
-      <td id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control' multiple");?></td>
+      <td class='<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
+      <td id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control chosen' multiple");?></td>
       <td>
         <div class='input-group'>
           <div class="input-control has-icon-right">
-            <?php echo html::input("title[%s]", '', "class='form-control' autocomplete='off'");?>
+            <?php echo html::input("title[%s]", '', "class='form-control title-import' autocomplete='off'");?>
             <div class="colorpicker">
               <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
               <ul class="dropdown-menu clearfix">
                 <li class="heading"><?php echo $lang->story->colorTag;?><i class="icon icon-close"></i></li>
               </ul>
-              <?php echo html::hidden("color[%s]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[%s\\]'");?>
+              <?php echo html::hidden("color[%s]", '', "data-provide='colorpicker-later' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[%s\\]'");?>
             </div>
           </div>
         </div>
       </td>
       <td class='<?php echo zget($visibleFields, 'deadline', 'hidden')?>'><?php echo html::input("deadlines[%s]", '', "class='form-control form-date'");?></td>
       <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'><?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?></td>
-      <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[%s]", $lang->bug->typeList, $type, "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[%s]", $lang->bug->osList, $os, "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[%s]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
+      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control chosen'");?></td>
+      <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control chosen'");?></td>
+      <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[%s]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
+      <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
       <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', "class='form-control' autocomplete='off'");?></td>
     </tr>
   </tbody>
diff --git a/module/common/view/pastetext.html.php b/module/common/view/pastetext.html.php
index 0e4858b285..ea70a2a9bc 100644
--- a/module/common/view/pastetext.html.php
+++ b/module/common/view/pastetext.html.php
@@ -17,15 +17,28 @@
 <script>
 $(function()
 {
-    $("button[data-toggle='importLinesModal']").click(function(){$('#importLinesModal').modal('show')})
-    $form = $('#batchCreateForm');
+    var $form = $('#batchCreateForm');
     var batchForm = $form.data('zui.batchActionForm');
+
+    var rowTpl, $formTbody;
+    var createRow = function()
+    {
+        if(!rowTpl) rowTpl = $('#trTemp tbody').html();
+        if(!$formTbody) $formTbody = $form.find('table > tbody');
+        var lastIndex = parseInt($formTbody.find('tr:last > td:first').text());
+        var $newRow = $(rowTpl.replace(/%s/g, lastIndex + 1));
+        $newRow.find('.chosen').chosen();
+        $newRow.find('[data-provide="colorpicker-later"]').colorPicker();
+        $formTbody.append($newRow);
+        return $newRow;
+    };
     
     var $importLines = $('#importLines');
     $('#importLinesBtn').on('click', function()
     {
         var $modal = $('#importLinesModal');
         var $dialog = $modal.find('.modal-dialog').addClass('loading');
+
         setTimeout(function()
         {
             var importText = $importLines.val();
@@ -37,15 +50,16 @@ $(function()
                 if (!line.length) return;
                 if (!$lastRow) $row = $form.find('tbody>tr:first');
                 else $row = $lastRow.next();
-                while ($row.length && $row.find('.input-story-title').val().length)
+                while ($row.length && $row.find('.title-import').val().length)
                 {
                     $row = $row.next();
                 }
                 if (!$row || !$row.length)
                 {
-                    $row = batchForm.createRow();
+                    if (batchForm) $row = batchForm.createRow();
+                    else $row = createRow();
                 }
-                $row.find('.input-story-title').val(line).addClass('highlight');
+                $row.find('.title-import').val(line).addClass('highlight');
                 $lastRow = $row;
                 if(!$firstRow) $firstRow = $row;
             });
@@ -57,7 +71,7 @@ $(function()
             }).modal('hide');
             setTimeout(function()
             {
-                $form.find('.input-story-title.highlight').removeClass('highlight');
+                $form.find('.title-import.highlight').removeClass('highlight');
             }, 3000);
         }, 200);
     });
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 44d5459000..82aa831bbc 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -16,7 +16,7 @@
     <h2><?php echo $lang->story->batchCreate;?></h2>
     <div class="pull-right btn-toolbar">
       <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-info' data-width='70%'")?>
-      <button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
+      <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
     </div>
@@ -67,7 +67,7 @@
             <td style='overflow:visible'>
               <div class="input-group">
                 <div class="input-control has-icon-right">
-                  <input type="text" name="title[$id]" id="title$id" value="" class="form-control input-story-title" autocomplete="off">
+                  <input type="text" name="title[$id]" id="title$id" value="" class="form-control title-import" autocomplete="off">
                   <div class="colorpicker">
                     <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
                     <ul class="dropdown-menu clearfix">
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index cbbae3c24d..556c5cce5b 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -28,7 +28,7 @@
     </a>
     <?php endif;?>
     <div class="pull-right btn-toolbar">
-      <button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
+      <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
     </div>
@@ -113,16 +113,14 @@
             </td>
             <?php endif;?>
             <td style='overflow:visible'>
-              <div class='input-group'>
-                <div class="input-control has-icon-right">
-                  <?php echo html::input("name[$i]", '', "class='form-control input-story-title' autocomplete='off'");?>
-                  <div class="colorpicker">
-                    <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
-                    <ul class="dropdown-menu clearfix pull-right">
-                      <li class="heading"><?php echo $lang->story->colorTag;?><i class="icon icon-close"></i></li>
-                    </ul>
-                    <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#name\\[$i\\]'");?>
-                  </div>
+              <div class="input-control has-icon-right">
+                <?php echo html::input("name[$i]", '', "class='form-control title-import' autocomplete='off'");?>
+                <div class="colorpicker">
+                  <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+                  <ul class="dropdown-menu clearfix pull-right">
+                    <li class="heading"><?php echo $lang->task->colorTag;?><i class="icon icon-close"></i></li>
+                  </ul>
+                  <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#name\\[$i\\]'");?>
                 </div>
               </div>
             </td>
@@ -135,41 +133,50 @@
             <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pri[$i]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
           </tr>
           <?php endfor;?>
+        </tbody>
+        <tfoot>
           <tr>
             <td colspan='<?php echo $colspan?>' class='text-center form-actions'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
-        </tbody>
+        </tfoot>
       </table>
     </div>
   </form>
 </div>
-<table class='hide' id='trTemp'>
+<table class='template' id='trTemp'>
   <tbody>
     <tr>
       <td class='text-center'>%s</td>
       <td <?php echo zget($visibleFields, 'module', "class='hidden'")?> style='overflow:visible'>
-        <?php echo html::select("module[%s]", $modules, $module, "class='form-control' onchange='setStories(this.value, $project->id, \"%s\")'")?>
+        <?php echo html::select("module[%s]", $modules, $module, "class='form-control chosen' onchange='setStories(this.value, $project->id, \"%s\")'")?>
         <?php echo html::hidden("parent[%s]", $parent);?>
       </td>
       <td <?php echo zget($visibleFields, 'story', "class='hidden'"); echo $hiddenStory;?> style='overflow: visible'>
         <div class='input-group'>
-          <?php echo html::select("story[%s]", $stories, $currentStory, "class='form-control' onchange='setStoryRelated(\"%s\")'");?>
+          <?php echo html::select("story[%s]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated(\"%s\")'");?>
           <span class='input-group-btn'>
             <a href='javascript:copyStoryTitle("%s")' class='btn btn-link btn-icon btn-copy' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-arrow-right'></i></a>
           </span>
         </div>
       </td>
       <td style='overflow:visible'>
-        <div class='input-group'>
-        <?php echo html::hidden("color[%s]", '', "data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->task->colorTag}' data-update-text='#name\\[%s\\]'");?>
-        <?php echo html::input("name[%s]", '', "class='form-control' autocomplete='off'");?>
+        <div class="input-control has-icon-right">
+          <?php echo html::input("name[%s]", '', "class='form-control title-import' autocomplete='off'");?>
+          <div class="colorpicker">
+            <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+            <ul class="dropdown-menu clearfix pull-right">
+              <li class="heading"><?php echo $lang->task->colorTag;?><i class="icon icon-close"></i></li>
+            </ul>
+            <?php echo html::hidden("color[%s]", '', "data-provide='colorpicker-later' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#name\\[%s\\]'");?>
+          </div>
+        </div>
         </div>
       </td>
-      <td><?php echo html::select("type[%s]", $lang->task->typeList, $type, 'class=form-control');?></td>
-      <td <?php echo zget($visibleFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[%s]", $members, $member, "class='form-control'");?></td>
+      <td><?php echo html::select("type[%s]", $lang->task->typeList, $type, 'class="form-control"');?></td>
+      <td <?php echo zget($visibleFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[%s]", $members, $member, "class='form-control chosen'");?></td>
       <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[%s]", '', "class='form-control text-center' autocomplete='off'");?></td>
       <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarted[%s]", '', "class='form-control text-center form-date'");?></td>
       <td <?php echo zget($visibleFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadline[%s]", '', "class='form-control text-center form-date'");?></td>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index ee0278b52c..b31543de52 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1286,7 +1286,7 @@ class testcase extends control
                 {
                     $row = new stdclass();
                     $row->module     = $module . "(#$moduleID)";
-                    $row->stepDesc   = "1. \n2. \n3.";
+                    $row->stepDesc   = "1. \n2. \n3. num:" . $num;
                     $row->stepExpect = "1. \n2. \n3.";
 
                     if(empty($rows))
diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js
index 6d48ac81f4..a924dcda0e 100644
--- a/module/testcase/js/common.js
+++ b/module/testcase/js/common.js
@@ -2,7 +2,7 @@ $(function()
 {
     $('#subNavbar a[data-toggle=dropdown]').parent().addClass('dropdown dropdown-hover');
 
-    if(flow != 'full')
+    if(window.flow != 'full')
     {
         $('.querybox-toggle').click(function()
         {
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index 1f99d0c3b4..3de4d6bab2 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -24,7 +24,7 @@
       <?php endif;?>
     </h2>
     <div class="pull-right btn-toolbar">
-      <button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
+      <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
     </div>
@@ -82,16 +82,14 @@
             <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>' style='overflow:visible'> <?php echo html::select("story[$i]", $storyList, $story ? $story->id : '', 'class="form-control chosen"');?></td>
             <td style='overflow:visible'>
-              <div class='input-group'>
-                <div class="input-control has-icon-right">
-                  <?php echo html::input("title[$i]", '', "class='form-control' autocomplete='off'");?>
-                  <div class="colorpicker">
-                    <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
-                    <ul class="dropdown-menu clearfix">
-                      <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
-                    </ul>
-                    <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[$i\\]'");?>
-                  </div>
+              <div class="input-control has-icon-right">
+                <?php echo html::input("title[$i]", '', "class='form-control title-import' autocomplete='off'");?>
+                <div class="colorpicker">
+                  <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+                  <ul class="dropdown-menu clearfix">
+                    <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
+                  </ul>
+                  <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[$i\\]'");?>
                 </div>
               </div>
             </td>
@@ -100,38 +98,46 @@
             <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$i]", '', "rows='1' class='form-control autosize'")?></td>
             <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[$i][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
-            <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->testcase->reviewList, $needReview, "class='form-control chosen'");?></td>
+            <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->testcase->reviewList, $needReview, "class='form-control'");?></td>
           </tr>
           <?php endfor;?>
+        </tbody>
+        <tfoot>
           <tr>
             <td colspan='<?php echo $colspan?>' class='text-center form-actions'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
-        </tbody>
+        </tfoot>
       </table>
     </div>
   </form>
 </div>
-<table class='hide' id='trTemp'>
+<table class='template' id='trTemp'>
   <tbody>
     <tr>
       <td class="text-center">%s</td>
-      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[%s]", $branches, $branch, "class='form-control' onchange='setModules(this.value, $productID, \"%s\")'");?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $currentModuleID, "class='form-control'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[%s]", $branches, $branch, "class='form-control chosen' onchange='setModules(this.value, $productID, \"%s\")'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>' style='overflow:visible'> <?php echo html::select("story[%s]", '', '', 'class="form-control"');?></td>
       <td style='overflow:visible'>
-        <div class='input-group'>
-        <?php echo html::hidden("color[%s]", '', "data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->testcase->colorTag}' data-update-text='#title\\[%s\\]'");?>
-        <?php echo html::input("title[%s]", '', "class='form-control' autocomplete='off'");?></td>
+        <div class="input-control has-icon-right">
+          <?php echo html::input("title[%s]", '', "class='form-control title-import' autocomplete='off'");?>
+          <div class="colorpicker">
+            <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+            <ul class="dropdown-menu clearfix">
+              <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
+            </ul>
+            <?php echo html::hidden("color[%s]", '', "data-provide='colorpicker-later' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[%s\\]'");?>
+          </div>
         </div>
       </td>
-      <td><?php echo html::select("type[%s]", $lang->testcase->typeList, $type, "class=form-control");?></td>
-      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>         <?php echo html::select("pri[%s]", $lang->testcase->priList, $pri, "class=form-control");?></td>
+      <td><?php echo html::select("type[%s]", $lang->testcase->typeList, $type, "class=form-control chosen");?></td>
+      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>         <?php echo html::select("pri[%s]", $lang->testcase->priList, $pri, "class=form-control chosen");?></td>
       <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[%s]", '', "rows='1' class='form-control'")?></td>
       <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[%s]", '', "class='form-control' autocomplete='off'");?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[%s][]", $lang->testcase->stageList, '', "class='form-control' multiple");?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[%s][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
       <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[%s]", $lang->testcase->reviewList, $needReview, "class='form-control'");?></td>
     </tr>
   </tbody>
diff --git a/module/testcase/view/exporttemplet.html.php b/module/testcase/view/exporttemplet.html.php
index c7625af41b..6928d72afb 100644
--- a/module/testcase/view/exporttemplet.html.php
+++ b/module/testcase/view/exporttemplet.html.php
@@ -19,7 +19,7 @@ function closeWindow()
     }
 }
 </script>
-<div class='main-content'>
+<div id='mainContent' class='main-content'>
   <div class='main-header'>
     <h2><?php echo $lang->testcase->exportTemplet;?></h2>
   </div>
diff --git a/module/testsuite/js/common.js b/module/testsuite/js/common.js
index d8ba4e43b7..0c109aebfb 100644
--- a/module/testsuite/js/common.js
+++ b/module/testsuite/js/common.js
@@ -1,6 +1,6 @@
 $(function()
 {
-    if(flow != 'full')
+    if(window.flow != 'full')
     {
         $('.querybox-toggle').click(function()
         {
diff --git a/module/testsuite/view/batchcreatecase.html.php b/module/testsuite/view/batchcreatecase.html.php
index dc2d61752c..06f7045cfe 100644
--- a/module/testsuite/view/batchcreatecase.html.php
+++ b/module/testsuite/view/batchcreatecase.html.php
@@ -17,7 +17,7 @@
   <div class="main-header">
     <h2><?php echo $lang->testcase->batchCreate;?></h2>
     <div class="pull-right btn-toolbar">
-      <?php echo html::commonButton($lang->pasteText, "data-toggle='importLinesModal' ", 'btn btn-info')?>
+      <?php echo html::commonButton($lang->pasteText, "data-toggle='modal' data-target='#importLinesModal' ", 'btn btn-info')?>
     </div>
   </div>
   <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
@@ -48,16 +48,14 @@
         <td><?php echo $i+1;?></td>
         <td class='text-left' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
         <td style='overflow:visible'>
-          <div class='input-group'>
-            <div class="input-control has-icon-right">
-              <?php echo html::input("title[$i]", '', "class='form-control' autocomplete='off'");?>
-              <div class="colorpicker">
-                <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
-                <ul class="dropdown-menu clearfix">
-                  <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
-                </ul>
-                <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[$i\\]'");?>
-              </div>
+          <div class="input-control has-icon-right">
+            <?php echo html::input("title[$i]", '', "class='form-control title-import' autocomplete='off'");?>
+            <div class="colorpicker">
+              <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+              <ul class="dropdown-menu clearfix">
+                <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
+              </ul>
+              <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[$i\\]'");?>
             </div>
           </div>
         </td>
@@ -75,22 +73,28 @@
     </table>
   </form>
 </div>
-<table class='hide' id='trTemp'>
+<table class='template' id='trTemp'>
   <tbody>
     <tr class='text-center'>
       <td>%s</td>
-      <td class='text-left' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $currentModuleID, "class='form-control'");?></td>
+      <td class='text-left' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
       <td style='overflow:visible'>
-        <div class='input-group'>
-        <?php echo html::hidden("color[%s]", '', "data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->testcase->colorTag}' data-update-text='#title\\[%s\\]'");?>
-        <?php echo html::input("title[%s]", '', "class='form-control' autocomplete='off'");?></td>
+        <div class="input-control has-icon-right">
+          <?php echo html::input("title[%s]", '', "class='form-control title-import' autocomplete='off'");?>
+          <div class="colorpicker">
+            <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+            <ul class="dropdown-menu clearfix">
+              <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
+            </ul>
+            <?php echo html::hidden("color[%s]", '', "data-provide='colorpicker-later' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[%s\\]'");?>
+          </div>
         </div>
       </td>
-      <td><?php echo html::select("type[%s]", $lang->testcase->typeList, $type, "class=form-control");?></td>
-      <td><?php echo html::select("pri[%s]", $lang->testcase->priList, $pri, "class=form-control");?></td>
+      <td><?php echo html::select("type[%s]", $lang->testcase->typeList, $type, "class='form-control chosen'");?></td>
+      <td><?php echo html::select("pri[%s]", $lang->testcase->priList, $pri, "class=form-control chosen");?></td>
       <td><?php echo html::textarea("precondition[%s]", '', "class='form-control'")?></td>
       <td><?php echo html::input("keywords[%s]", '', "class='form-control' autocomplete='off'");?></td>
-      <td class='text-left' style='overflow:visible'><?php echo html::select("stage[%s][]", $lang->testcase->stageList, '', "class='form-control' multiple");?></td>
+      <td class='text-left' style='overflow:visible'><?php echo html::select("stage[%s][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
     </tr>
   </tbody>
 </table>