From 28a5eff048e67664a1edba3940d103d780702386 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 11 Apr 2014 16:44:02 +0800
Subject: [PATCH] =?UTF-8?q?topics=E6=9C=AA=E7=99=BB=E5=BD=95footer?=
 =?UTF-8?q?=E9=A3=9E=E5=87=BA=E5=8E=BB=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=93=A6=E5=B1=81=E8=82=A1+10086,dom=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E8=BF=98=E6=9C=89=E9=94=99=EF=BC=8C=E6=89=BE=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb | 10 +++++-----
 app/views/messages/show.html.erb        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

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 @@
 									</td>
 								</tr>
 								<tr>
-									<td style="padding-left: 8px"><a><%=link_to request.host()+"/course", :controller => 'projects', :action => 'course' %></a></td>
+									<td style="padding-left: 8px"><%=link_to request.host()+"/course", :controller => 'projects', :action => 'course' %></td>
 									<td><p class="top-content-list"><%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> > <%=link_to @project.name, nil %></p></td>
 								</tr>
 							</table>							
@@ -79,8 +79,8 @@
 													<%= render :partial => 'courses/set_course_time', :locals => {:project => @project}%>
 												<% else %>
 										
-													<%= join_in_course(@project, User.current) %></div>
-												<% end %> </div>
+													<%= join_in_course(@project, User.current) %>
+												<% end %> 
 												<% unless User.current.member_of?(@project) %>
 												<!-- <%= image_tag "/images/fav.png" %> -->
 												<div style="padding-right: 10px">
@@ -88,7 +88,7 @@
 												<%= watcher_link(@project, User.current) %></span></div>
 												<% end %>
 											<% end %>
-											
+											</div>
 												</td></tr></table>
 										  </td>
 										</tr>
@@ -233,8 +233,8 @@
 									<!-- <li><%= link_to(l(:label_course_repository), {:controller => 'repositories', :action => 'show', :id => @project, :repository_id => nil, :path => nil, :rev => nil, :course => 1 })%></li> -->
 									<% 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))%>
 
-								</ul>
 								<% end %>
+								</ul>
 							</div>
 							<%= 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 @@
 		
 			<div style="float: right"><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></div>
 		</div>
-		<% if !@topic.locked? && authorize_for('messages', 'reply') %>
+		
 
 			
 
@@ -172,7 +172,7 @@
 
 
 
-
+<% if !@topic.locked? && authorize_for('messages', 'reply') %>
 <div id="reply" style="display:none;">
 	<%= 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} %>