Merge branch 'develop' into szzh

app/controllers/bids_controller.rb

@@ -9,6 +9,8 @@ class BidsController < ApplicationController
   menu_item :homework_statistics, :only => :homework_statistics
   menu_item :edit, :only => :edit
 
+
+
   before_filter :can_show_course,only: []
   before_filter :can_show_contest,only: []
   #Ended by young

app/views/courses/_course_form.html.erb

@@ -127,9 +127,7 @@
     <%= l(:label_new_course_description) %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   </label>
   <span class="jstEditor">
-      <textarea id="course_description" class="wiki-edit" style="font-size:small;width:490px;margin-left:10px;" rows="8" name="course[description]" cols="40">
-        <%= @course.description %>
-      </textarea>
+      <textarea id="course_description" class="wiki-edit" style="font-size:small;width:490px;margin-left:10px;" rows="8" name="course[description]" cols="40"><%= @course.description %></textarea>
   </span>
 </p>
 <p style="margin-left:-10px;">

config/locales/zh.yml

@@ -748,7 +748,7 @@ zh:
   label_news_view_all: 查看所有新闻
   label_news_added: 新闻已添加
   label_settings: 配置
-  label_overview: 项目动态
+  label_overview: 近期动态
   label_course_overview: "课程动态"
   label_question_student: 作业交流 #bai
   label_homework_commit: 提交作业 #huang