From 4a2cd6d5b6631f84a42748003abe3932803dcf66 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Mon, 2 May 2011 05:54:29 +0000
Subject: [PATCH]  * adjust the trash tips.

---
 module/action/lang/en.php         | 3 +--
 module/action/lang/zh-cn.php      | 3 +--
 module/action/view/trash.html.php | 8 ++++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index df40b9e98d..a959e17338 100644
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -19,8 +19,7 @@ $lang->action->objectName = 'Name';
 $lang->action->actor      = 'Actor';
 $lang->action->action     = 'Action';
 $lang->action->date       = 'Date';
-$lang->action->trashTips  = "Tips:The deleting actions in zentao are all logic, the real data don't be erased from the database.
-                             So if you want to erase a record, can use phpmyadmin and such tools to remove it from database.";
+$lang->action->trashTips  = "Tips:The deleting actions in zentao are all logic";
 
 $lang->action->dynamic->today     = 'Today';
 $lang->action->dynamic->yesterday = 'Yesterday';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 17f1e29fe7..464f61cad2 100644
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -19,8 +19,7 @@ $lang->action->objectName = '对象名称';
 $lang->action->actor      = '操作者';
 $lang->action->action     = '动作';
 $lang->action->date       = '日期';
-$lang->action->trashTips  = '提示：禅道系统的删除都是标记删除，并没有真正从数据库里面删除数据。这样做是为了系统数据的完整和安全。
-                             因此如果你确定要删除某一条数据，可以使用phpmyadmin等管理工具，进数据库删除。';
+$lang->action->trashTips  = '提示：为了保证系统的完整性，禅道系统的删除都是标记删除。';
 
 $lang->action->dynamic->today     = '今天';
 $lang->action->dynamic->yesterday = '昨天';
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 99512038c6..5f3d239843 100644
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -38,8 +38,12 @@
   <?php endforeach;?>
   </tbody>
   <tfoot>
-  <tr><td colspan='6'><i><?php echo $lang->action->trashTips;?></i></td></tr>
+  <tr>
+    <td colspan='6'>
+      <div class='f-left'><?php echo $lang->action->trashTips;?></div>
+      <div><?php $pager->show();?></div>
+    </td>
+  </tr>
   </tfoot>
 </table>
-<div class='a-right'><?php $pager->show();?></div>
 <?php include '../../common/view/footer.html.php';?>