<%= @subject.name %>
<% if User.current.manager_of_subject?(@subject) %>
-
+
<% end %>
diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb
index 25332ef71..384b0bbb4 100644
--- a/app/views/subjects/show.html.erb
+++ b/app/views/subjects/show.html.erb
@@ -4,7 +4,7 @@
<% if User.current.manager_of_subject?(@subject) %>
-
+
<% end %>
@@ -17,12 +17,12 @@
<% count = 0 %>
<% @stages.each_with_index do |stage, index| %>
-
+
第<%= index + 1 %>章 <%= stage.name %>
<% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %>
-
-
+
+
<% else %>
<% end %>
@@ -34,27 +34,27 @@
- <%= shixun.name %>
+ 1-1 <%= shixun.name %>
-
+
<% if @subject.status < 2 %>
- <%= shixun.shixun_status %>
+ <%= shixun.shixun_status %>
<% else %>
<% case my_shixun_status(shixun, User.current) %>
<% when '已通关' %>
- 已通关
+ 已通关
<% when '未通关' %>
- 未通关
+ 未通关
<% when '未开启' %>
- 未开启
+ 未开启
<% end %>
<% end %>
<% if shixun.status > 1 %>
<% myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => shixun.id).first %>
<% if myshixun.blank? %>
- <%= link_to "开始实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange", :id => "shixun_operation", :remote => true %>
+ <%= link_to "开始实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange ", :style=>"display: none", :id => "shixun_operation", :remote => true %>
<% else %>
- <%= link_to "继续实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange", :id => "shixun_operation", :remote => true %>
+ <%= link_to "继续实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange", :style=>"display: none", :id => "shixun_operation", :remote => true %>
<% end %>
<% end %>
@@ -111,22 +111,20 @@
学习须知
<% if User.current.manager_of_subject?(@subject) %>
-
+
<% end %>
<%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes %>
-
教学名师
-
+
教学名师
+
<%= image_tag(url_to_avatar(@subject.user), :width =>"40", :height => "40", :class => "bor-radius-all", :alt=>"头像") %>
<%= @subject.user.try(:show_name) %>
<%= @subject.user.school_name + @subject.user.identity %>
-
<%= @subject.user.user_extensions.brief_introduction.blank? ? "暂未填写" : @subject.user.user_extensions.brief_introduction %>
-
+
<%= @subject.user.user_extensions.brief_introduction.blank? ? "暂未填写" : @subject.user.user_extensions.brief_introduction %>
+