Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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} %>

config/locales/zh.yml

@@ -2134,6 +2134,7 @@ zh:
   label_notification: 通知公告
   label_course_ad_description: 课程模块正在优化中，使用过程中如有问题请您与我们联系，感谢大家的支持！
   label_course_adcolick: 请点击：
+  label_coursejoin_tip: 提示：加入课程才有权限查看或提交作业，“加入”按钮见课程图标右侧！
   #end  
 
   #end