From b563b170bda4c504483125130be1ad1c98c20004 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 23 Dec 2016 21:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=8A=A8=E6=80=81=E6=96=B0?=
 =?UTF-8?q?=E9=97=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/comments_controller.rb        |  1 +
 app/controllers/contests_controller.rb        |  2 +
 app/views/comments/create.js.erb              |  2 +
 app/views/contests/_contest_activity.html.erb |  2 +-
 .../contests/contest_activities.html.erb      |  2 +-
 app/views/users/_contest_news.html.erb        | 77 +++++++++++++++++++
 6 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 app/views/users/_contest_news.html.erb

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 9226b904c..193dbd407 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -28,6 +28,7 @@ class CommentsController < ApplicationController
     if !@news.org_subfield_id.nil?
       @org_subfield = OrgSubfield.find(@news.org_subfield_id)
     end
+    @contest = Contest.find(@news.contest_id) if @news.contest_id
     @comment = Comment.new
     #@project ? @comment.comments = params[:comment][:comments] : @comment.comments = params[:comment]
     if params[:user_activity_id]
diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
index dfd7ca7be..5309a75ac 100644
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -37,6 +37,8 @@ class ContestsController < ApplicationController
           @contest_activities = contest_activities.where("contest_act_type = 'Attachment'").order('updated_at desc')
         when "journalsForMessage"
           @contest_activities = contest_activities.where("contest_act_type = 'JournalsForMessage'").order('updated_at desc')
+        when "news"
+          @contest_activities = contest_activities.where("contest_act_type = 'News'").order('updated_at desc')
         else
           @contest_activities = contest_activities.order('updated_at desc')
       end
diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb
index 970fded22..a58c1a7e4 100644
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@@ -2,6 +2,8 @@
     $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/course_news_post_reply', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% elsif @project %>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+<% elsif @contest %>
+    $("#activity_post_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/course_news_post_reply', :locals => {:activity => @news,:user_activity_id => @user_activity_id}) %>");
 <% else %>
     $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'organizations/course_news_post_reply', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% end %>
diff --git a/app/views/contests/_contest_activity.html.erb b/app/views/contests/_contest_activity.html.erb
index 8b7355138..f2e329403 100644
--- a/app/views/contests/_contest_activity.html.erb
+++ b/app/views/contests/_contest_activity.html.erb
@@ -41,7 +41,7 @@
             <% when 'Work' %>
                 <%= render :partial => 'users/contest_work', :locals => {:activity => act, :user_activity_id => activity.id, :hw_status => 2} %>
             <% when 'News' %>
-                <%#= render :partial => 'users/contest_news', :locals => {:activity => act, :user_activity_id => activity.id, :is_course => 1} %>
+                <%= render :partial => 'users/contest_news', :locals => {:activity => act, :user_activity_id => activity.id, :is_course => 1} %>
             <% when 'Message' %>
                 <%#= render :partial => 'users/contest_message', :locals => {:activity => act, :user_activity_id => activity.id,:is_course=>1,:is_board=>0} %>
             <% when 'Poll' %>
diff --git a/app/views/contests/contest_activities.html.erb b/app/views/contests/contest_activities.html.erb
index f17bfb07d..564e54dfb 100644
--- a/app/views/contests/contest_activities.html.erb
+++ b/app/views/contests/contest_activities.html.erb
@@ -9,7 +9,7 @@
             <ul class="homepagePostTypeHomework fl">
               <li><%= link_to "全部动态", contest_activities_contest_path(@contest), :class =>"homepagePostTypeAll postTypeGrey"%></li>
               <li><%= link_to "作品动态", contest_activities_contest_path(@contest, :type => 'work'), :class => "homepagePostTypeAssignment postTypeGrey"%></li>
-              <!--<li><%#= link_to "通知动态", {:controller => "courses", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey"%></li>-->
+              <li><%= link_to "通知动态", contest_activities_contest_path(@contest, :type => 'news'), :class => "homepagePostTypeNotice postTypeGrey"%></li>
               <!--<li><%#= link_to "资源库动态", {:controller => "courses", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey"%></li>-->
               <!--<li><%#= link_to "论坛动态", {:controller => "courses", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey"%></li>-->
               <!--<li><%#= link_to "留言动态", {:controller => "courses", :action => "show", :type => "journalsForMessage"}, :class => "homepagePostTypeMessage postTypeGrey"%></li>-->
diff --git a/app/views/users/_contest_news.html.erb b/app/views/users/_contest_news.html.erb
new file mode 100644
index 000000000..be047f457
--- /dev/null
+++ b/app/views/users/_contest_news.html.erb
@@ -0,0 +1,77 @@
+<div class="resources mt10" id="user_activity_<%= user_activity_id %>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word">
+        <%= link_to activity.author.show_name, user_path(activity.author), :class => "newsBlue mr15" %>
+        TO  <!--+"(课程名称)"-->
+        <% str = defined?(is_course) && is_course == 1 ? "竞赛通知" : "#{activity.contest.name.to_s} | 竞赛通知" %>
+        <%= link_to str, contest_news_index_path(activity.contest), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
+        <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
+      </div>
+      <% if activity.sticky == 1 %>
+          <span class="sticky_btn_cir ml10">置顶</span>
+      <% end%>
+      <div class="cl"></div>
+      <div class="homepagePostDate fl">
+        发布时间：<%= format_time(activity.created_on) %>
+      </div>
+      <div class="homepagePostDate fl ml15">
+        更新时间：<%= format_time(ContestActivity.where("contest_act_type='#{activity.class}' and contest_act_id =#{activity.id}").first.updated_at) %>
+      </div>
+      <div class="cl"></div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+      </div>
+      <% if User.current.logged? %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <% if User.current.logged? %>
+                    <ul class="homepagePostSettiongText">
+                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    {controller:'news', :action => 'edit', :id => activity.id},
+                                    :class => 'postOptionLink'
+                            ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                      </li>
+                      <li>
+                        <%= delete_link(
+                                    news_path(activity),
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                      </li>
+                    </ul>
+                <% end %>
+              </li>
+            </ul>
+          </div>
+      <% end %>
+    </div>
+    <div class="cl"></div>
+  </div>
+
+  <div class="homepagePostReply">
+    <div id="activity_post_reply_<%=user_activity_id %>">
+      <%=render :partial => 'users/course_news_post_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
+    </div>
+  </div>
+</div>
+<script type="text/javascript">
+    $(function(){
+        user_card_show_hide();
+    });
+</script>