From 2dc5b1f18ca33d7cc8abb129f21d023e9eb42cb2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 10 Oct 2014 14:39:07 +0800
Subject: [PATCH] =?UTF-8?q?#1198=20=E9=A1=B9=E7=9B=AE--=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=96=B0=E9=97=BB--=E6=96=B0=E9=97=BB=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B--=E8=AF=BE=E7=A8=8B=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5--=E6=B7=BB=E5=8A=A0=E8=AF=84=E8=AE=BA=EF=BC=9A?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=88=96=E8=AF=84=E8=AE=BA=E4=B8=AD=E5=90=AB?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=86=85=E5=AE=B9=EF=BC=8C=E5=85=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_course_show.html.erb  |  5 +++--
 app/views/news/_project_show.html.erb | 31 ++++++++++++++++++++-------
 public/stylesheets/application.css    |  5 +++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 03731373c..6e03e8e34 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -123,9 +123,10 @@
               </tr>
               <tr>
                 <td colspan="2" width="580px" >
-                  <p class="font_description">
+                  <span class="font_description">
                     <%= textilizable(comment.comments) %>
-                  </p></td>
+                  </span>
+                </td>
               </tr>
               <tr>
                 <td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 66580ddd5..665094cc8 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -80,7 +80,9 @@
 <div id="comments" style="margin-bottom:16px;">
 
   <div style="margin:15px">
-    <span class="font_description"> <%= textilizable(@news, :description) %> </span>
+    <span class="font_description">
+      <%= textilizable(@news, :description) %>
+    </span>
     <br/>
     <%= link_to_attachments @news %>
     <br/>
@@ -115,22 +117,35 @@
       <% next if comment.new_record? %>
       <table width="660px" border="0" align="center">
         <tr>
-          <td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(comment.author), :class => "avatar")%></td>
+          <td colspan="2" valign="top" width="50" >
+            <%= image_tag(url_to_avatar(comment.author), :class => "avatar")%>
+          </td>
           <td>
             <table width="580px" border="0">
               <tr>
-                <td colspan="2" valign="top"><strong><%= link_to_user(comment.author) if comment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
+                <td colspan="2" valign="top">
+                  <strong><%= link_to_user(comment.author) if comment.respond_to?(:author) %> </strong>
+                  <span class="font_lighter"><%= l(:label_project_newadd) %></span>
+                  <%= l(:label_comment_plural) %>
+                </td>
               </tr>
               <tr>
                 <td colspan="2" width="580px" >
-                  <p class="font_description">
+                  <span class="font_description">
                     <%= textilizable(comment.comments) %>
-                  </p></td>
+                  </span>
+                </td>
               </tr>
               <tr>
-                <td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>
-                <td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
-                                                                                  :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
+                <td align="left">
+                  <span class="font_lighter"> <%= format_time(comment.created_on) %></span>
+                </td>
+                <td width="200" align="right" class="a">
+                  <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
+                                                                                  :data => {:confirm => l(:text_are_you_sure)},
+                                                                                  :method => :delete,
+                                                                                  :title => l(:button_delete) %>
+                </td>
               </tr>
             </table></td>
         </tr>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6c78af85a..5316838d3 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -753,6 +753,11 @@ ul.user_course_sort li{list-style-type:none;
     word-break:break-all;
     word-wrap: break-word;
 }
+.font_description img{
+    max-width: 90%;
+    max-height: 90%;  /* 设置最大宽度和高度 */
+}
+
 .font_description2{	
 	font-size:13px;
 	line-height: 1.5em;