From 218246239b31e54abaa96987c370985bf46b7221 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 26 Jun 2015 13:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=B6=85=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 40122fba7..fadffc9f6 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -53,7 +53,7 @@
                       <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
                     </td>
                     <td>
-                    <table width="580" border="0" class="info-break">
+                    <table border="0" class="info-break" style="width:580px;">
                     <% case e.act_type %>
                     <% when 'JournalsForMessage' %>
                         <tr>
@@ -97,7 +97,7 @@
                           </td>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act.notes %>
                             </p>
@@ -144,7 +144,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act, :description %>
                             </p></td>
@@ -204,7 +204,7 @@
                           <% else %>
                               <% desStr= textAreailizable(act, :notes) %>
                           <% end %>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= desStr %>
                             </p>
@@ -259,7 +259,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act, :long_comments %>
                             </p>
@@ -320,7 +320,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable(act, :content) %>
                             </p>
@@ -361,7 +361,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description"></p>
                           </td>
                         </tr>
@@ -404,7 +404,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act, :description %>
                             </p>
@@ -446,7 +446,7 @@
                               </td>
                             </tr>
                             <tr>
-                              <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
+                              <td colspan="2" class="upload_img" style="max-width:580px;">
                                 <%= textAreailizable act, :description %>
                               </td>
                             </tr>
@@ -482,7 +482,7 @@
                             </td>
                             </tr>
                             <tr>
-                              <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
+                              <td colspan="2" class="upload_img" style="max-width:580px;">
                                 <%= textAreailizable act, :description %>
                               </td>
                             </tr>
@@ -535,7 +535,7 @@
                           <% end %>
                         </tr>
                         <tr>
-                          <td colspan="2" width="580" class="upload_img">
+                          <td colspan="2" class="upload_img" style="max-width:580px;">
                             <p class="font_description">
                               <%= textAreailizable act, :description %>
                             </p>
@@ -609,7 +609,7 @@
                         </td>
                       </tr>
                       <tr>
-                        <td colspan="2" width="580" class="upload_img">
+                        <td colspan="2" class="upload_img" style="max-width:580px;">
                           <p class="font_description">
                             <%= textAreailizable e.notes %>
                           </p>