From de40baa42788656eb7f95321eb3be4af7b2e6896 Mon Sep 17 00:00:00 2001
From: xia0ta0 <xia0ta0@outlook.com>
Date: Fri, 7 Mar 2014 11:06:42 +0800
Subject: [PATCH]  * code for task#1844.

---
 module/bug/view/browse.html.php         |  8 ++++----
 module/common/model.php                 |  2 +-
 module/common/view/footer.lite.html.php |  1 -
 module/common/view/header.lite.html.php |  4 ++--
 module/my/view/blocktasks.html.php      |  2 +-
 module/my/view/index.html.php           |  3 +--
 module/my/view/task.html.php            |  4 ++--
 module/product/view/browse.html.php     |  4 ++--
 module/project/view/bug.html.php        |  2 +-
 module/project/view/task.html.php       | 14 +++++++-------
 module/project/view/taskheader.html.php |  4 ++--
 module/testcase/view/browse.html.php    |  6 +++---
 module/tree/model.php                   |  5 ++---
 module/tree/view/browse.html.php        |  4 ++--
 14 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 2c63b8741c..13660406e6 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -40,7 +40,7 @@ js::set('customed', $customed);
     <?php
 
     echo '<span class="link-button dropButton">';
-    echo html::a("#", "<i class='icon-upload-alt'></i> " . $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'");
+    echo html::a("#", "<i class='icon-upload-alt'></i> " . $lang->export, '', "id='exportAction' onclick=\"toggleSubMenu(this.id,'bottom',0)\" title='{$lang->export}'");
     echo '</span>';
 
     common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID");
@@ -189,7 +189,7 @@ if($customed)
                   echo "</div>";
 
                   $actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID");
-                  $misc       = common::hasPriv('bug', 'batchEdit') ? "onclick=setFormAction('$actionLink')" : "disabled='disabled'";
+                  $misc       = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
                   echo "<div class='groupButton dropButton'>";
                   echo html::commonButton($lang->edit, $misc);
                   echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
@@ -213,7 +213,7 @@ if($customed)
   $class = "class='disabled'";
 
   $actionLink = $this->createLink('bug', 'batchConfirm');
-  $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=setFormAction('$actionLink','hiddenwin')" : "class='disabled'";
+  $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
   echo "<li>" . html::a('#', $lang->bug->confirmBug, '', $misc) . "</li>";
 
   $misc = common::hasPriv('bug', 'batchResolve') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='resolveItem'" : $class;
@@ -233,7 +233,7 @@ if($customed)
       echo "<li>";
       if($key == 'fixed')
       {
-          echo html::a('#', $resolution, '', "onmouseover=toggleSubMenu(this.id,'right',2) id='fixedItem'");
+          echo html::a('#', $resolution, '', "onmouseover=\"toggleSubMenu(this.id,'right',2)\" id='fixedItem'");
       }
       else
       {
diff --git a/module/common/model.php b/module/common/model.php
index ea01c9da0d..cce8418f21 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -386,7 +386,7 @@ class commonModel extends model
 
         echo "<li id='searchbox'>"; 
         echo html::select('searchType', $lang->searchObjects, $searchObject);
-        echo html::input('searchQuery', $lang->searchTips, "onclick=this.value='' onkeydown='if(event.keyCode==13) shortcut()' class='w-80px'");
+        echo html::input('searchQuery', $lang->searchTips, "onclick='this.value=\"\"' onkeydown='if(event.keyCode==13) shortcut()' class='w-80px'");
 		echo "<a href='javascript:shortcut();return false;' id='objectSwitcher' class='icon-circle-arrow-right'></a>";
         echo "</li>";
         echo "</ul>\n";
diff --git a/module/common/view/footer.lite.html.php b/module/common/view/footer.lite.html.php
index 8008f62818..79d5ce3c98 100755
--- a/module/common/view/footer.lite.html.php
+++ b/module/common/view/footer.lite.html.php
@@ -1,4 +1,3 @@
-</div>
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
 <iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='<?php $config->debug ? print("debugwin") : print('hidden')?>'></iframe>
 <script laguage='Javascript'>
diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php
index 8d114918d5..b7acfab8e9 100755
--- a/module/common/view/header.lite.html.php
+++ b/module/common/view/header.lite.html.php
@@ -7,8 +7,8 @@ $defaultTheme = $webRoot . 'theme/default/';
 $langTheme    = $themeRoot . 'lang/' . $app->getClientLang() . '.css';
 $clientTheme  = $this->app->getClientTheme();
 ?>
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dli'>
-<html xmlns='http://www.w3.org/1999/xhtml'>
+<!DOCTYPE html>
+<html>
 <head>
   <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
   <meta http-equiv='X-UA-Compatible' content='IE=edge'>
diff --git a/module/my/view/blocktasks.html.php b/module/my/view/blocktasks.html.php
index a48224faae..882bdd0e72 100644
--- a/module/my/view/blocktasks.html.php
+++ b/module/my/view/blocktasks.html.php
@@ -7,7 +7,7 @@
   <?php 
   foreach($tasks as $task)
   {
-      echo "<tr><td class='nobr'>" . "#$task->id " . html::a($this->createLink('task', 'view', "id=$task->id"), $task->name, '', "title=$task->name") . "</td><td width='5'</td></tr>";
+      echo "<tr><td class='nobr'>" . "#$task->id " . html::a($this->createLink('task', 'view', "id=$task->id"), $task->name, '', "title=$task->name") . "</td><td width='5'></td></tr>";
   }
   ?>
 </table>
diff --git a/module/my/view/index.html.php b/module/my/view/index.html.php
index b3dabfd713..2c71b834c2 100644
--- a/module/my/view/index.html.php
+++ b/module/my/view/index.html.php
@@ -38,6 +38,5 @@
       <?php endif;?>
     </tr>
   </table>
-  <?php include '../../common/view/footer.html.php';?>  
 </div>
-
+<?php include '../../common/view/footer.html.php';?>  
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index c208ab29da..4eab60d20e 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -52,12 +52,12 @@
         <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>
       </td>
       <td><span class='<?php echo 'pri' . $lang->task->priList[$task->pri];?>'><?php echo isset($lang->task->priList[$task->pri]) ? $lang->task->priList[$task->pri] : $task->pri;?></span></td>
-      <td class='nobr a-left'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></th>
+      <td class='nobr a-left'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
       <td class='a-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
       <td><?php echo $task->estimate;?></td>
       <td><?php echo $task->consumed;?></td>
       <td><?php echo $task->left;?></td>
-      <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
+      <td class='<?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
       <td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
       <td><?php echo $users[$task->openedBy];?></td>
       <td class='a-right'>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 3b665e9514..25f032c957 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -31,7 +31,7 @@
   <div class='f-right'>
     <?php 
     echo '<span class="link-button dropButton">';
-    echo html::a("#", "<i class='icon-upload-alt'></i> " . $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'");
+    echo html::a("#", "<i class='icon-upload-alt'></i> " . $lang->export, '', "id='exportAction' onclick='toggleSubMenu(this.id,\"bottom\",0)' title='{$lang->export}'");
     echo '</span>';
 
     common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID");
@@ -154,7 +154,7 @@
 
           $canBatchClose = common::hasPriv('story', 'batchClose') && strtolower($browseType) != 'closedbyme' && strtolower($browseType) != 'closedstory';
           $actionLink    = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0");
-          $misc = $canBatchClose ? "onclick=setFormAction('$actionLink')" : $class;
+          $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink')\"" : $class;
           echo "<li>" . html::a('#', $lang->close, '', $misc) . "</li>";
 
           $misc = common::hasPriv('story', 'batchReview') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='reviewItem'" : $class;
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 7113ddbe82..bd373e6629 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -61,7 +61,7 @@
   </tr>
   <?php endforeach;?>
   </tbody>
-  <tfoot><tr><td colspan='9'><?php $pager->show();?></td></tr></table>
+  <tfoot><tr><td colspan='9'><?php $pager->show();?></td></tr></tfoot>
 </table>
 <?php js::set('replaceID', 'bugList')?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 5bb5ee66de..85b212774d 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -82,23 +82,23 @@ var browseType  = '<?php echo $browseType;?>';
             if($task->fromBug) echo html::a($this->createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'");
             ?>
           </td>
-          <td class=<?php echo $task->status;?> >
+          <td class="<?php echo $task->status;?>">
             <?php
             $storyChanged = ($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion);
             $storyChanged ? print("<span class='warning'>{$lang->story->changed}</span> ") : print($lang->task->statusList[$task->status]);
             ?>
           </td>
-          <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
+          <td class="<?php if(isset($task->delay)) echo 'delayed';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
 
           <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
-          <td><?php echo substr($task->openedDate, 5, 6);?></th>
+          <td><?php echo substr($task->openedDate, 5, 6);?></td>
           <?php endif;?>
 
           <td <?php echo $class;?>><?php echo $task->assignedTo == 'closed' ? 'Closed' : $task->assignedToRealName;?></td>
           <td><?php echo $users[$task->finishedBy];?></td>
 
           <?php if($this->cookie->windowWidth > $this->config->wideSize):?>
-          <td><?php echo substr($task->finishedDate, 5, 6);?></th>
+          <td><?php echo substr($task->finishedDate, 5, 6);?></td>
           <?php endif;?>
 
           <td><?php echo $task->estimate;?></td>
@@ -107,7 +107,7 @@ var browseType  = '<?php echo $browseType;?>';
           <?php
           if($project->type == 'sprint')
           {
-              echo '<td class="a-left" title="' . $task->storyTitle . '"';
+              echo '<td class="a-left" title="' . $task->storyTitle . '">';
               if($task->storyID)
               {
                 if(!common::printLink('story', 'view', "storyid=$task->storyID", $task->storyTitle)) print $task->storyTitle;
@@ -149,7 +149,7 @@ var browseType  = '<?php echo $browseType;?>';
                   echo "</div>";
 
                   $actionLink = $this->createLink('task', 'batchEdit', "projectID=$projectID");
-                  $misc       = $canBatchEdit ? "onclick=setFormAction('$actionLink')" : "disabled='disabled'";
+                  $misc       = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
                   echo "<div class='groupButton dropButton'>";
                   echo html::commonButton($lang->edit, $misc);
                   echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
@@ -172,7 +172,7 @@ var browseType  = '<?php echo $browseType;?>';
   <ul>
   <?php 
   $actionLink = $this->createLink('task', 'batchClose');
-  $misc = $canBatchClose ? "onclick=setFormAction('$actionLink','hiddenwin')" : "class='disabled'";
+  $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
   echo "<li>" . html::a('#', $lang->close, '', $misc) . "</li>";
   ?>
   </ul>
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index ab72894205..0578cb44b3 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -24,11 +24,11 @@
     common::printIcon('task', 'report', "project=$projectID&browseType=$browseType");
 
     echo '<span class="link-button dropButton">';
-    echo html::a("#", "<i class='icon-upload-alt'></i> " . $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'");
+    echo html::a("#", "<i class='icon-upload-alt'></i> " . $lang->export, '', "id='exportAction' onclick=\"toggleSubMenu(this.id,'bottom',0)\" title='{$lang->export}'");
     echo '</span>';
 
     echo '<span class="link-button dropButton">';
-    echo html::a("#", "<i class='icon-download-alt'></i> " . $lang->import, '', "id='importAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->import}'");
+    echo html::a("#", "<i class='icon-download-alt'></i> " . $lang->import, '', "id='importAction' onclick=\"toggleSubMenu(this.id,'bottom',0)\" title='{$lang->import}'");
     echo '</span>';
 
     common::printIcon('task', 'batchCreate', "projectID=$projectID");
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index eb0c96b8d0..37121d20f2 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -34,7 +34,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
     common::printIcon('testcase', 'import', "productID=$productID", '', 'button', '', '', 'export cboxElement');
 
     echo '<span class="link-button dropButton">'; 
-    echo html::a("#", "<i class='icon-green-common-export'></i>" . $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'");
+    echo html::a("#", "<i class='icon-green-common-export'></i>" . $lang->export, '', "id='exportAction' onclick=\"toggleSubMenu(this.id,'bottom',0)\" title='{$lang->export}'");
     echo '</span>';
 
     common::printIcon('testcase', 'batchCreate', "productID=$productID&moduleID=$moduleID");
@@ -142,7 +142,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
              echo "<div class='groupButton'>" . html::selectAll() . html::selectReverse() . "</div>"; 
 
              $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID");
-             $misc       = common::hasPriv('testcase', 'batchEdit') ? "onclick=setFormAction('$actionLink')" : "disabled='disabled'";
+             $misc       = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
              echo "<div class='groupButton dropButton'>";
              echo html::commonButton($lang->edit, $misc);
              echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
@@ -164,7 +164,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
   <ul>
   <?php 
   $actionLink = $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy");
-  $misc = common::hasPriv('testtask', 'batchRun') ? "onclick=setFormAction('$actionLink')" : "class='disabled'";
+  $misc = common::hasPriv('testtask', 'batchRun') ? "onclick=\"setFormAction('$actionLink')\"" : "class='disabled'";
   echo "<li>" . html::a('#', $lang->testtask->runCase, '', $misc) . "</li>";
   ?>
   </ul>
diff --git a/module/tree/model.php b/module/tree/model.php
index 783938c4d5..eb526522fc 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -459,12 +459,11 @@ class treeModel extends model
                     }
                     $menu .= '</ul></li>';
                 }
-
                 $menu .= '</ul>';
             }
+            $menu .='</li>';
         }
-
-        $menu .= '</li>';
+        $menu .= '</ul>';
         return $menu;
     }
 
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 1b6331bfa2..46ab917271 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -56,7 +56,7 @@
                   if($allProject)
                   {
                       echo "<span class='copy'>";
-                      echo html::select('allProject', $allProject, '', 'onchange=syncProductOrProject(this,"project")');
+                      echo html::select('allProject', $allProject, '', "onchange=\"syncProductOrProject(this,'project')\"");
                       echo html::select('projectModule', $projectModules, '');
                       echo html::commonButton($lang->tree->syncFromProject, "id='copyModule' onclick='syncModule($currentProject, \"task\")'");
                       echo '</span>';
@@ -67,7 +67,7 @@
                   if($allProduct)
                   {
                       echo "<span class='copy'>";
-                      echo html::select('allProduct', $allProduct, '', 'onchange=syncProductOrProject(this,"product")');
+                      echo html::select('allProduct', $allProduct, '', "onchange=\"syncProductOrProject(this,'product')\"");
                       echo html::select('productModule', $productModules, '');
                       echo html::commonButton($lang->tree->syncFromProduct, "id='copyModule' onclick='syncModule($currentProduct, \"story\")'");
                       echo '</span>';