From 2f4b29085c92b58b20a49bffe311da424a58907a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 26 Oct 2015 15:26:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=A8=E6=80=81=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A8=E6=A0=BC=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/messages/_course_show.html.erb            | 2 +-
 app/views/users/_course_homework.html.erb           | 4 ++--
 app/views/users/_course_journalsformessage.html.erb | 4 ++--
 app/views/users/_course_message.html.erb            | 4 ++--
 app/views/users/_course_news.html.erb               | 4 ++--
 app/views/users/_course_poll.html.erb               | 2 +-
 app/views/users/_project_issue.html.erb             | 4 ++--
 app/views/users/_project_message.html.erb           | 4 ++--
 app/views/users/_user_homework_detail.html.erb      | 4 ++--
 app/views/users/_user_journalsformessage.html.erb   | 2 +-
 public/stylesheets/courses.css                      | 1 +
 public/stylesheets/new_user.css                     | 1 +
 public/stylesheets/public.css                       | 1 +
 13 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 79142c441..f4a1675b1 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -115,7 +115,7 @@
                     <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                 <% end %>
               </div>
-              <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
+              <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.html_safe%>
               </div>
               <div style="margin-top: -7px; margin-bottom: 5px">
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 4bde4476d..7bb7bccf0 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -43,7 +43,7 @@
 
         <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <%= activity.description.html_safe %>
         </div>
@@ -119,7 +119,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
                   </div>
                   <div class="cl"></div>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 28cb368d6..27549f6d9 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -67,7 +67,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
                     <% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %>
                         <script type="text/javascript">
@@ -94,7 +94,7 @@
                                 <% end %>
                                 <%= format_time reply.created_on %>
                               </div>
-                            <div class="homepagePostReplyContent break_word list_style upload_img" style="max-width: 580px;" id="reply_to_content_<%= reply.id %>">
+                            <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" style="max-width: 580px;" id="reply_to_content_<%= reply.id %>">
                               <%= reply.notes.html_safe %></div>
                               <div class="cl"></div>
                           </div>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 1653a0e8a..4996f7730 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -30,7 +30,7 @@
       <div class="homepagePostDate">
         发帖时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <% if activity.parent_id.nil? %>
               <%= activity.content.to_s.html_safe%>
@@ -104,7 +104,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %>
                     </div>
                   </div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 9016e8b71..f9087f057 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -18,7 +18,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <%= activity.description.html_safe %>
         </div>
@@ -71,7 +71,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index ec76bf947..48ab5d2f2 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -29,7 +29,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.published_at) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <%= activity.polls_description.html_safe %>
         </div>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index babf6ab35..bda391f23 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -33,7 +33,7 @@
           <%=format_time(activity.created_on) %>
         </div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <% if activity.description? %>
               <%= textAreailizable activity, :description, :attachments => activity.attachments %>
@@ -107,7 +107,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                       <% if reply.details.any? %>
                           <% details_to_strings(reply.details).each do |string| %>
                               <p><%= string %></p>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 25b47d72c..14c37096e 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -26,7 +26,7 @@
       <div class="homepagePostDate">
         时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <% if activity.parent_id.nil? %>
               <%= activity.content.to_s.html_safe%>
@@ -85,7 +85,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %></div>
                   </div>
                   <div class="cl"></div>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index b4beb7aa3..4570f365c 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -43,7 +43,7 @@
           <%= l(:label_end_time)%>：<%= homework_common.end_time%>
         </div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="homework_description_<%= homework_common.id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="homework_description_<%= homework_common.id%>">
         <div id="intro_content_<%= homework_common.id%>">
           <%= homework_common.description.html_safe %>
         </div>
@@ -127,7 +127,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
                   </div>
                   <div class="cl"></div>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 43ec2a0c2..33e08f4e8 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -60,7 +60,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= user_activity_id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= user_activity_id %>">
                       <%= comment.notes.html_safe %>
                     </div>
                     <% end %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 23a1a95ac..a49fde333 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -156,6 +156,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyDes {float:left; width:632px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
 .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/public_icon.png) -27px -577px no-repeat; padding-left:25px; font-size:14px; margin-right:25px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 6f9f1f945..6d471a88f 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -683,6 +683,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
 .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/public_icon.png) -27px -577px no-repeat; padding-left:25px; font-size:14px; margin-right:25px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d45b6f94d..d4a394b23 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -569,6 +569,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyDes {float:left; width:620px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
+.table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf; height:30px; line-height:30px; vertical-align:middle;}
 .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}