Merge branches 'develop' and 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/controllers/ecs_controller.rb

@@ -60,7 +60,7 @@ class EcsController < ApplicationController
   def get_navigation_url
     ec_user = EcSchoolUser.where(:user_id => User.current.id).first
     ec_url = "#{department_ecs_path(:school_id => ec_user.school_id)}" if ec_user
-    render :json => {ec_url: ec_url}
+    render :json => {ec_url: ec_url, project_packages_url: "/crowdsourcing"  }
   end
 
 

app/helpers/libraries_helper.rb

@@ -11,7 +11,7 @@ module LibrariesHelper
 
   def library_tag_class(tag)
     case tag.name
-    when '优秀案例' then 'edu-activity-red'
+    when '获奖案例' then 'edu-activity-red'
     when '入库案例' then 'edu-activity-blue'
     end
   end

app/views/layouts/_logined_header.html.erb

@@ -23,6 +23,7 @@
         <img class="roundedRectangles" src="/images/educoder/roundedRectangle.png"/>
       </li>
       <li class="<%= params[:controller] == "libraries" ? " active" : "" %>"><%= link_to "教学案例", libraries_path %></li>
+      <li class="<%= params[:controller] == "project_packages" ? " active" : "" %>"><%= link_to "众包", project_packages_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
       <% if User.current.ec_school.present? %>
         <li class="<%= ecs_controller.include?(params[:controller]) ? " active" : "" %>" id="ec_banner">

app/views/layouts/_unlogin_header.html.erb

@@ -24,6 +24,7 @@
         <img class="roundedRectangles" src="/images/educoder/roundedRectangle.png"/>
       </li>
       <li class="<%= params[:controller] == "libraries" ? " active" : "" %>"><%= link_to "教学案例", libraries_path %></li>
+      <li class="<%= params[:controller] == "project_packages" ? " active" : "" %>"><%= link_to "众包", project_packages_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
     </ul>