From 85c055bdc08e5558b7ba2501de308860bd0da747 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 24 Jan 2014 17:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=8A=A0=E5=85=A5=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=88=97=E8=A1=A8500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users.html.erb     | 6 +++---
 app/views/users/_my_joinedcourse.html.erb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index a4105062b..32e517ab0 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -39,7 +39,7 @@
 									</td>
 										</tr>
 										<tr>
-									<td style="padding-left: 8px"><a><%=link_to "forge.trustie.net/users" ,:controller => 'users', :action => 'index' %></a></td>
+									<td style="padding-left: 8px"><%=link_to "forge.trustie.net/users" ,:controller => 'users', :action => 'index' %></td>
 	<!-- modified by bai -->		<td><%=link_to "主页", home_path %> > <%=link_to "软件创客", :controller => 'users', :action => 'index' %> > <span><%=link_to @user.show_name, user_path %></span></td>
 										</tr>
 									</table>
@@ -173,7 +173,8 @@
 												<td style="padding-left: 5px" width="76px"><%= l(:label_location) %>:</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.location %><%= @user.user_extensions.location_city %></td>
 											</tr>
 											<tr>
-												<td style="padding-left: 5px" width="76px"> <% if @user.user_extensions.identity == 0 %>
+												<% if @user.user_extensions.identity == 0 %>
+												<td style="padding-left: 5px" width="76px">
 												<%= l(:label_technical_title) %>:</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.technical_title %></td>
 												<% end %>
 											</tr>
@@ -190,7 +191,6 @@
 												<td style="padding-left: 8px" width="70px"><%= l(:label_location) %>:</td>
 											</tr>
 											<% end %>
-											</tr>
 											<!-- end -->
 										</table>
 
diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb
index 1471dfd71..f906c7065 100644
--- a/app/views/users/_my_joinedcourse.html.erb
+++ b/app/views/users/_my_joinedcourse.html.erb
@@ -12,7 +12,7 @@
 		<% end %>
 <% else %>
 	<p><%= link_to"#{l(:label_course_view_student)}",{:controller=>'projects',:action=>'course', :course => 1}, :class => 'icon icon-add' %></p>								
-	<%= render :partial => 'course_form' %>
+	<%= render :partial => 'course_form', :locals => {:memberships => @memberships}%>
 	<% end %>
 	
 </div>