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

app/views/projects/invite_members_by_mail.html.erb

@@ -12,7 +12,7 @@
         }
         else
         {
-            $("#valid_email").html("您所填写的电子邮件格式不正确");
+            $("#valid_email").html("您所填写的邮件格式不正确");
         }
         return false;
     }

app/views/tags/_tag_name.html.erb

@@ -34,7 +34,12 @@
             <!--项目暂时单独出来，后面重构-->
             <% if object_flag == '2' %>
                 <span class="re_tag f_l">
-                <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %></span>
+                <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
+                <% if (ProjectInfo.find_by_project_id(obj.id)).try(:user_id) == User.current.id %>               	
+                    	<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
+                                         :taggable_id => obj.id, :taggable_type => object_flag %>
+                <% end %>
+                </span>     
             <% else %>
                 <div id="tag">
                 <span class="tag_show">