diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c9f6e8525..1862eb4c5 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -43,7 +43,7 @@
- <%=link_to request.host()+"/course", :controller => 'projects', :action => 'course' %> |
+ <%=link_to request.host()+"/course", :controller => 'projects', :action => 'course' %> |
<%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> > <%=link_to @project.name, nil %> |
@@ -79,8 +79,8 @@
<%= render :partial => 'courses/set_course_time', :locals => {:project => @project}%>
<% else %>
- <%= join_in_course(@project, User.current) %>
- <% end %>
+ <%= join_in_course(@project, User.current) %>
+ <% end %>
<% unless User.current.member_of?(@project) %>
@@ -88,7 +88,7 @@
<%= watcher_link(@project, User.current) %>
<% end %>
<% end %>
-
+
@@ -233,8 +233,8 @@
<% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 7, 9)).size >0))%>
-
<% end %>
+
<%= render_flash_messages %>
<%= yield %>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 391e6b956..6f7e5d5ef 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -104,7 +104,7 @@
<%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %>
- <% if !@topic.locked? && authorize_for('messages', 'reply') %>
+
@@ -172,7 +172,7 @@
-
+<% if !@topic.locked? && authorize_for('messages', 'reply') %>
<%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f, :replying => true} %>