From c39e0bf3db834e109d7a1dac292cccc8ac030875 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 4 Jun 2015 10:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E6=B7=BB=E5=8A=A0=EF=BC=9A=20=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=AD=89=E5=BE=85=20=E5=B7=B2=E9=82=80=E8=AF=B7=E7=9A=84?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                          |  4 +
 .../projects/invite_members_by_mail.html.erb  | 77 +++++++++++--------
 public/stylesheets/project.css                |  1 +
 3 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 001d1b1f6..56fe1e6a9 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -74,6 +74,10 @@ class Mailer < ActionMailer::Base
     @project_name = "#{project.name}"
     @user = user
     @project = project
+    inviter_lists = InviteList.where(project_id:@project.id, user_id:@user.id).all
+    if inviter_lists.blank?
+      InviteList.create(:user_id => user.id, :project_id => project.id)
+    end
     @token = Token.get_token_from_user(user, 'autologin')
     @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true, :token => @token.value)
     mail :to => email, :subject => @subject
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 7cad9bff3..ce7ea2aa1 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -45,44 +45,55 @@
     }
 
 
-//        if (filter.test(email)&& !(email.value == null)) return true;
-//            else
-//            {
-//                document.getElementById('valid_email').innerHTML = "您所填写的电子邮件格式不正确";
-//                document.getElementById('valid_email').style.color = "#FF0000";
-//                return false;
-//            }
-//
-//        }
+    //        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="box_main">
-		<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>
-              <ul>
-                <li>
-                <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "this.value=this.value.replace(' ','')", :style => "ime-mode:disabled;", :onblur => "verifyAddress(this);" %>
-                </li>
-              </ul>
-                <div class="cl"></div>
-                <a href="#" class="btn_free" onclick="senderEmail($(this));">
-                    <%= l(:label_send_email)%>
-                </a>
+  <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>
+      <ul>
+        <li>
+          <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "this.value=this.value.replace(' ','')", :style => "ime-mode:disabled;", :onblur => "verifyAddress(this);" %>
+        </li>
+      </ul>
+      <div class="cl"></div>
+      <a href="#" class="btn_free" onclick="senderEmail($(this));">
+        <%= l(:label_send_email)%>
+      </a>
+  <% end %>
+  <%# 邀请用户的状态 %>
+  <% unless @inviter_lists.blank? %>
+      <div>
+        <span class="status_inviter">已邀请的用户</span><br/>
+        <% @inviter_lists.each do |inviter_list| %>
+            <%= inviter_list.user.name %><br/>
+        <% end %>
+        </br>
+        <span class="status_inviter">等待加入项目的用户</span><br/>
+        <% @inviter_lists.each do |inviter_list| %>
+            <% unless inviter_list.user.member_of?(@project) %>
+                <%= inviter_list.user.name %><br/>
+            <% end %>
+        <% end %>
+      </div>
+  <% end %>
+</div>
 
-			<% end %>
-		</div>
 
-</div>
 
-<div><% @inviter_lists.each do |inviter_list| %>
-        <%= inviter_list.user.name %>
-        <% end
-        %></div>
\ No newline at end of file
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 5a6d98fbe..6cba7011f 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -49,6 +49,7 @@ a.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px  no-repea
 a:hover.icon_removem{background:url(../images/img_floatbox.png) -22px -61px  no-repeat;}
 a.btn_free{ background:#ff5722; display:block;  text-align:center; color:#fff; padding:3px 0; width:80px; margin-bottom:10px;}
 a:hover.btn_free{ background:#d63502;}
+.status_inviter{color: #3CA5C6;font-weight: bold; font-size: 14px }
 /*成员邀请*/
 .invi_search{ }
 .invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}