Merge branch 'develop' into educoder

app/helpers/application_helper.rb

@@ -3015,9 +3015,9 @@ module ApplicationHelper
       elsif params[:controller] == "courses" && params[:action] == "index"
         title << ("翻转课堂")
       elsif params[:controller] == "competitions" && params[:action] == "index"
-        title << ("竞赛")
+        title << ("在线竞赛")
       elsif @competition
-        title << (@competition.name.nil? ? "竞赛" : @competition.name)
+        title << (@competition.name.nil? ? "在线竞赛" : @competition.name)
       elsif @contest
         title << (@contest.name.nil? ? "创新源于实践" : @contest.name)
       elsif @shixun
@@ -3027,13 +3027,13 @@ module ApplicationHelper
       elsif params[:controller] == "shixuns" && params[:action] == "index"
         title << ("开发社区")
       elsif @subject
-        title << (@subject.name.nil? ? "实训课程" : @subject.name)
+        title << (@subject.name.nil? ? "实践课程" : @subject.name)
       elsif params[:controller] == "subjects" && params[:action] == "index"
-        title << ("实训课程")
+        title << ("实践课程")
       elsif @organization
         title << (@organization.name.nil? ? "创新源于实践" : @organization.name)
       elsif @forum || params[:controller] == "forums"
-        title << "讨论区"
+        title << "交流问答"
       elsif @my_syllabuses
         title << "我的课堂"
       elsif params[:controller] == 'ecs'

app/views/layouts/_logined_header.html.erb

@@ -2,7 +2,7 @@
   <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %>
   <div class="head-nav pr">
     <ul id="header-nav">
-      <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实训课程", subjects_path %></li>
+      <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
       <!-- 精选实训 -->
       <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "开发社区", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
@@ -18,11 +18,11 @@
           </ul>
         </li>
       <% end %>
-      <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
+      <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "在线竞赛", competitions_path %></li>
-      <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_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">
-          <%= link_to "认证", department_ecs_path(:school_id => User.current.ec_school) %>
+          <%= link_to "工程认证", department_ecs_path(:school_id => User.current.ec_school) %>
         </li>
       <% end %>
     </ul>

app/views/layouts/_unlogin_header.html.erb

@@ -3,7 +3,7 @@
   <div class="head-nav pr">
     <ul id="header-nav">
       <li class="active" style="display: none"><%= link_to "首页", home_path %></li>
-      <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实训课程", subjects_path %></li>
+      <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
 
       <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "开发社区", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
@@ -19,8 +19,8 @@
           </ul>
         </li>
       <% end %>
-      <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
+      <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "在线竞赛", competitions_path %></li>
-      <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
+      <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
     </ul>
     <div class="posi-search unlogin" id="posi-search" style="display: none" >

app/views/libraries/index.html.erb

@@ -1,3 +1,4 @@
+<img src="/images/educoder/teach_ex.png" width="100%"/>
 <div class="educontent">
   <div class="edu-back-white mb30 mt30">
     <p class="padding20-30 clearfix bor-bottom-greyE">