From 6bef7029bcdf50702c1d8ababf29f911a705c4b4 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Tue, 25 Mar 2014 15:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=BE=E7=A8=8B=E5=88=86?=
 =?UTF-8?q?=E4=B8=8D=E6=B8=85=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A7=A3=E9=87=8A?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index a85ee280b..3e81482ef 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -3,12 +3,14 @@
 	<% if @course_tag == '1' %>
 		<h3><%=l(:label_course_new)%></h3>
 		<div class="box tabular">
+		<p><%=raw l(:label_course_news_description)%></p>
     	<%= render :partial => 'course_form', :locals => { :f => f } %>
     	<span style="padding-left: 60px"><%= submit_tag l(:button_create), :class => "enterprise"%></span>
 	    <!-- <%= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->
     <% else %>
 		<h3><%=l(:label_project_new)%></h3>
 		<div class="box tabular" >
+		<p> <%=l(:label_project_new_description)%> </p>
     	<%= render :partial => 'form', :locals => { :f => f } %>
     	<span style="padding-left: 60px"><%= submit_tag l(:button_create), :class => "enterprise"%></span>
 	    <!-- <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>	 -->
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index e57fce2f2..3c9218683 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -463,6 +463,7 @@ zh:
   label_project: 项目
   label_activity_project: '项目: '  #added by bai
   label_project_new: 新建项目
+  label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。'
   label_project_plural: 项目列表
   label_x_projects:
     zero:  无项目
@@ -637,6 +638,7 @@ zh:
   label_homework_commit: 提交作业 #huang
   label_homework_info: 提交情况  #huang
   label_course_news: 课程通知
+  label_course_news_description: '课程必须是高校正式开设的课程，或是围绕特定主题定期发布课程资料的公共开放课程；<br/>如果您想创建一个协作研究空间，请您前往“我的项目”页面创建项目，谢谢！'
   label_course_board: 讨论区
   label_version: 版本
   label_version_new: 新建版本