From 8335c111c70a3d1bbe4ccb0af70b62d4280b153c Mon Sep 17 00:00:00 2001
From: baiyu <whitefeather0126@gmail.com>
Date: Tue, 15 Oct 2013 09:39:42 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=86=E2=80=9C?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B=E2=80=9D=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=86=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E9=87=8C=E7=9A=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb    | 12 ++++++++++++
 app/views/my/account.html.erb        |  2 +-
 app/views/projects/_project.html.erb | 10 +++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c16ff2f57..b42f13035 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -248,6 +248,18 @@ module ApplicationHelper
         classes = (ancestors.empty? ? 'root' : 'child')
         s << "<li class='project-table'><div class='#{classes}'>"
         s << h(block_given? ? yield(project) : project.name)
+        unless User.current.member_of?(@project)
+          s << "<span style = 'float: right;'>"
+          s << watcher_link(@project, User.current)
+          s << "</span>"
+        end
+        if @project.project_type == 1
+          unless Course.find_by_extra(@project.identifier).tea_id == User.current.id
+            s << "<span style = 'float: right;'>"
+            s << join_in_course(@project, User.current)
+            s << "</span>"
+          end
+        end
         s << (render :partial => 'projects/project', :locals => {:project => project}).to_s
         s << "</div>\n"
         ancestors << project
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 0cceb69ac..ca392ead7 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -59,7 +59,7 @@
 		
 		<!-- added by bai 单位-->
 		<% unless @user.user_extensions.nil?%>
-		<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%>
+		<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%>&nbsp;<%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%>
 		</p>
 		<%else%>
 		<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", nil, :class => 'occupation'%>
diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
index ae0a397fe..69e9776f8 100644
--- a/app/views/projects/_project.html.erb
+++ b/app/views/projects/_project.html.erb
@@ -63,7 +63,7 @@
 </div>
 <div class="add-info">
 	<div class="main-language">
-		<!-- add by huang -->
+		<!-- added by huang -->
 		<% if(@project.project_type==1)%>
 		<%= content_tag('span', "#{l(:field_tea_name)}: ") %>
 		<% else %>
@@ -86,16 +86,16 @@
 		<%= content_tag('span', "#{l(:label_create_time)}: ") %><%= content_tag('span', format_time(@project.created_on)) %>
 	</div>
 	<!--   added by  liuping  -->
-	<% unless User.current.member_of?(@project) %>
-	<!-- del by nyan -->
+	<!-- <% unless User.current.member_of?(@project) %>
+	
 	<%= watcher_link(@project, User.current) %>
 	<% end %>
 	<span style="float: right; margin-right: 100px">
 	<% if @project.project_type == 1 %>
-	<% unless Course.find_by_extra(@project.identifier).tea_id == User.current.id%>
+	<% unless Course.find_by_extra(@project.identifier).tea_id == User.current.id %>
 	<%= join_in_course(@project, User.current)%>
 	<% end %>
-	<% end %>
+	<% end %> -->
 	</span>
 
 </div>