From bbf4478fc0402d22d1f59aa29ce960b052a28a71 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 2 Sep 2015 11:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E5=90=8E=E4=B8=8D=E8=83=BD=E5=8F=8A=E6=97=B6=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_news.html.erb | 33 ++++++++++++---------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 42475fde1..7edc19681 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -18,29 +18,26 @@
       <div class="homepagePostDate">
         发布时间：<%= format_date(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">通知描述：<%= activity.description.html_safe %></div>
-
-      <div class="homepagePostSetting none" id="act-<%= user_activity_id %>">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-            </ul>
-          </li>
-        </ul>
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
+        通知描述：
+        <%= activity.description.html_safe %>
       </div>
     </div>
     <div class="cl"></div>
   </div>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
-      <% count=activity.comments_count %>
-      <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
+      <% count=activity.comments.count %>
+      <div class="homepagePostReplyBannerCount">
+        回复（<%= count %>）
+      </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>2 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              点击展开更多回复(<%= count.to_s%>)
+            </a>
+          </div>
       <% end %>
     </div>
 
@@ -59,12 +56,12 @@
     </div>
 
     <% replies_all_i = 0 %>
-    <% unless activity.comments.empty? %>
+    <% if count > 0 %>
         <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
           <ul>
             <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <% replies_all_i=replies_all_i+1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
+                <% replies_all_i = replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 2 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %>
                   </div>