From d56abda8dbdcdbc6f29583bd226367364b17765b Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Wed, 17 Mar 2010 08:45:53 +0000
Subject: [PATCH]  * mv the view file of common module to view directory.

---
 module/admin/view/browsecompany.html.php       | 4 ++--
 module/admin/view/browsegroup.html.php         | 4 ++--
 module/admin/view/browseuser.html.php          | 4 ++--
 module/admin/view/index.html.php               | 4 ++--
 module/bug/view/activate.html.php              | 6 +++---
 module/bug/view/browse.html.php                | 8 ++++----
 module/bug/view/close.html.php                 | 6 +++---
 module/bug/view/create.html.php                | 6 +++---
 module/bug/view/edit.html.php                  | 8 ++++----
 module/bug/view/index.html.php                 | 4 ++--
 module/bug/view/report.html.php                | 4 ++--
 module/bug/view/resolve.html.php               | 6 +++---
 module/bug/view/sendmail.html.php              | 2 +-
 module/bug/view/view.html.php                  | 6 +++---
 module/build/view/create.html.php              | 6 +++---
 module/build/view/edit.html.php                | 6 +++---
 module/build/view/view.html.php                | 4 ++--
 module/common/{ => view}/action.html.php       | 0
 module/common/{ => view}/autocomplete.html.php | 0
 module/common/{ => view}/autosuggest.html.php  | 0
 module/common/{ => view}/colorbox.html.php     | 0
 module/common/{ => view}/colorize.html.php     | 0
 module/common/{ => view}/datepicker.html.php   | 0
 module/common/{ => view}/footer.html.php       | 0
 module/common/{ => view}/header.html.php       | 0
 module/common/{ => view}/header.lite.html.php  | 0
 module/common/{ => view}/mail.html.php         | 0
 module/common/{ => view}/tablesorter.html.php  | 0
 module/common/{ => view}/treetable.html.php    | 0
 module/common/{ => view}/treeview.html.php     | 0
 module/company/view/browse.html.php            | 8 ++++----
 module/company/view/create.html.php            | 4 ++--
 module/company/view/edit.html.php              | 4 ++--
 module/convert/view/checkconfig.html.php       | 4 ++--
 module/convert/view/execute.html.php           | 4 ++--
 module/convert/view/index.html.php             | 4 ++--
 module/convert/view/selectsource.html.php      | 4 ++--
 module/convert/view/setconfig.html.php         | 4 ++--
 module/dept/view/browse.html.php               | 6 +++---
 module/dept/view/create.html.php               | 4 ++--
 module/dept/view/edit.html.php                 | 4 ++--
 module/group/view/browse.html.php              | 4 ++--
 module/group/view/create.html.php              | 4 ++--
 module/group/view/edit.html.php                | 4 ++--
 module/group/view/index.html.php               | 4 ++--
 module/group/view/managemember.html.php        | 4 ++--
 module/group/view/managepriv.html.php          | 4 ++--
 module/index/view/index.html.php               | 6 +++---
 module/misc/view/getsid.html.php               | 2 +-
 module/my/view/bug.html.php                    | 6 +++---
 module/my/view/editprofile.html.php            | 4 ++--
 module/my/view/index.html.php                  | 6 +++---
 module/my/view/profile.html.php                | 6 +++---
 module/my/view/project.html.php                | 6 +++---
 module/my/view/story.html.php                  | 6 +++---
 module/my/view/task.html.php                   | 6 +++---
 module/my/view/todo.html.php                   | 6 +++---
 module/product/view/browse.html.php            | 8 ++++----
 module/product/view/create.html.php            | 4 ++--
 module/product/view/edit.html.php              | 4 ++--
 module/product/view/index.html.php             | 4 ++--
 module/product/view/roadmap.html.php           | 4 ++--
 module/productplan/view/browse.html.php        | 6 +++---
 module/productplan/view/create.html.php        | 6 +++---
 module/productplan/view/edit.html.php          | 6 +++---
 module/productplan/view/index.html.php         | 4 ++--
 module/productplan/view/linkstory.html.php     | 6 +++---
 module/productplan/view/view.html.php          | 6 +++---
 module/project/view/browse.html.php            | 6 +++---
 module/project/view/bug.html.php               | 8 ++++----
 module/project/view/build.html.php             | 6 +++---
 module/project/view/burn.html.php              | 4 ++--
 module/project/view/create.html.php            | 6 +++---
 module/project/view/edit.html.php              | 6 +++---
 module/project/view/grouptask.html.php         | 6 +++---
 module/project/view/index.html.php             | 4 ++--
 module/project/view/linkstory.html.php         | 6 +++---
 module/project/view/managechilds.html.php      | 4 ++--
 module/project/view/managemembers.html.php     | 4 ++--
 module/project/view/manageproducts.html.php    | 4 ++--
 module/project/view/story.html.php             | 8 ++++----
 module/project/view/task.html.php              | 6 +++---
 module/project/view/team.html.php              | 8 ++++----
 module/project/view/view.html.php              | 4 ++--
 module/qa/view/index.html.php                  | 4 ++--
 module/release/view/browse.html.php            | 6 +++---
 module/release/view/create.html.php            | 6 +++---
 module/release/view/edit.html.php              | 6 +++---
 module/release/view/view.html.php              | 4 ++--
 module/story/view/activate.html.php            | 4 ++--
 module/story/view/change.html.php              | 4 ++--
 module/story/view/close.html.php               | 4 ++--
 module/story/view/create.html.php              | 2 +-
 module/story/view/edit.html.php                | 4 ++--
 module/story/view/header.html.php              | 4 ++--
 module/story/view/review.html.php              | 4 ++--
 module/story/view/sendmail.html.php            | 2 +-
 module/story/view/view.html.php                | 6 +++---
 module/task/view/browse.html.php               | 4 ++--
 module/task/view/create.html.php               | 8 ++++----
 module/task/view/edit.html.php                 | 8 ++++----
 module/task/view/import.html.php               | 4 ++--
 module/task/view/view.html.php                 | 6 +++---
 module/testcase/view/browse.html.php           | 8 ++++----
 module/testcase/view/create.html.php           | 2 +-
 module/testcase/view/edit.html.php             | 4 ++--
 module/testcase/view/header.html.php           | 2 +-
 module/testcase/view/index.html.php            | 4 ++--
 module/testcase/view/view.html.php             | 8 ++++----
 module/testtask/view/browse.html.php           | 6 +++---
 module/testtask/view/create.html.php           | 6 +++---
 module/testtask/view/edit.html.php             | 6 +++---
 module/testtask/view/linkcase.html.php         | 8 ++++----
 module/testtask/view/results.html.php          | 2 +-
 module/testtask/view/runcase.html.php          | 2 +-
 module/testtask/view/view.html.php             | 8 ++++----
 module/todo/view/create.html.php               | 2 +-
 module/todo/view/edit.html.php                 | 2 +-
 module/todo/view/footer.html.php               | 2 +-
 module/todo/view/view.html.php                 | 4 ++--
 module/tree/view/browse.html.php               | 8 ++++----
 module/tree/view/create.html.php               | 4 ++--
 module/tree/view/edit.html.php                 | 2 +-
 module/upgrade/view/confirm.html.php           | 4 ++--
 module/upgrade/view/execute.html.php           | 4 ++--
 module/upgrade/view/index.html.php             | 4 ++--
 module/upgrade/view/selectversion.html.php     | 4 ++--
 module/user/view/bug.html.php                  | 6 +++---
 module/user/view/create.html.php               | 6 +++---
 module/user/view/edit.html.php                 | 6 +++---
 module/user/view/index.html.php                | 4 ++--
 module/user/view/profile.html.php              | 6 +++---
 module/user/view/project.html.php              | 6 +++---
 module/user/view/task.html.php                 | 6 +++---
 module/user/view/todo.html.php                 | 6 +++---
 module/user/view/view.html.php                 | 6 +++---
 136 files changed, 306 insertions(+), 306 deletions(-)
 rename module/common/{ => view}/action.html.php (100%)
 rename module/common/{ => view}/autocomplete.html.php (100%)
 rename module/common/{ => view}/autosuggest.html.php (100%)
 rename module/common/{ => view}/colorbox.html.php (100%)
 rename module/common/{ => view}/colorize.html.php (100%)
 rename module/common/{ => view}/datepicker.html.php (100%)
 rename module/common/{ => view}/footer.html.php (100%)
 rename module/common/{ => view}/header.html.php (100%)
 rename module/common/{ => view}/header.lite.html.php (100%)
 rename module/common/{ => view}/mail.html.php (100%)
 rename module/common/{ => view}/tablesorter.html.php (100%)
 rename module/common/{ => view}/treetable.html.php (100%)
 rename module/common/{ => view}/treeview.html.php (100%)

