Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/tags/_tag_name.html.erb

@@ -94,6 +94,13 @@
                                           :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 	     <% end %>
 	    <% end %>
+      <!--添加的删除标签（0814添加）  -->
+      <% if obj.author_id == User.current.id %>
+
+	          <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
+                                             :taggable_id => obj.id, :taggable_type => object_flag %> </span>
+
+	         <% end %>
     </span>
 
             </div>