From 0e70c353973972ebd7dd64f295ce5d0dffd58694 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Wed, 13 Jun 2012 07:16:32 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=A0=B7=E5=BC=8F=E7=9A=84bug=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=9B=9E=E8=BD=A6=E7=AC=A6=E7=9A=84?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/controllers/DataController.php | 1 +
 htdocs/css/watermdview.css                         | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php
index ebc6e99f..7414530c 100755
--- a/application/default/controllers/DataController.php
+++ b/application/default/controllers/DataController.php
@@ -664,6 +664,7 @@ class DataController extends Zend_Controller_Action
 				foreach($rows as $k=>$v)
 				{
 					$rows[$k]['ts_created'] = date("Y-m-d H:i",strtotime($v['ts_created']));
+					$rows[$k]['changelog'] = str_replace("\n","</p><p>",$v['changelog']);
 				}
 				$data = array("list"=>$rows);
 				$this->jsonexit($data);
diff --git a/htdocs/css/watermdview.css b/htdocs/css/watermdview.css
index f5c46c01..89aaf8b8 100644
--- a/htdocs/css/watermdview.css
+++ b/htdocs/css/watermdview.css
@@ -144,11 +144,12 @@ h2 {margin-top:10px;}
 .recommend .pagnv .pleft{display:block;width:100%;}
 .recommend .pagnv .pright{display:block;width:100%;}
 
-.datalist{overflow:hidden;}
-.datalist ul li{margin:5px 0px;padding:5px 0px;background:#f6f6f6;border:1px solid #FFF;border-radius:3px;}
+.datalist{overflow:hidden;width:100%;}
+.datalist ul{overflow:hidden;}
+.datalist ul li{margin:5px 0px;padding:5px 0px;background:#f6f6f6;border:1px solid #FFF;border-radius:3px;word-break:break-all;width:99%;}
 .datalist ul li:hover,#datalist ul li:focus{border:1px solid #ccc;background:#fefefe;}
 .datalist ul li a{font-size:12px;}
 .datalist ul li a.title{font-size:14px;}
 .datalist ul li a.more{font-size:12px;}
-.datalist ul li p{text-indent:24px;font-size:12px;line-height:24px;}
+.datalist ul li p{text-indent:24px;font-size:12px;line-height:24px;word-break:break-all;white-space:normal; }
 .datalist ul li p img {vertical-align:middle;}
\ No newline at end of file