diff --git a/module/admin/view/browsecompany.html.php b/module/admin/view/browsecompany.html.php
index 92f2c91066..b559542fd2 100644
--- a/module/admin/view/browsecompany.html.php
+++ b/module/admin/view/browsecompany.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <table align='center' class='table-1'>
     <tr class='colhead'>
@@ -58,4 +58,4 @@
    <?php endforeach;?>
   </table>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/admin/view/browsegroup.html.php b/module/admin/view/browsegroup.html.php
index fc2489693c..7c4197bf3b 100644
--- a/module/admin/view/browsegroup.html.php
+++ b/module/admin/view/browsegroup.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class="yui-d0 yui-t2">                 
   <div class="yui-b a-center">
   <?php include './menu.html.php';?>
@@ -65,4 +65,4 @@
     </div>
   </div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/admin/view/browseuser.html.php b/module/admin/view/browseuser.html.php
index 42cbf58637..0de6a7a241 100644
--- a/module/admin/view/browseuser.html.php
+++ b/module/admin/view/browseuser.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class="yui-d0 yui-t2">                 
   <div class="yui-b a-center">
   <?php include './menu.html.php';?>
@@ -69,4 +69,4 @@
     </div>
   </div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 38d60b0e0c..14399fa8a7 100644
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class="yui-d0 yui-t2">                 
   <div class="yui-b a-center">
   <?php include './menu.html.php';?>
@@ -38,4 +38,4 @@
     </div>
   </div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index 62462435fb..6a4fa34194 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
 <div class='yui-d0'>
   <table class='table-1'>
@@ -51,6 +51,6 @@
       </td>
     </tr>
   </table>
-  <?php include '../../common/action.html.php';?>
+  <?php include '../../common/view/action.html.php';?>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index f8dfcd14a4..d361a75819 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/treeview.html.php';?>
-<?php include '../../common/colorize.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/treeview.html.php';?>
+<?php include '../../common/view/colorize.html.php';?>
 <script language='Javascript'>
 /* 通过模块浏览。*/
 function browseByModule(active)
@@ -119,4 +119,4 @@ function browseBySearch(active)
 $("#<?php echo $browseType;?>Tab").addClass('active'); 
 $("#module<?php echo $moduleID;?>").addClass('active'); 
 </script>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php
index 4f8580afe3..a2fd397156 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <form method='post' target='hiddenwin'>
 <div class='yui-d0'>
   <table class='table-1'>
@@ -39,6 +39,6 @@
       </td>
     </tr>
   </table>
-  <?php include '../../common/action.html.php';?>
+  <?php include '../../common/view/action.html.php';?>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index da6227e470..8f03c43048 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/autocomplete.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/autocomplete.html.php';?>
 <style>
 #project, #product, #story{width:245px}
 #severity, #browser {width: 113px}
