diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb
index 48574bca..0fdb1b2c 100644
--- a/app/controllers/praise_tread_controller.rb
+++ b/app/controllers/praise_tread_controller.rb
@@ -10,7 +10,6 @@ class PraiseTreadController < ApplicationController
       @obj_id = params[:obj_id]
       @obj_type = params[:obj_type]
       @obj = find_object_by_type_and_id(@obj_type,@obj_id)
-      # @is_in_list = params[:is_in_list]
       praise_tread_plus(@obj_type,@obj_id,1)  
     end
   end
@@ -46,7 +45,6 @@ class PraiseTreadController < ApplicationController
       @obj_id = params[:obj_id]
       @obj_type = params[:obj_type]
       @obj = find_object_by_type_and_id(@obj_type,@obj_id)
-      # @is_in_list = params[:is_in_list]
       praise_tread_plus(@obj_type,@obj_id,0)   
     end
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 20494dad..e33104f9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -31,7 +31,7 @@ class UsersController < ApplicationController
   accept_api_auth :index, :show, :create, :update, :destroy,:tag_save
   
   #william
-  before_filter :need_login,:only => :tag_save
+  before_filter :require_login,:only => :tag_save
 
 
   helper :sort
diff --git a/app/helpers/praise_tread_helper.rb b/app/helpers/praise_tread_helper.rb
index 26e4e5f4..90ce6d61 100644
--- a/app/helpers/praise_tread_helper.rb
+++ b/app/helpers/praise_tread_helper.rb
@@ -9,17 +9,18 @@ module PraiseTreadHelper
   end
   #end
 
-  def get_praise_num(object,flag)
+  def get_praise_num(object)
     @obj_type = object.class
     @obj_id = object.id
     @record = PraiseTreadCache.find_by_object_id_and_object_type(@obj_id,@obj_type)
     if @record
-      case flag
-      when 1
-        return @record.praise_num.nil? ? 0 : @record.praise_num
-      when 0
-        return @record.tread_num.nil? ? 0 : @record.tread_num
-      end
+      # case flag
+      # when 1
+        # return @record.praise_num.nil? ? 0 : @record.praise_num
+      # when 0
+        # return @record.tread_num.nil? ? 0 : @record.tread_num
+      # end
+      return (@record.praise_num.to_i-@record.tread_num.to_i)
     else
     return 0
     end
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 2917bdf4..e03587c5 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -2,6 +2,8 @@
 
 <h3><%= issue_heading(@issue) %></h3>
 
+<style type="text/css"></style>>
+
 <div class="<%= @issue.css_classes %> details">
   <% if @prev_issue_id || @next_issue_id %>
     <div class="next-prev-links contextual">
@@ -37,7 +39,7 @@
         </p>
         <!-- added by william -for tag -->
 	<div id="tags">
-		<%= render :partial => 'layouts/tag', :locals => {:obj => @issue,:object_flag => "3" }%>
+		<%= render :partial => 'tags/tag', :locals => {:obj => @issue,:object_flag => "3" }%>
 	</div>
 <table class="attributes">
 <%= issue_fields_rows do |rows|
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb
index 46b1f69c..595b5d54 100644
--- a/app/views/layouts/base_bids.html.erb
+++ b/app/views/layouts/base_bids.html.erb
@@ -66,7 +66,7 @@
 										<table style="font-family:微软雅黑">												
 											<tr>
 												<td><!-- added by william -for tag -->					
-													<%= render :partial => 'layouts/tag', :locals => {:obj => @bid, :object_flag => "4"}%>
+													<%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"}%>
 												</td>
 											</tr>
 										</table>
diff --git a/app/views/layouts/base_old.html.erb b/app/views/layouts/base_old.html.erb
index 32da883f..25a9b6fe 100644
--- a/app/views/layouts/base_old.html.erb
+++ b/app/views/layouts/base_old.html.erb
@@ -109,7 +109,7 @@
 									<div class="tag_font">
 										<!-- added by william -for tag -->
 										<div id="tags">
-											<%= render :partial => 'layouts/tag', :locals => {:obj => @project,:object_flag => "2"}%>
+											<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
 										</div>
 									</div>
 
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 26abb660..96120648 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -47,7 +47,7 @@
 									<div class="tags">
 										<!-- added by william -for tag -->
 										<div id="tags">
