From e359b987e5f98561fa92eaf559f5d8d56c6f8860 Mon Sep 17 00:00:00 2001
From: moon <moontest@example.com>
Date: Tue, 18 Nov 2014 10:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E2=80=9C=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E2=80=9D=E6=9D=83=E9=99=90=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb
index 95e26abd0..68ec0dc2e 100644
--- a/app/views/courses/homework.html.erb
+++ b/app/views/courses/homework.html.erb
@@ -5,11 +5,12 @@
 </style>
 <%= javascript_include_tag 'attachments' %>
 <!-- fq -->
-<!--modified by huang-->
 <div class="content-title-top">
-	<% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.roles&Role.where(id: [3, 4, 7, 9] )).size >0))%>
-		<%= link_to(l(:label_course_homework_new), {:controller => 'courses', :action => 'new_homework'}, :class => 'icon icon-add') %>
-	<% end %>
+  <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.roles&Role.where(id: [3, 4, 7, 9] )).size >0))%>
+    <%= link_to(l(:label_course_homework_new), {:controller => 'courses', :action => 'new_homework'}, :class => 'icon icon-add') %>
+  <% else %>
+	<span class="font_lighter"><%= l(:label_coursejoin_tip) %></span>
+  <% end %>
 </div>
 <div id="bid-show">
 	<%= render :partial => 'bids/bid_homework_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 0220a10e5..a3807dca3 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2134,6 +2134,7 @@ zh:
   label_notification: 通知公告
   label_course_ad_description: 课程模块正在优化中，使用过程中如有问题请您与我们联系，感谢大家的支持！
   label_course_adcolick: 请点击：
+  label_coursejoin_tip: 提示：加入课程才有权限查看或提交作业，“加入”按钮见课程图标右侧！
   #end  
 
   #end