From 41a6ce53e89595fe3f160d35cdc5d7feb5183beb Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Sat, 26 Feb 2011 08:17:51 +0000
Subject: [PATCH]  * merege the download.html.php to printFiles.html.php.

---
 module/bug/view/view.html.php        |  1 -
 module/doc/view/view.html.php        |  1 -
 module/file/view/download.html.php   | 19 -------------------
 module/file/view/printfiles.html.php | 19 ++++++++++++++++++-
 module/story/view/view.html.php      |  1 -
 module/task/view/view.html.php       |  1 -
 module/testcase/view/view.html.php   |  1 -
 7 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100644 module/file/view/download.html.php

diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index f4fb492eb9..745282b60a 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../file/view/download.html.php';?>
 <div id='titlebar'>
   <div id='main' <?php if($bug->deleted) echo "class='deleted'";?>>BUG #<?php echo $bug->id . $lang->colon . $bug->title;?></div>
   <div>
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 8823f4d64c..f5303bae4a 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../file/view/download.html.php';?>
 <script language='javascript'>
 var type = '<?php echo $doc->type;?>';
 $(document).ready(function()
diff --git a/module/file/view/download.html.php b/module/file/view/download.html.php
deleted file mode 100644
index 8850e7098a..0000000000
--- a/module/file/view/download.html.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<style>
-.button-c {padding:1px}
-</style>
-<script language='Javascript'>
-/* 删除文件。*/
-function deleteFile(fileID)
-{
-    if(!fileID) return;
-    hiddenwin.location.href =createLink('file', 'delete', 'fileID=' + fileID);
-}
-/* 下载文件。*/
-function downloadFile(fileID){
-    if(!fileID) return;
-    var URL = createLink('file', 'download', 'fileID=' + fileID + '&mouse=left');
-    window.open(URL, '_blank');
-    return false;
-}
-</script>
-
diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php
index cc891910e2..f9531f97a2 100644
--- a/module/file/view/printfiles.html.php
+++ b/module/file/view/printfiles.html.php
@@ -1,3 +1,20 @@
+<style>.button-c {padding:1px}</style>
+<script language='Javascript'>
+/* Delete a file. */
+function deleteFile(fileID)
+{
+    if(!fileID) return;
+    hiddenwin.location.href =createLink('file', 'delete', 'fileID=' + fileID);
+}
+/* Download a file, append the mouse to the link. Thus we call decide to open the file in browser no download it. */
+function downloadFile(fileID)
+{
+    if(!fileID) return;
+    var URL = createLink('file', 'download', 'fileID=' + fileID + '&mouse=left');
+    window.open(URL, '_blank');
+    return false;
+}
+</script>
 <?php if($fieldset == 'true'):?>
 <fieldset>
   <legend><?php echo $lang->file->common;?></legend>
@@ -7,7 +24,7 @@
   foreach($files as $file)
   {
       if(common::hasPriv('file' , 'download')) echo html::a($this->createLink('file', 'download', "fileID=$file->id"), $file->title .'.' . $file->extension, '_blank', "onclick='return downloadFile($file->id)'");
-      if(common::hasPriv('file', 'delete'))    echo html::commonButton(' x ', "onclick=deleteFile($file->id)");
+      if(common::hasPriv('file', 'delete'))    echo html::commonButton(' x ', "onclick='deleteFile($file->id)'");
   }
   ?>
   </div>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 335e8c6c97..26f798b8c5 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../file/view/download.html.php';?>
 
 <div class='yui-d0'>
   <div id='titlebar'>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index a5d2c8ed12..4b68e2c77c 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../file/view/download.html.php';?>
 
 <div class='yui-d0'>
   <div id='titlebar'>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index ac833e07a4..64ad28c7ed 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
-<?php include '../../file/view/download.html.php';?>
 <div class='yui-d0'>
   <div id='titlebar' <?php if($case->deleted) echo "class='deleted'";?>>
     CASE #<?php echo $case->id . $lang->colon . $case->title;?>