From 00633c8331fe519dcdaf6563a8db954116581efd Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 19:00:32 +0800
Subject: [PATCH 1/2] 1

---
 app/controllers/bids_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index ec2fb7d77..7e5894b83 100644
--- a/app/controllers/bids_controller.rb
+++ b/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

From 14a1f31a1270eaef0bbaa6211026dccf203fc9cf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 19 Jan 2015 16:43:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E9=A1=B9=E7=9B=AE=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=20->=20=E8=BF=91=E6=9C=9F=E5=8A=A8=E6=80=81=202?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=97=B6=EF=BC=8C=E6=8F=8F=E8=BF=B0=E4=BC=9A?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E8=A1=8C=E7=A9=BA=E7=99=BD=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_form.html.erb | 4 +---
 config/locales/zh.yml                   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index c48d24935..d293f9ed1 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/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;">
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ac7c52fe2..061baa932 100644
--- a/config/locales/zh.yml
+++ b/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