-											<%= render :partial => 'layouts/tag', :locals => {:obj => @project,:object_flag => "2"}%>
+											<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
 										</div>
 									</div>
 								</div>
diff --git a/app/views/praise_tread/_praise_tread.html.erb b/app/views/praise_tread/_praise_tread.html.erb
index 4ed2328c..5c90b972 100644
--- a/app/views/praise_tread/_praise_tread.html.erb
+++ b/app/views/praise_tread/_praise_tread.html.erb
@@ -1,4 +1,5 @@
 <!-- get_praise_num(obj,1)函数中 1代表返回顶得次数 0返回踩的次数  -->
+   <% if User.current.logged? %>
    <div id="praise_tread_<%= obj.id %>" style="float:right;">
 
 		<% @is_valuate = is_praise_or_tread(obj,user_id)%>
@@ -10,7 +11,7 @@
 				<td ><%= image_tag("/images/praise_tread/praise_true.png") %></td>
 			</tr>
 			<tr>
-				<td align="center"><strong class="font_small_watch">+<%= get_praise_num(obj,1)%></strong></td>
+				<td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
 			</tr>
 		     
 			<tr>
@@ -24,7 +25,7 @@
 			</tr>
 			
 			<tr>
-				<td align="center"><strong class="font_small_watch">-<%= get_praise_num(obj,0)%></strong></td>
+				<td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
 			</tr>
 			<tr>
 				<td><%= image_tag("/images/praise_tread/tread_true.png") %> </td>
@@ -40,11 +41,7 @@
 				:controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class%> </td>
 			</tr>
 			<tr>
-				<td align="center">+<strong class="font_small_watch"><%= get_praise_num(obj,1)%></strong></td>
-			</tr>
-			 <tr><td align="center">---</td></tr>
-			<tr>
-				<td align="center">-<strong class="font_small_watch"><%= get_praise_num(obj,0)%></strong></td>
+				<td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
 			</tr>
 			<tr>
 				<td> <%= link_to image_tag("/images/praise_tread/tread_false.png"),:controller=>"praise_tread",
@@ -55,3 +52,4 @@
 		<% end %>
 </div>
 
+<% end %>
diff --git a/app/views/praise_tread/tread_plus.js.erb b/app/views/praise_tread/tread_plus.js.erb
new file mode 100644
index 00000000..89efec2d
--- /dev/null
+++ b/app/views/praise_tread/tread_plus.js.erb
@@ -0,0 +1,5 @@
+
+$('#praise_tread_<%= @obj.id %>').html('<%= j(
+render :partial => "/praise_tread/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id}
+)%>');
+
diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
index 33a27076..a89c79e5 100644
--- a/app/views/projects/_project.html.erb
+++ b/app/views/projects/_project.html.erb
@@ -44,7 +44,7 @@
 	<!-- added by william -for tag -->
 	<div id="tags">
 		<%= tag('img', {:src => "/images/sidebar/tags.png"}, false, false) %>
-		<%= render :partial => 'layouts/tag_name', :locals => {:obj => @project,:object_flag => "2",:non_list_all => true }%>
+		<%= render :partial => 'tags/tag_name', :locals => {:obj => @project,:object_flag => "2",:non_list_all => true }%>
 		
 	</div>
 </div>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
