From 0402fee6deda19d6d5f29dda9d51f1891378e2c5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 9 Mar 2015 11:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E9=82=80?=
=?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../projects/_invite_members_by_mail.html.erb | 24 ------------------
app/views/projects/invite_members.html.erb | 6 +----
.../projects/invite_members_by_mail.html.erb | 25 ++++++++++++++++++-
.../projects/invite_members_by_mail.js.erb | 10 --------
4 files changed, 25 insertions(+), 40 deletions(-)
delete mode 100644 app/views/projects/_invite_members_by_mail.html.erb
delete mode 100644 app/views/projects/invite_members_by_mail.js.erb
diff --git a/app/views/projects/_invite_members_by_mail.html.erb b/app/views/projects/_invite_members_by_mail.html.erb
deleted file mode 100644
index 42a36bce0..000000000
--- a/app/views/projects/_invite_members_by_mail.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="floatbox" style="margin:100px;">
- <div ><a href="#" class="box_close"></a></div>
- <div class="cl"></div>
- <div class="box_main">
- <h3 class="box_h3">发送邮件邀请新用户</h3>
- <p class="box_p">输入好友邮箱地址，Trustie帮您免费发送！</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',:remote=>true) do %>
- <ul>
- <li >
- <%= text_field_tag 'mail', '邮箱', :class => "fb_item fl" %>
- </li>
- <div class="cl"></div>
-
- <div class="cl"></div>
- </ul>
- <%= submit_tag '免费发送', :class=> "btn_free" %>
-
- <% end %>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb
index 8b0a5a183..d31a5bbe8 100644
--- a/app/views/projects/invite_members.html.erb
+++ b/app/views/projects/invite_members.html.erb
@@ -44,11 +44,7 @@
<% end %>
<% end %>
</div>
-
-
-
- </div>
-
+ </div>
</div>
</div>
<script type="text/javascript">
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index c2a519167..70628094b 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1 +1,24 @@
-<%= render :partial => "invite_members_by_mail"%>
\ No newline at end of file
+<div class="project_r_h">
+ <h2 class="project_h2">邀请加入</h2>
+</div>
+<div class="floatbox" style="margin:130px;">
+ <div >
+ <a href="#" class="box_close"></a>
+ </div>
+ <div class="cl"></div>
+ <div class="box_main">
+ <h3 class="box_h3">发送邮件邀请新用户</h3>
+ <p class="box_p">
+ 输入好友邮箱地址，Trustie帮您免费发送！
+ </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',:remote=>true) do %>
+ <%= text_field_tag 'mail', '邮箱', :class => "fb_item fl" %>
+ <div class="cl"></div>
+ <div class="cl"></div>
+ <%= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %>
+ <% end %>
+ </div>
+</div>
\ No newline at end of file
diff --git a/app/views/projects/invite_members_by_mail.js.erb b/app/views/projects/invite_members_by_mail.js.erb
deleted file mode 100644
index 8edaf7210..000000000
--- a/app/views/projects/invite_members_by_mail.js.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'invite_members_by_mail') %>');
-showModal('ajax-modal', '513px');
-$('#ajax-modal').css('height','569px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
- "<a href='#' onclick='hidden_homework_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().removeClass("alert_praise");
-$('#ajax-modal').parent().css("top","").css("left","");
-$('#ajax-modal').parent().addClass("alert_box");
-