From 743ef9856a5e38357e8045e353b45cebb31a3f27 Mon Sep 17 00:00:00 2001
From: xianbo <senluowanxiangt@163.com>
Date: Thu, 31 Oct 2013 17:28:10 +0800
Subject: [PATCH] only teacher can know his tag and modify it

---
 app/views/layouts/base_users.html.erb | 14 +++++++++-----
 app/views/tags/_tag.html.erb          |  5 ++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index f993aa651..5b031bda1 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -149,15 +149,19 @@
 									</div>
 									<!--Modified by nie-->
 									<!--tags-->
-									<div class="user_underline"></div>
+									<% if User.current.logged? %>
+										<% if User.current.admin?||User.current.login==@user.login%>
+											<div class="user_underline"></div>
 									<!-- <div class="user_fans"> -->
 										<!-- added by william -for tag -->
 										<!-- <div class="user_tags"> -->
-										<div class="user_tags">
-											<div id="tags">
-											<%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%>
+											<div class="user_tags">
+												<div id="tags">
+													<%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%>
+												</div>
 											</div>
-										</div>
+										<% end %>
+									<% end %>
 										<!-- </div> -->
 									<!-- </div> -->
 									
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index ef1cedd4a..c3d0cb4b5 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -2,11 +2,10 @@
 	<!-- 1代表是user类型   2代表是project类型  3代表是issue类型  -->
 	<!--  3 代表的是issue 当是issue是 处理方式与前2个对象不同 -->
 	<% if  object_flag == '3' %>
-	<span><%= image_tag("/images/sidebar/tags.png") %></span>
+	<span><%= image_tag("/images/sidebTar/tags.png") %></span>
 	<span class="font_title_tag"><%= l(:label_tag) %>:</span>
-
 	<% if User.current.logged? %>
-	<span> <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %></span>
+		<span> <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %></span>
 	<% end %>
 
 <div id="tags_show_issue">