From e171f7b249144cd948cdc90612955eba3648fc9e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 Mar 2015 16:07:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_tag_name.html.erb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index b97012723..5b2e35812 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/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 %>
+                </span>
+            <% end %>
             <% else %>
                 <div id="tag">
                 <span class="tag_show">
@@ -47,7 +52,7 @@
                            <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
                                                         :taggable_id => obj.id, :taggable_type => object_flag %>
                          </span>
-                      <% end %>
+                      <% end %>                    
                      <% when '3' %>
                        <% if (ProjectInfo.find_by_project_id(obj.project_id)).try(:user_id) == User.current.id %>
                         <span class='del'>

From ec8b7e4128c2503565e5bb5f8efd06deea66662a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 Mar 2015 16:12:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AEtag?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_tag_name.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 5b2e35812..2ee4d3f20 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -38,8 +38,8 @@
                 <% 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 %>
-                </span>
-            <% end %>
+                <% end %>
+                </span>     
             <% else %>
                 <div id="tag">
                 <span class="tag_show">

From 72d41fd07ae937b613f7c01cc370bcffbe10aabf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 Mar 2015 16:17:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E9=82=80=E8=AF=B7=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/invite_members_by_mail.html.erb  | 134 +++++++++---------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index c222bece1..e6bb1be4e 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1,68 +1,68 @@
-<script>
-    function verifyAddress() {
-        var email = $.trim($('#mail').val());
-        var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-        if(email == "")
-        {
-            $("#valid_email").html("电子邮件不能为空");
-        }
-        else if (filter.test(email)) {
-            $("#valid_email").html("");
-            return true;
-        }
-        else
-        {
-            $("#valid_email").html("您所填写的电子邮件格式不正确");
-        }
-        return false;
-    }
-
-    function senderEmail(obj)
-    {
-        if(verifyAddress())
-        {
-            obj.parent().submit();
-        }
-    }
-
-
-//        if (filter.test(email)&& !(email.value == null)) return true;
-//            else
-//            {
-//                document.getElementById('valid_email').innerHTML = "您所填写的电子邮件格式不正确";
-//                document.getElementById('valid_email').style.color = "#FF0000";
-//                return false;
-//            }
-//
-//        }
-</script>
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_invite_join)%></h2>
-</div>
-<div  class="floatbox" style="margin:130px;">
-	<div >
-		<a href="#" class="box_close"></a>
-	</div>
-	<div class="cl"></div>
-	<div class="box_main">
-		<div style="padding-left: 20px;">
-		<h3 class="box_h3"><%= l(:label_invite_new_user)%></h3>
-		<p class="box_p">
-			<%= l(:label_invite_email_tips)%>
-		</p>
-		<div id="is_registed">
-			<%= render :partial => 'regested', locals: { :isregisted => false} %>
-		</div>
-			<%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %>
-				<span id="valid_email" style="color: #FF0000;"></span>
-                <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "verifyAddress();" %>
-                <div class="cl"></div>
-                <div class="cl"></div>
-                <a href="#" class="btn_free" onclick="senderEmail($(this));">
-                    <%= l(:label_send_email)%>
-                </a>
-				<%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %>
-			<% end %>
-		</div>
-	</div>
+<script>
+    function verifyAddress() {
+        var email = $.trim($('#mail').val());
+        var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+        if(email == "")
+        {
+            $("#valid_email").html("电子邮件不能为空");
+        }
+        else if (filter.test(email)) {
+            $("#valid_email").html("");
+            return true;
+        }
+        else
+        {
+            $("#valid_email").html("您所填写的邮件格式不正确");
+        }
+        return false;
+    }
+
+    function senderEmail(obj)
+    {
+        if(verifyAddress())
+        {
+            obj.parent().submit();
+        }
+    }
+
+
+//        if (filter.test(email)&& !(email.value == null)) return true;
+//            else
+//            {
+//                document.getElementById('valid_email').innerHTML = "您所填写的电子邮件格式不正确";
+//                document.getElementById('valid_email').style.color = "#FF0000";
+//                return false;
+//            }
+//
+//        }
+</script>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_invite_join)%></h2>
+</div>
+<div  class="floatbox" style="margin:130px;">
+	<div >
+		<a href="#" class="box_close"></a>
+	</div>
+	<div class="cl"></div>
+	<div class="box_main">
+		<div style="padding-left: 20px;">
+		<h3 class="box_h3"><%= l(:label_invite_new_user)%></h3>
+		<p class="box_p">
+			<%= l(:label_invite_email_tips)%>
+		</p>
+		<div id="is_registed">
+			<%= render :partial => 'regested', locals: { :isregisted => false} %>
+		</div>
+			<%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %>
+				<span id="valid_email" style="color: #FF0000;"></span>
+                <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "verifyAddress();" %>
+                <div class="cl"></div>
+                <div class="cl"></div>
+                <a href="#" class="btn_free" onclick="senderEmail($(this));">
+                    <%= l(:label_send_email)%>
+                </a>
+				<%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %>
+			<% end %>
+		</div>
+	</div>
 </div>
\ No newline at end of file