new file mode 100644
index 00000000..3b3768fb
--- /dev/null
+++ b/app/views/tags/_tag.html.erb
@@ -0,0 +1,47 @@
+<div id="tags">
+	<% if User.current.logged? %>
+	  <%= tag('img', {:src => "/images/sidebar/tags.png"}, false, false) %>
+	<% end %>
+	<strong><label><%= l(:label_tag) %>:</label></strong>
+	<!-- 1代表是user类型   2代表是project类型  3代表是issue类型  -->
+	<!--  3 代表的是issue 当是issue是 处理方式与前2个对象不同 -->
+  <% if  object_flag == '3' %>
+    <% if User.current.logged? %>
+	  <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %>
+	<% end %>
+	<div id="tags_show_issue">
+		<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
+	</div>
+	<div id="put-tag-form-issue" style="display: none">
+		<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
+		:update => "tags_show",
+		:complete => '$("#put-tag-form-issue").hide();' do |f| %>
+		<%= f.text_field :name ,:id => "name-issue",:size=>"30" %>
+		<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
+		<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+		<%= f.submit "add"%>
+		<%= link_to_function l(:button_cancel), '$("#put-tag-form-issue").hide();'%>
+		<% end %>
+	</div>
+</div>
+
+<% else %>
+<% if User.current.logged? %>
+<%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %>
+<% end %>
+<div id="tags_show">
+	<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
+</div>
+<div id="put-tag-form" style="display: none">
+	<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
+	:update => "tags_show",
+	:complete => '$("#put-tag-form").hide();' do |f| %>
+	<%= f.text_field :name ,:id => "name",:size=>"28"%>
+	<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
+	<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+	<%= f.submit "add"%>
+	<%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();'%>
+	<% end %>
+</div>
+</div>
+<% end %>
diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
new file mode 100644
index 00000000..ceffa0ad
--- /dev/null
+++ b/app/views/tags/_tag_name.html.erb
@@ -0,0 +1,61 @@
+<style type="text/css">
+	.click {
+		background: #b77b1b;
+	}
+	.unclick {
+		background: #b77b1b;
+	}
+	#tag {
+		background: url(/images/issue_tag.png) no-repeat right -19px;
+		border-radius: 5px 5px 5px 5px;
+		color: #3a587d !important;
+		padding: 0px 4px;
+		margin: 3px;
+		display: inline-block;
+		font-size: 11px;
+		text-decoration: none;
+		cursor: pointer;
+	}
+	#tag:hover {
+		color: #fff;
+	}
+	a:visited {
+		text-decoration: none;
+	}
+</style>
+<!-- 1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求-->
+<% @tags = obj.reload.tag_list %>
+
+<% if non_list_all and (@tags.size > 0) %>
+<!-- 这里是显示的非主页的tag 所以当tag数量较多时 不必全部显示 用“更多”代替  -->
+<% if @tags.size > Setting.show_tags_length.to_i then %>
+<% i = 0 %>
+<% until i>Setting.show_tags_length.to_i do %>
+<div id="tag" class="click unclick">
+	<%= link_to @tags[i], :controller => "tags",:action => "index",:q => @tags[i],:object_flag => object_flag,:obj_id => obj.id %>
+</div>
+<% i += 1%>
+<% end %>
+<%= link_to l(:label_more_tags),:action => "show",:id => obj.id %>
+
+<% else %>
+
+<% @tags.each do |tag| %>
+<div id="tag" class="click unclick">
+	<%= link_to tag,:controller => "tags",:action => "index",:q=>tag,:object_flag => object_flag,:obj_id => obj.id
+%>
+</div>
+<% end %>
+<% end %>
+
+<% else %>
+<!-- 用来显示三大对象的主页中的tag  故是全部显示  -->
+<% if @tags.size > 0  %>
+<% @tags.each do |tag| %>
+<div id="tag" class="click unclick">
+	<%= link_to tag,:controller => "tags",:action => "index",:q=>tag ,:object_flag => object_flag,:obj_id => obj.id %>
+</div>
+<% end %>
+<% end %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/show_old.html.erb b/app/views/users/show_old.html.erb
index c5eed8d8..9ce6c160 100644
--- a/app/views/users/show_old.html.erb
+++ b/app/views/users/show_old.html.erb
@@ -149,7 +149,7 @@
 	<div class="newsplitcontentleft">
 		<!-- added by william -for tag -->
 		<div id="tags">
-			<%= render :partial => 'layouts/tag', :locals => {:obj => @user,:object_flag => "1"}%>
+			<%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%>
 		</div>
 	</div>
 </div>
diff --git a/app/views/users/tag_save.js.erb b/app/views/users/tag_save.js.erb
index a5a07b0b..6b13f6b4 100644
--- a/app/views/users/tag_save.js.erb
+++ b/app/views/users/tag_save.js.erb
@@ -1,12 +1,12 @@
 
 
 <% if @obj_flag == '3'%>
-$('#tags_show_issue').html('<%= escape_javascript(render :partial => 'layouts/tag_name',
+$('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
 $('#put-tag-form-issue').hide();
 $('#name-issue').val("");
 <% else %>
-$('#tags_show').html('<%= escape_javascript(render :partial => 'layouts/tag_name',
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
 $('#put-tag-form').hide();
 $('#name').val("");
diff --git a/public/images/issue_tag.png b/public/images/issue_tag.png
new file mode 100644
index 00000000..eacaf7a5
Binary files /dev/null and b/public/images/issue_tag.png differ