@@ -182,4 +182,4 @@ $(function() {
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index afb4e1858a..f8f6c174e3 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/autocomplete.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/autocomplete.html.php';?>
 <style>
 #product, #module, #project, #story, #task, #resolvedBuild{width:245px}
 </style>
@@ -176,7 +176,7 @@ $(function() {
           </div>
         </td></tr>
       </table>
-      <?php include '../../common/action.html.php';?>
+      <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
 
@@ -302,4 +302,4 @@ $(function() {
     </fieldset>
   </div>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/index.html.php b/module/bug/view/index.html.php
index ef4e0b46ab..96b72107b0 100644
--- a/module/bug/view/index.html.php
+++ b/module/bug/view/index.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
 </div>  
-<?php include '../../common/footer.html.php';?>
\ No newline at end of file
+<?php include '../../common/view/footer.html.php';?>
\ No newline at end of file
diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php
index 17860c23ca..52ffc65809 100644
--- a/module/bug/view/report.html.php
+++ b/module/bug/view/report.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <style>
 span {display:block}
 </style>
@@ -74,4 +74,4 @@ span {display:block}
   </div>
 </div>
 <?php echo $rendJS;?>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index 059ee35915..e96b9cd019 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <script language='Javascript'>
 function setDuplicate(resolution)
 {
@@ -68,6 +68,6 @@ function setDuplicate(resolution)
       </td>
     </tr>
   </table>
-  <?php include '../../common/action.html.php';?>
+  <?php include '../../common/view/action.html.php';?>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/sendmail.html.php b/module/bug/view/sendmail.html.php
index beff93d25e..617eb8b1de 100644
--- a/module/bug/view/sendmail.html.php
+++ b/module/bug/view/sendmail.html.php
@@ -29,6 +29,6 @@
     </td>
   </tr>
   <tr>
-    <td><?php include '../../common/mail.html.php';?></td>
+    <td><?php include '../../common/view/mail.html.php';?></td>
   </tr>
 </table>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 46072f9dd6..35078657c9 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 
 <div class='yui-d0'>
   <div id='titlebar'>
@@ -51,7 +51,7 @@
         <legend><?php echo $lang->bug->legendAttatch;?></legend>
         <div><?php foreach($bug->files as $file) echo html::a($this->createLink('file', 'download', "fileID=$file->id"), $file->title, '_blank');?></div>
       </fieldset>
-      <?php include '../../common/action.html.php';?>
+      <?php include '../../common/view/action.html.php';?>
       <div class='a-center' style='font-size:16px; font-weight:bold'>
       <?php
       common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
@@ -210,4 +210,4 @@
     </fieldset>
   </div>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 0290d59617..9b8ad7e7de 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -63,4 +63,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index 4ab6b69696..6efbc4ec8b 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -62,4 +62,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 130087aa2f..f29bd95441 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -67,4 +67,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/common/action.html.php b/module/common/view/action.html.php
similarity index 100%
rename from module/common/action.html.php
rename to module/common/view/action.html.php
diff --git a/module/common/autocomplete.html.php b/module/common/view/autocomplete.html.php
similarity index 100%
rename from module/common/autocomplete.html.php
rename to module/common/view/autocomplete.html.php
diff --git a/module/common/autosuggest.html.php b/module/common/view/autosuggest.html.php
similarity index 100%
rename from module/common/autosuggest.html.php
rename to module/common/view/autosuggest.html.php
diff --git a/module/common/colorbox.html.php b/module/common/view/colorbox.html.php
similarity index 100%
rename from module/common/colorbox.html.php
rename to module/common/view/colorbox.html.php
diff --git a/module/common/colorize.html.php b/module/common/view/colorize.html.php
similarity index 100%
rename from module/common/colorize.html.php
rename to module/common/view/colorize.html.php
diff --git a/module/common/datepicker.html.php b/module/common/view/datepicker.html.php
similarity index 100%
rename from module/common/datepicker.html.php
rename to module/common/view/datepicker.html.php
diff --git a/module/common/footer.html.php b/module/common/view/footer.html.php
similarity index 100%
rename from module/common/footer.html.php
rename to module/common/view/footer.html.php
diff --git a/module/common/header.html.php b/module/common/view/header.html.php
similarity index 100%
rename from module/common/header.html.php
rename to module/common/view/header.html.php
diff --git a/module/common/header.lite.html.php b/module/common/view/header.lite.html.php
similarity index 100%
rename from module/common/header.lite.html.php
rename to module/common/view/header.lite.html.php
diff --git a/module/common/mail.html.php b/module/common/view/mail.html.php
similarity index 100%
rename from module/common/mail.html.php
rename to module/common/view/mail.html.php
diff --git a/module/common/tablesorter.html.php b/module/common/view/tablesorter.html.php
similarity index 100%
rename from module/common/tablesorter.html.php
rename to module/common/view/tablesorter.html.php
diff --git a/module/common/treetable.html.php b/module/common/view/treetable.html.php
similarity index 100%
rename from module/common/treetable.html.php
rename to module/common/view/treetable.html.php
diff --git a/module/common/treeview.html.php b/module/common/view/treeview.html.php
similarity index 100%
rename from module/common/treeview.html.php
rename to module/common/view/treeview.html.php
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index f6c99f5904..56fa2997f9 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -23,9 +23,9 @@
  */
 ?>
 <?php 
-include '../../common/header.html.php';
-include '../../common/treeview.html.php';
-include '../../common/tablesorter.html.php';
+include '../../common/view/header.html.php';
+include '../../common/view/treeview.html.php';
+include '../../common/view/tablesorter.html.php';
 ?>
 <div class="yui-d0 yui-t7">
   <div class="yui-b">
@@ -87,4 +87,4 @@ include '../../common/tablesorter.html.php';
   </div>
 </div>  
 <script lanugage='Javascript'>$('#dept<?php echo $deptID;?>').addClass('active');</script>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/company/view/create.html.php b/module/company/view/create.html.php
index 9f74115707..87bf983db5 100644
--- a/module/company/view/create.html.php
+++ b/module/company/view/create.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-5'> 
@@ -67,4 +67,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php
index 57db5b2c4d..6beec9745b 100644
--- a/module/company/view/edit.html.php
+++ b/module/company/view/edit.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-5 a-left'> 
@@ -67,4 +67,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/convert/view/checkconfig.html.php b/module/convert/view/checkconfig.html.php
index d5251a86a6..4ff268da9c 100644
--- a/module/convert/view/checkconfig.html.php
+++ b/module/convert/view/checkconfig.html.php
@@ -21,7 +21,7 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' action='<?php echo inlink('execute');?>'>
   <table align='center' class='table-5 f-14px'>
@@ -38,4 +38,4 @@
   ?>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/convert/view/execute.html.php b/module/convert/view/execute.html.php
index 3cf9d624b8..78fe70cf8e 100644
--- a/module/convert/view/execute.html.php
+++ b/module/convert/view/execute.html.php
@@ -21,7 +21,7 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <table align='center' class='f-14px'>
     <caption><?php echo $lang->convert->execute . $lang->colon . strtoupper($source);?></caption>
@@ -29,4 +29,4 @@
   </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/convert/view/index.html.php b/module/convert/view/index.html.php
index c76063176c..e6989418d0 100644
--- a/module/convert/view/index.html.php
+++ b/module/convert/view/index.html.php
@@ -21,7 +21,7 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <table align='center' class='table-5'>
     <caption><?php echo $lang->convert->common;?></caption>
@@ -29,4 +29,4 @@
     <tr><td><h3 class='a-center'><?php echo html::a($this->createLink('convert', 'selectsource'), $lang->convert->start);?></h3></td></tr>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/convert/view/selectsource.html.php b/module/convert/view/selectsource.html.php
index 22ee85145d..d8c6dd86c1 100644
--- a/module/convert/view/selectsource.html.php
+++ b/module/convert/view/selectsource.html.php
@@ -21,7 +21,7 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' action='<?php echo inlink('setConfig');?>'>
   <table align='center' class='table-5 f-14px'>
@@ -42,4 +42,4 @@
   </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/convert/view/setconfig.html.php b/module/convert/view/setconfig.html.php
index c538239d00..28849828c3 100644
--- a/module/convert/view/setconfig.html.php
+++ b/module/convert/view/setconfig.html.php
@@ -21,7 +21,7 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' action='<?php echo inlink('checkconfig');?>'>
   <table align='center' class='table-5 f-14px'>
@@ -34,4 +34,4 @@
   <?php echo html::hidden('source', $source) . html::hidden('version', $version);?>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php
index 90f30cf36d..a382f38ccc 100644
--- a/module/dept/view/browse.html.php
+++ b/module/dept/view/browse.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/treeview.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/treeview.html.php';?>
 <div class="yui-d0 yui-t3">                 
   <div class="yui-b">
     <form method='post' target='hiddenwin' action='<?php echo $this->createLink('dept', 'updateOrder');?>'>
@@ -75,4 +75,4 @@
     </div>
   </div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/dept/view/create.html.php b/module/dept/view/create.html.php
index 07d633b4a9..021296ed44 100644
--- a/module/dept/view/create.html.php
+++ b/module/dept/view/create.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-4'> 
@@ -48,4 +48,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/dept/view/edit.html.php b/module/dept/view/edit.html.php
index 7d21eb5535..93077e8753 100644
--- a/module/dept/view/edit.html.php
+++ b/module/dept/view/edit.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-4'> 
@@ -49,4 +49,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index 8ba52d2673..389dfe60e7 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>                 
   <table align='center' class='table-1'>
     <tr class='colhead nobr'>
@@ -49,4 +49,4 @@
   </table>
   <div class='a-right'><?php echo html::a($this->createLink('group', 'create'), $lang->group->create);?></div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php
index cc7903065b..d0f251c327 100644
--- a/module/group/view/create.html.php
+++ b/module/group/view/create.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-4 a-left'> 
@@ -39,4 +39,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php
index 7e14c6bf87..ebd36dcddd 100644
--- a/module/group/view/edit.html.php
+++ b/module/group/view/edit.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-4'> 
@@ -39,4 +39,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/view/index.html.php b/module/group/view/index.html.php
index 11bcfbe976..b8c9ed8e51 100644
--- a/module/group/view/index.html.php
+++ b/module/group/view/index.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class="yui-d0 yui-t2">                 
   <div class="yui-b a-center">
     <table class='table-1'>
@@ -55,4 +55,4 @@
     </div>
   </div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php
index 72be597a6d..03ada78a26 100644
--- a/module/group/view/managemember.html.php
+++ b/module/group/view/managemember.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <style>#users span{display:block; width:100px; float:left}</style>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
@@ -35,4 +35,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/view/managepriv.html.php b/module/group/view/managepriv.html.php
index a2c169688d..0fc6f08c33 100644
--- a/module/group/view/managepriv.html.php
+++ b/module/group/view/managepriv.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <script language="Javascript">
 function check(checker, module)
 {
@@ -65,4 +65,4 @@ function checkall(checker)
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index fe5be290be..1e3a44f624 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -21,8 +21,8 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/colorize.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/colorize.html.php';?>
 <div class="yui-d0 yui-t6">  
   <div class='yui-main'>
     <div class='yui-b'>
@@ -68,4 +68,4 @@
   </div>
 </div>
 <script language='Javascript'><?php for($i = 1; $i <= $counts; $i ++) echo "createChart$i();"; ?></script>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/misc/view/getsid.html.php b/module/misc/view/getsid.html.php
index f7e2df6198..b3ceb96a6f 100644
--- a/module/misc/view/getsid.html.php
+++ b/module/misc/view/getsid.html.php
@@ -1,2 +1,2 @@
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 main view file:<?php echo $sid;?>
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index f485170bf6..9169e99968 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 tablesorter'>
     <thead>
@@ -52,4 +52,4 @@
     </tbody>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php
index ab74162392..770ddcb9b4 100644
--- a/module/my/view/editprofile.html.php
+++ b/module/my/view/editprofile.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-4 a-left'> 
@@ -57,4 +57,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/index.html.php b/module/my/view/index.html.php
index 5de8b6b2e6..5a0353f208 100644
--- a/module/my/view/index.html.php
+++ b/module/my/view/index.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class="yui-d0 yui-t3">                 
   <div class="yui-b">
     <table class='table-1'>
@@ -93,4 +93,4 @@ EOT;
     </div>
   </div>  
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index 2aa2685739..e5f8c84418 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table align='center' class='table-4'>
     <caption><?php echo $lang->my->profile;?></caption>
@@ -69,4 +69,4 @@
     </tr>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 5bae7667e8..19fda8377d 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 tablesorter a-center'>
     <thead>
@@ -54,4 +54,4 @@
     </tbody>
   </table> 
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index b644e984fb..7e9059d0b2 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 fixed tablesorter'>
     <thead>
@@ -63,4 +63,4 @@
     </tbody>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 94ce3afb48..db1a7a37f9 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 tablesorter' id='tasktable'>
     <thead>
@@ -58,4 +58,4 @@
     </tbody>
   </table> 
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 2d459dae7a..eb43469c71 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <script language='Javascript'>
 function changeDate(date)
 {
@@ -109,4 +109,4 @@ function changeDate(date)
   </table>
 </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index cd1da0a08f..d84c3271dd 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/treeview.html.php';?>
-<?php include '../../common/colorize.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/treeview.html.php';?>
+<?php include '../../common/view/colorize.html.php';?>
 <script language='Javascript'>
 /* 切换浏览方式。*/
 function browseByModule()
@@ -134,4 +134,4 @@ function search(active)
 $('#module<?php echo $moduleID;?>').addClass('active')
 $('#<?php echo $browseType;?>Tab').addClass('active')
 </script>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 07d633b4a9..021296ed44 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-4'> 
@@ -48,4 +48,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 7d21eb5535..93077e8753 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-4'> 
@@ -49,4 +49,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/index.html.php b/module/product/view/index.html.php
index b8f627d8ac..6fb2a929fc 100644
--- a/module/product/view/index.html.php
+++ b/module/product/view/index.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <style> #main ul li { list-style-type:none;}</style>
 <link rel="stylesheet" href="/theme/default/treeview.css" />
 <script src="/js/jquery/lib.js" type="text/javascript"></script>
@@ -110,4 +110,4 @@ function selectProduct(product)
     </div>
   </div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/roadmap.html.php b/module/product/view/roadmap.html.php
index 79e645dcf5..f091b53353 100644
--- a/module/product/view/roadmap.html.php
+++ b/module/product/view/roadmap.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <table class='table-1'>
     <caption><?php echo $lang->product->roadmap;?></caption>
@@ -60,4 +60,4 @@
     ?>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index fc09172328..0eccbc1012 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 tablesorter'>
     <caption>
@@ -58,4 +58,4 @@
     </tbody>
   </table>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index 558ef291e1..5d7233154a 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -60,4 +60,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index d2ffd850d8..d49b7cef89 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -60,4 +60,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/productplan/view/index.html.php b/module/productplan/view/index.html.php
index 3215a82d85..568e820501 100644
--- a/module/productplan/view/index.html.php
+++ b/module/productplan/view/index.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
 <a href='browse.html'>browse</a>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index fac263fa9d..250ad76cd8 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <form method='post'>
     <table align='center' class='table-1 tablesorter a-center'> 
@@ -81,4 +81,4 @@
     </tbody>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 0ba5bc561a..e7e8c3a5ea 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1'>
   <caption><?php echo $plan->title . $lang->colon . $lang->productplan->view;?></caption>
@@ -72,4 +72,4 @@
     </tbody>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/browse.html.php b/module/project/view/browse.html.php
index 0c94a5f99b..44284ef317 100644
--- a/module/project/view/browse.html.php
+++ b/module/project/view/browse.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <script src="<?php echo $jsRoot;?>misc/sorttable.js" type="text/javascript"></script>
 <script language='javascript'>
 function selectProject(projectID)
@@ -163,4 +163,4 @@ EOT;
     </div>
   </div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 51a3c4a32e..b6cbea850f 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/colorize.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/colorize.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <div id='featurebar'>
     <div class='f-right'><?php common::printLink('bug', 'create', "productID=0&extra=projectID=$project->id", $lang->bug->create);?></div>
@@ -59,4 +59,4 @@
   </table>
   <div class='a-right'><?php echo $pager;?></div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 410da0bc39..6c2b91f457 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <div id='featurebar'>
     <div class='f-right'><?php common::printLink('build', 'create', "project=$project->id", $lang->build->create);?></div>
@@ -62,4 +62,4 @@
     </tbody>
   </table>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php
index cf422d7e82..c6b1d82eba 100644
--- a/module/project/view/burn.html.php
+++ b/module/project/view/burn.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0 a-center'><?php echo $charts; ?></div>
 <script language='Javascript'>createChart1();</script>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 255513d510..81296b874a 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-1 a-left'> 
@@ -71,4 +71,4 @@
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index c02ba53209..e7f13a495b 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-1 a-left'> 
@@ -74,4 +74,4 @@
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index 0081ede896..efc027be57 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/treetable.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/treetable.html.php';?>
 <?php include './taskheader.html.php';?>
 <div class='yui-d0'>
   <table class='table-1' id='treetable'>
@@ -69,4 +69,4 @@
   </table>
 </div>  
 <script language='Javascript'>$('#by<?php echo $browseType;?>').addClass('active');</script>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index 6eaae988df..db89911817 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
 <table class='table-1'>
   <caption>
@@ -131,4 +131,4 @@
   <?php if(common::hasPriv('project', 'managemembers')) echo html::a($this->createLink('project', 'managemembers', "projectID=$project->id"), $lang->project->manageMembers) . '<br />';?>
 </div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php
index e7d74cee52..5b4e90e4c2 100644
--- a/module/project/view/linkstory.html.php
+++ b/module/project/view/linkstory.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-1 tablesorter fixed a-center'> 
@@ -63,4 +63,4 @@
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/managechilds.html.php b/module/project/view/managechilds.html.php
index c73a006083..f3a24f1449 100644
--- a/module/project/view/managechilds.html.php
+++ b/module/project/view/managechilds.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
   <form method='post'>
     <table align='center' class='table-5 a-left'> 
@@ -38,4 +38,4 @@
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 416b8398f4..58cb0a8374 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
   <form method='post'>
     <table align='center' class='table-3'> 
@@ -66,4 +66,4 @@
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 01254b6a63..60c2107646 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
   <form method='post'>
     <table align='center' class='table-3 a-left'> 
@@ -38,4 +38,4 @@
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index f6b85f3707..fad1feaf7f 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/colorbox.html.php';?>
-<?php include '../../common/colorize.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/colorbox.html.php';?>
+<?php include '../../common/view/colorize.html.php';?>
 <script language='javascript'>
 $(document).ready(function()
 {
@@ -94,4 +94,4 @@ $(document).ready(function()
   </table>
   <?php $pager->show();?>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 4ee8b2ef95..cb8d8601c9 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/colorize.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/colorize.html.php';?>
 <?php include './taskheader.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 fixed colored'>
@@ -78,4 +78,4 @@
   <div class='a-right'><?php echo $pager;?></div>
 </div>  
 <script language='Javascript'>$('#by<?php echo $browseType;?>').addClass('active');</script>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index 8f5fc6317f..e9803ed852 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/colorbox.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/colorbox.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
  <table align='center' class='table-4 tablesorter'>
    <thead>
@@ -59,4 +59,4 @@
  <div class='a-right'>
  </div>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index b922fa3ba4..fad57b36d5 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <table align='center' class='table-1'>
    <caption><?php echo $project->name;?></caption>
@@ -70,4 +70,4 @@
    </tr>
  </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/qa/view/index.html.php b/module/qa/view/index.html.php
index ca9413348e..83c86c1ba3 100644
--- a/module/qa/view/index.html.php
+++ b/module/qa/view/index.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index b55d51d15e..f244e88249 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <div id='feature-bar'>
   </div>
@@ -57,4 +57,4 @@
     </tbody>
   </table>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index f86bb775ef..d51bb04d09 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -52,4 +52,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index 9e2e31f4c1..b52113ad82 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -54,4 +54,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index de040631a2..c7e7b06f61 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -58,4 +58,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php
index 19890a59f7..5c3d78b019 100644
--- a/module/story/view/activate.html.php
+++ b/module/story/view/activate.html.php
@@ -41,7 +41,7 @@
       </td>
     </tr>
   </table>
-  <?php include '../../common/action.html.php';?>
+  <?php include '../../common/view/action.html.php';?>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index 04d866af1e..ccf87b9ad1 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -53,7 +53,7 @@
       </td>
     </tr>
   </table>
-  <?php include '../../common/action.html.php';?>
+  <?php include '../../common/view/action.html.php';?>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php
index c3a2cf2b8e..3e90a84f15 100644
--- a/module/story/view/close.html.php
+++ b/module/story/view/close.html.php
@@ -71,6 +71,6 @@ function setStory(reason)
     </tr>
   </table>
   </form>
-  <?php include '../../common/action.html.php';?>
+  <?php include '../../common/view/action.html.php';?>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 146107d3df..ff6d9b86b4 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -71,4 +71,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 59c913b0a2..83a1aa197d 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -46,7 +46,7 @@
         <textarea name='comment' rows='5' class='area-1'></textarea>
       </fieldset>
       <div class='a-center'><?php echo html::submitButton() .  html::linkButton($lang->goback, inlink('view', "storyID=$story->id"));?></div>
-      <?php include '../../common/action.html.php';?>
+      <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
 
@@ -140,4 +140,4 @@
  </div>
 </div>
 </form>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php
index 5e5af07ecb..24f60f6f2d 100644
--- a/module/story/view/header.html.php
+++ b/module/story/view/header.html.php
@@ -1,5 +1,5 @@
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/autocomplete.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/autocomplete.html.php';?>
 <script language='Javascript'>
 function loadProduct(productID)
 {
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php
index e3b1f8395a..58b6b0f13d 100644
--- a/module/story/view/review.html.php
+++ b/module/story/view/review.html.php
@@ -121,6 +121,6 @@ function setStory(reason)
     </tr>
   </table>
   </form>
-  <?php include '../../common/action.html.php';?>
+  <?php include '../../common/view/action.html.php';?>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/sendmail.html.php b/module/story/view/sendmail.html.php
index 9a588da140..a73da28186 100644
--- a/module/story/view/sendmail.html.php
+++ b/module/story/view/sendmail.html.php
@@ -29,6 +29,6 @@
     </td>
   </tr>
   <tr>
-    <td><?php include '../../common/mail.html.php';?></td>
+    <td><?php include '../../common/view/mail.html.php';?></td>
   </tr>
 </table>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 51d6c48ca7..90c47e6e1c 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 
 <div class='yui-d0'>
   <div id='titlebar'>
@@ -52,7 +52,7 @@
         <legend><?php echo $lang->story->legendAttatch;?></legend>
         <div><?php foreach($story->files as $file) echo html::a($this->createLink('file', 'download', "fileID=$file->id"), $file->title, '_blank');?></div>
       </fieldset>
-      <?php include '../../common/action.html.php';?>
+      <?php include '../../common/view/action.html.php';?>
       <div class='a-center' style='font-size:16px; font-weight:bold'>
       <?php
       if(!($story->status != 'closed' and common::printLink('story', 'change', "storyID=$story->id", $lang->story->change))) echo $lang->story->change . ' ';
@@ -202,4 +202,4 @@
    </fieldset>
   </div>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/browse.html.php b/module/task/view/browse.html.php
index dbad78b6f6..0af865cce1 100644
--- a/module/task/view/browse.html.php
+++ b/module/task/view/browse.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
   <table align='center' class='table-4'>
     <caption><?php echo $lang->task->browse;?></caption>
@@ -45,4 +45,4 @@
   echo "<a href='$addLink'>{$lang->task->create}</a>";
   ?>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 5ecbae8637..6e2d6626e0 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/colorbox.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/colorbox.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <script language='javascript'>
 /* 拷贝需求标题为任务标题。*/
 function copyStoryTitle()
@@ -114,4 +114,4 @@ $(document).ready(function()
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 4b5abef407..1820fec8a2 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
 <div class='yui-d0'>
   <div id='titlebar'>
@@ -48,7 +48,7 @@
         <?php echo $this->fetch('file', 'buildform');?>
       </fieldset>
       <div class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->inlink('view', "taskID=$task->id"));?></div>
-      <?php include '../../common/action.html.php';?>
+      <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
   <div class='yui-b'>
@@ -105,4 +105,4 @@
   </div>
 </div>
 </form>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/import.html.php b/module/task/view/import.html.php
index ee851d2f5e..9a76d5c0bc 100644
--- a/module/task/view/import.html.php
+++ b/module/task/view/import.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class="yui-d0">
   <table class='table-1 fixed tablesorter'>
     <thead>
@@ -69,4 +69,4 @@
     </tbody>
   </table>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 494119bdff..8d4c8b1f8c 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 
 <div class='yui-d0'>
   <div id='titlebar'>
@@ -52,7 +52,7 @@
         <legend><?php echo $lang->files;?></legend>
         <div><?php foreach($task->files as $file) echo html::a($this->createLink('file', 'download', "fileID=$file->id"), $file->title, '_blank');?></div>
       </fieldset>
-      <?php include '../../common/action.html.php';?>
+      <?php include '../../common/view/action.html.php';?>
       <div class='a-center f-16px strong'>
         <?php
         //if(!($task->status != 'closed' and $task->status != 'cancel' and common::printLink('task', 'logEfforts', "taskID=$task->id", $lang->task->buttonLogEfforts))) echo $lang->task->buttonLogEfforts . ' ';
@@ -125,4 +125,4 @@
     </fieldset>
    </div>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index d54192dbc9..7a8a62cd3a 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/treeview.html.php';?>
-<?php include '../../common/colorize.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/treeview.html.php';?>
+<?php include '../../common/view/colorize.html.php';?>
 <script language='Javascript'>
 /* 切换至按模块浏览。*/
 function browseByModule(active)
@@ -104,4 +104,4 @@ function browseBySearch(active)
 $("#<?php echo $browseType;?>Tab").addClass('active');
 $("#module<?php echo $moduleID;?>").addClass('active'); 
 </script>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index d963e1a992..437fdb1907 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -83,4 +83,4 @@
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index ff22d2a8d3..239082c897 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -84,7 +84,7 @@
        <input type='button' value='<?php echo $lang->testcase->buttonToList;?>' class='button-s' 
             onclick='location.href="<?php echo $this->createLink('testcase', 'browse', "productID=$productID");?>"' />
       </div>
-      <?php include '../../common/action.html.php';?>
+      <?php include '../../common/view/action.html.php';?>
 
     </div>
   </div>
@@ -133,4 +133,4 @@
     </fieldset>
   </div>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/view/header.html.php b/module/testcase/view/header.html.php
index b44bf17497..6598a4d49b 100644
--- a/module/testcase/view/header.html.php
+++ b/module/testcase/view/header.html.php
@@ -1,4 +1,4 @@
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <style>
 #produc{width:90%}
 #story {width:90%}
diff --git a/module/testcase/view/index.html.php b/module/testcase/view/index.html.php
index ef4e0b46ab..96b72107b0 100644
--- a/module/testcase/view/index.html.php
+++ b/module/testcase/view/index.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
 </div>  
-<?php include '../../common/footer.html.php';?>
\ No newline at end of file
+<?php include '../../common/view/footer.html.php';?>
\ No newline at end of file
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index fbc8127807..056b844911 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/colorize.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/colorize.html.php';?>
 
 <div class='yui-d0'>
   <div id='titlebar'>
@@ -67,7 +67,7 @@
       </fieldset>
       -->
 
-      <?php include '../../common/action.html.php';?>
+      <?php include '../../common/view/action.html.php';?>
       <fieldset>
         <legend><?php echo $lang->testcase->legendAction;?></legend>
         <div class='a-center' style='font-size:16px; font-weight:bold'>
@@ -143,4 +143,4 @@
     </fieldset>
   </div>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index b60f38de58..0c7cce3720 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 colored tablesorter fixed'>
     <caption>
@@ -66,4 +66,4 @@
     </tbody>
   </table>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index 14e57ee890..a525cf9ff4 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -62,4 +62,4 @@
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 4b45cc1d8a..d3a341d625 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1'> 
@@ -62,4 +62,4 @@
     </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index ecd8c2030e..f8d9277015 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/colorize.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/colorize.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <script language="Javascript">
 function checkall(checker)
 {
@@ -82,4 +82,4 @@ function checkall(checker)
   </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 4d4305f504..7b8b019e2f 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.lite.html.php';?>
+<?php include '../../common/view/header.lite.html.php';?>
 <div class='yui-d0'>
   <h1>CASE#<?php echo $run->case->id. $lang->colon . $run->case->title;?></h1>
   <?php foreach($results as $result):?>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 9ce2aba218..e2e9576efd 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.lite.html.php';?>
+<?php include '../../common/view/header.lite.html.php';?>
 <div class='yui-d0'>
   <form method='post'>
   <table class='table-1 bd-1px'>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 0d96b602f6..8766b838ce 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
-<?php include '../../common/colorbox.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
+<?php include '../../common/view/colorbox.html.php';?>
 <script language='javascript'>
 $(document).ready(function()
 {
@@ -133,4 +133,4 @@ function checkall(checker)
     </div>
   </div>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 16e559c7d7..882abc95bd 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index dbf8944976..be7c764c89 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table class='table-1 a-left'> 
diff --git a/module/todo/view/footer.html.php b/module/todo/view/footer.html.php
index f3870007b2..58b83e9ac7 100644
--- a/module/todo/view/footer.html.php
+++ b/module/todo/view/footer.html.php
@@ -42,4 +42,4 @@ function switchDateFeature(switcher)
     }
 }
 </script>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index f1c9508d89..9a67126711 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div class='yui-d0'>
   <?php if(!$todo->private or ($todo->private and $todo->account == $app->user->account)):?>
   <table class='table-1 a-left'> 
@@ -65,4 +65,4 @@
  <?php echo $lang->todo->thisIsPrivate;?>
  <?php endif;?>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index e1414c1bd6..6f71369bca 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -22,9 +22,9 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/treeview.html.php';?>
-<?php include '../../common/colorbox.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/treeview.html.php';?>
+<?php include '../../common/view/colorbox.html.php';?>
 <script language='javascript'>
 $(document).ready(function()
 {
@@ -93,4 +93,4 @@ $(document).ready(function()
     </div>
   </div>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/tree/view/create.html.php b/module/tree/view/create.html.php
index 07d633b4a9..021296ed44 100644
--- a/module/tree/view/create.html.php
+++ b/module/tree/view/create.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <div id='doc3'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-4'> 
@@ -48,4 +48,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php
index fbe9f1c131..3ccb09e450 100644
--- a/module/tree/view/edit.html.php
+++ b/module/tree/view/edit.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.lite.html.php';?>
+<?php include '../../common/view/header.lite.html.php';?>
 <div id='yui-d0' style='margin-top:20px'>
   <form method='post'>
     <table class='table-1'> 
diff --git a/module/upgrade/view/confirm.html.php b/module/upgrade/view/confirm.html.php
index 7e16832851..7817655524 100644
--- a/module/upgrade/view/confirm.html.php
+++ b/module/upgrade/view/confirm.html.php
@@ -21,7 +21,7 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.lite.html.php';?>
+<?php include '../../common/view/header.lite.html.php';?>
 <div class='yui-d0' style='margin-top:50px'>
   <form method='post' action='<?php echo inlink('execute');?>'>
   <table align='center' class='table-6 f-14px'>
@@ -34,4 +34,4 @@
   </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/upgrade/view/execute.html.php b/module/upgrade/view/execute.html.php
index 06e8a1b0a5..1cf14bd814 100644
--- a/module/upgrade/view/execute.html.php
+++ b/module/upgrade/view/execute.html.php
@@ -21,7 +21,7 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.lite.html.php';?>
+<?php include '../../common/view/header.lite.html.php';?>
 <div class='yui-d0' style='margin-top:50px'>
   <table align='center' class='table-5 f-14px'>
     <caption><?php echo $lang->upgrade->$result;?></caption>
@@ -41,4 +41,4 @@
     </tr>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/upgrade/view/index.html.php b/module/upgrade/view/index.html.php
index 416a87a72c..9358580b6d 100644
--- a/module/upgrade/view/index.html.php
+++ b/module/upgrade/view/index.html.php
@@ -21,7 +21,7 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.lite.html.php';?>
+<?php include '../../common/view/header.lite.html.php';?>
 <div class='yui-d0' style='margin-top:50px'>
   <table align='center' class='table-5 f-14px'>
     <caption><?php echo $lang->upgrade->warnning;?></caption>
@@ -34,4 +34,4 @@
   </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/upgrade/view/selectversion.html.php b/module/upgrade/view/selectversion.html.php
index 9d2be26170..42e5a296c2 100644
--- a/module/upgrade/view/selectversion.html.php
+++ b/module/upgrade/view/selectversion.html.php
@@ -21,7 +21,7 @@
  * @version     $Id$
  */
 ?>
-<?php include '../../common/header.lite.html.php';?>
+<?php include '../../common/view/header.lite.html.php';?>
 <div class='yui-d0' style='margin-top:50px'>
   <form method='post' action='<?php echo inlink('confirm');?>'>
   <table align='center' class='table-5 f-14px'>
@@ -40,4 +40,4 @@
   </table>
   </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index f485170bf6..9169e99968 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 tablesorter'>
     <thead>
@@ -52,4 +52,4 @@
     </tbody>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index dd04d53a5d..ec6bffeb30 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-5'> 
@@ -66,4 +66,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index 374bcb154d..cb1c390b4c 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/datepicker.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
     <table align='center' class='table-4 a-left'> 
@@ -69,4 +69,4 @@
     </table>
   </form>
 </div>  
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/index.html.php b/module/user/view/index.html.php
index bdd89ce35b..fbe3be709a 100644
--- a/module/user/view/index.html.php
+++ b/module/user/view/index.html.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/view/header.html.php';?>
 <div id='doc3'>
 </div>  
-<?php include '../../common/view/footer.html.php';?>
+<?php include '../../common/view/view/footer.html.php';?>
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index 855ff7dc78..eb57da1466 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table align='center' class='table-4'>
     <caption><?php echo $lang->user->profile;?></caption>
@@ -61,4 +61,4 @@
     </tr>
   </table>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/project.html.php b/module/user/view/project.html.php
index 1afb43404b..1f91a22d92 100644
--- a/module/user/view/project.html.php
+++ b/module/user/view/project.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 tablesorter a-center'>
     <thead>
@@ -54,4 +54,4 @@
     </tbody>
   </table> 
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 94ce3afb48..db1a7a37f9 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class='yui-d0'>
   <table class='table-1 tablesorter' id='tasktable'>
     <thead>
@@ -58,4 +58,4 @@
     </tbody>
   </table> 
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index 124349edee..1dfbd7ff5e 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <script language='Javascript'>
 var account='<?php echo $account;?>'
 function changeDate(date)
@@ -78,4 +78,4 @@ function changeDate(date)
   </table>
 </form>
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/view.html.php b/module/user/view/view.html.php
index 6741faaf45..cd94d9e377 100644
--- a/module/user/view/view.html.php
+++ b/module/user/view/view.html.php
@@ -22,8 +22,8 @@
  * @link        http://www.zentao.cn
  */
 ?>
-<?php include '../../common/header.html.php';?>
-<?php include '../../common/tablesorter.html.php';?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div class="yui-d0 yui-t3">                 
   <div class="yui-b">
     <table class='table-1'>
@@ -83,4 +83,4 @@ EOT;
     </div>
   </div>  
 </div>
-<?php include '../../common/footer.html.php';?>
+<?php include '../../common/view/footer.html.php';?>