jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

完成新的邮件邀请界面

This commit is contained in:
huang 2015-04-09 10:25:46 +08:00
parent 45a03bac1b
commit 4d4e1cac8b
4 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/views/projects/invite_members.html.erb
View File

@ -13,36 +13,28 @@
members = @project.member_principals.includes(:roles, :principal).all.sort
%>
<div style="margin-left: 30px" >
<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"><%= l(:label_invite_trustie_user) %></h3>
<% if roles.any? %>
<%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :method => :post}) do |f| %>
<div class="box_main">
<h3 class="box_h3"><%= l(:label_invite_trustie_user) %></h3>
<% if roles.any? %>
<%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :method => :post}) do |f| %>
<div class="invi_search">
<input hidden="hidden" value="true" name="flag">
<input id="principal_search" class="invi_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
<%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js',:flag => true) }')" %>
<div class="cl"></div>
<div id="principals_for_new_member">
<%= render_project_members(@project) %>
</div>
<div class="cl"></div>
<ul class="rolebox">
<li class="fl mr5">
<ul class="mb5">
<li>
<%= l(:label_role_plural) %>:
</li>
<% roles.each do |role| %>
<li class="fl mr5">
<%= check_box_tag 'membership[role_ids][]', role.id %>
<%= h role %>
</li>
<li class="fl mr5">
<%= check_box_tag 'membership[role_ids][]', role.id %>
<%= h role %>
</li>
<% end %>
</ul>
<div class="cl mb10"></div>
@ -50,13 +42,8 @@
<%= l(:label_invite_members)%>
</a>
</div>
<!--<p>-->
<!--<%#= submit_tag l(:label_invite_members), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %>-->
<!--</p>-->
<% end %>
<% end %>
</div>
</div>
</div>
<script type="text/javascript">
$(document).ready(function () {

11
app/views/projects/invite_members_by_mail.html.erb
View File

@ -58,14 +58,7 @@
<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>
<div class="box_main">
<p class="box_p">
<%= l(:label_invite_email_tips)%>
</p>
@ -85,5 +78,5 @@
<%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %>
<% end %>
</div>
</div>
</div>

2
config/locales/projects/zh.yml
View File

@ -216,7 +216,7 @@ zh:
#
label_invite_new_user: "发送邮件邀请新用户"
label_invite_join: 邀请加入
label_invite_email_tips: 输入好友的邮箱地址，Trustie会自动为该好友注册邮箱用户！
label_invite_email_tips: 输入好友的邮箱地址，Trustie会自动为该好友注册平台账号！
notice_registed_error: 您输入的邮箱地址为空或者该邮箱已被注册!
label_input_email_blank: 您输入的邮箱地址为空！
label_email_format_error: 您输入的邮箱格式不正确！

6
public/stylesheets/project.css
View File

@ -34,9 +34,9 @@ a:hover.project_txt{ color:#066e9a;}
a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
/*邮件邀请*/
.box_main{ width:345px; margin:0 auto;}
.box_main{}
.box_main02{ width:390px; margin:15px auto;}
.box_h3{ color:#15bccf; text-align:center; font-size:16px;}
.box_h3{ color:#15bccf; font-size:16px;}
.box_p{ color:#404040; margin-bottom:5px;}
.fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}
a.icon_addm{ background:url(../images/img_floatbox.png) 0 -33px no-repeat; width:16px; height:16px; display:block; margin:5px 0 0 5px;}
@ -46,7 +46,7 @@ a:hover.icon_removem{background:url(../images/img_floatbox.png) -22px -61px no-
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;}
/*成员邀请*/
.invi_search{ margin-left:50px;}
.invi_search{ }
.invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;}