From 7a942a3686197f9d52d49708a7cb234c53bb1476 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Sat, 1 Sep 2012 07:46:30 +0000
Subject: [PATCH]  * code for task#892.

---
 module/todo/lang/en.php               |  2 --
 module/todo/lang/zh-cn.php            |  2 --
 module/todo/view/batchcreate.html.php | 14 +++++++-------
 module/todo/view/footer.html.php      | 17 ++++++++++-------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 58649732ba..d3ae3159a3 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -42,8 +42,6 @@ $lang->todo->desc        = 'Desc';
 $lang->todo->private     = 'Private';
 $lang->todo->idvalue     = 'Task or bug';
 
-$lang->todo->notes = '(Notes: the name must be written, otherwise it is no use)';
-
 $lang->todo->week         = '(l)';  // date function's param.
 $lang->todo->today        = 'Today';
 $lang->todo->weekDateList = '';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 984ce6382b..4957b27040 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -42,8 +42,6 @@ $lang->todo->desc        = '描述';
 $lang->todo->private     = '私人事务';
 $lang->todo->idvalue     = '任务或Bug';
 
-$lang->todo->notes = '(注：“名称”必需填写，否则此行无效)';
-
 $lang->todo->week         = '星期';
 $lang->todo->today        = '今天';
 $lang->todo->weekDateList = '一,二,三,四,五,六,天';
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 756be7b45a..dbf60e3234 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -36,15 +36,15 @@
         <div class='<?php echo "nameBox" . ($i+1);?>'><?php echo html::input("names[$i]", '', 'class="f-left text-1"'); echo "<span class='star'>*</span>";?></div>
       </td>
       <td><?php echo html::textarea("descs[$i]", '', "rows='1' class=text-1");?></td>
-      <td><?php echo html::select("begins[$i]", $times, $time, "onchange=setBeginsAndEnds($i)") . html::select("ends[$i]", $times, '');?><td>
+      <td>
+        <?php 
+        echo html::select("begins[$i]", $times, $time, "onchange=setBeginsAndEnds($i,'begin')");
+        echo html::select("ends[$i]",   $times, '', "onchange=setBeginsAndEnds($i,'end')");
+        ?>
+      <td>
     </tr>  
     <?php endfor;?>
-    <tr>
-      <td colspan='6'>
-        <div class='half-left red'><?php echo $lang->todo->notes;?></div>
-        <div class='half-right'><?php echo html::submitButton() . html::resetButton();?></div>
-      </td>
-    </tr>
+    <tr><td colspan='6' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td></tr>
   </table>
 </form>
 <?php include './footer.html.php';?>
diff --git a/module/todo/view/footer.html.php b/module/todo/view/footer.html.php
index f521746729..2c37a9055f 100644
--- a/module/todo/view/footer.html.php
+++ b/module/todo/view/footer.html.php
@@ -52,23 +52,26 @@ function selectNext()
     $("#end ").get(0).selectedIndex = $("#begin ").get(0).selectedIndex + 3;
 }
 
-function setBeginsAndEnds(i)
+function setBeginsAndEnds(i, beginOrEnd)
 {
     if(typeof i == 'undefined')
     {
         for(j = 0; j < batchCreateNum; j++)
         {
-            endIndex = $("#begins" + j).get(0).selectedIndex + 3;
-            $("#ends" + j).get(0).selectedIndex = endIndex;
+            if(j != 0) $("#begins" + j).get(0).selectedIndex = $("#ends" + (j - 1)).get(0).selectedIndex;
+            $("#ends" + j).get(0).selectedIndex = $("#begins" + j).get(0).selectedIndex + 3;
         }
     }
     else
     {
-        begin = $("#begins" + i).val();
-        for(j = i; j < batchCreateNum; j++)
+        if(beginOrEnd == 'begin')
         {
-            $("#begins" + j).val(begin);
-            $("#ends" + j).get(0).selectedIndex = $("#begins" + i).get(0).selectedIndex + 3;
+            $("#ends" + i).get(0).selectedIndex = $("#begins" + i).get(0).selectedIndex + 3;
+        }
+        for(j = i+1; j < batchCreateNum; j++)
+        {
+            $("#begins" + j).get(0).selectedIndex = $("#ends" + (j - 1)).get(0).selectedIndex;
+            $("#ends" + j).get(0).selectedIndex = $("#begins" + j).get(0).selectedIndex + 3;
         }
     }
 }