diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index d91cd0475..e82062e9b 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -46,7 +46,7 @@ ) do |f| %> <% roles.each do |role| %> <ul style="text-align: left;" > - <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role), + <%= radio_button_tag 'membership[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> <!--编辑时候显示成员,中英文切换后面需从数据库的角度优化--> <% if User.current.language == "zh" %> @@ -64,11 +64,11 @@ <!--<br/>--> <% end %> <%= hidden_field_tag 'membership[role_ids][]', '' %> - <div> - <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;"> + <div class="pt5"> + <a href="javascript:void(0)" class="project_member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;"> <%= l(:button_change)%> </a> - <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(30)"> + <a href="javascript:void(0)" class="project_member_btn" onclick="$('#member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(30)"> <%= l(:button_cancel)%> </a> </div> @@ -138,7 +138,7 @@ </li> <% roles.each do |role| %> <li> - <%= check_box_tag 'membership[role_ids][]', role.id %> + <%= radio_button_tag 'membership[role_ids][]', role.id %> <% if User.current.language == "zh" %> <% if role.id == 3 %> <label >管理人员</label> @@ -154,7 +154,7 @@ <% end %> </ul> <div class="cl mb10"></div> - <a href="javascript:void(0)" class="member_btn" onclick="$(this).parent().parent().submit();"> + <a href="javascript:void(0)" class="project_member_btn_right" onclick="$(this).parent().parent().submit();"> 新增成员 </a> </div> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index e044f9d51..27bb66bbb 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -545,6 +545,8 @@ blockquote { .member_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} .member_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;} a.member_btn{ padding:5px; background:#15bccf; color:#fff;} +a.project_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} +a.project_member_btn_right{ padding:2px 5px; background:#15bccf; color:#fff;} a:hover.member_btn{ background:#329cbd;} .pro_table{ text-align:center; color:#333; margin-bottom:20px;} .pro_table tr td{ height:30px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index dc2fecbba..90651f362 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -114,6 +114,7 @@ h4{ font-size:14px; color:#3b3b3b;} .mb10{ margin-bottom:10px !important;} .mb20{ margin-bottom:20px;} .pl15{ padding-left:15px;} +.pt5{ padding-top:5px;} .w20{ width:20px;} .w40{width: 40px;} .w45{ width: 45px;}