From 28321deeb54ad199d225dff5a9fbe6aa02d39cfa Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Thu, 12 Mar 2015 18:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=82=80=E8=AF=B7=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb        |  4 +--
 .../projects/invite_members_by_mail.html.erb  | 35 ++++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f1f026029..44e5fd8a3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -338,12 +338,12 @@ class ProjectsController < ApplicationController
       email = params[:mail]
       Mailer.send_invite_in_project(email, @project, User.current).deliver
       @is_zhuce =false
-      flash[:notice] = l(:notice_successful_update)
+      flash[:notice] = l(:notice_email_sent, :value => email)
     else
       @is_zhuce = true
     end
     respond_to do |format|
-      format.js
+      format.html{redirect_to invite_members_by_mail_project_url(@project)}
     end
   end
   #发送邮件邀请新用户
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 383b53288..42a27376b 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1,16 +1,26 @@
 <script>
-    function verifyAddress(obj) {
-        var email = document.getElementsByName('mail');
+    function verifyAddress() {
+        var email = $('#mail').val();
         var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-        if (filter.test(email.value)&& !(email.value == null)) return true;
-            else
-            {
-                document.getElementById('valid_email').innerHTML = "您所填写的电子邮件格式不正确";
-                document.getElementById('valid_email').style.color = "#FF0000";
-                return false;
-            }
-
+        if (email == "" || filter.test(email)) {
+            $("#valid_email").html("");
+        }
+        else
+        {
+            $("#valid_email").html("您所填写的电子邮件格式不正确");
         }
+    }
+
+
+//        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">邀请加入</h2>
@@ -28,8 +38,9 @@
 		<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',:remote=>true) do %>
-				<%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email) %>
+			<%= 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), :onblur => "verifyAddress();" %>
                 <div class="cl"></div>
                 <div class="cl"></div>
                 <a href="#" class="btn_free" onclick="$(this).parent().submit();">