Download as
Browse Code »

Commit 1ce55d161aaac051cb65963c01e94e718a3a46a3

Authored by Dmitriy Zaporozhets
1 parent 46e77db0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

new team memeber selectbox replaced

Showing 6 changed files with 8 additions and 9 deletions   Show diff stats
app/views/projects/_team.html.haml
  Diff comments   View file @1ce55d1
... ... @@ -5,7 +5,6 @@
5 5 %table.round-borders#team-table
6 6 %thead
7 7 %th Name
8   - %th Email
9 8 %th Web
10 9 %th Git
11 10 %th Admin
... ...
app/views/team_members/_form.html.haml
  Diff comments   View file @1ce55d1
... ... @@ -8,7 +8,7 @@
8 8 .span-6.append-bottom
9 9 %b Name
10 10 .span-6
11   - = f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
  11 + = f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, { :style => "width:300px" })
12 12 .span-6
13 13 %b Access:
14 14 .span-6
... ...
app/views/team_members/_show.html.haml
  Diff comments   View file @1ce55d1
... ... @@ -3,9 +3,9 @@
3 3 %td
4 4 = link_to image_tag(gravatar_icon(user.email), :class => "left", :width => 40, :style => "padding:0 5px;"), project_team_member_path(@project, member)
5 5  
6   - = link_to truncate(user.name, :lenght => 16), project_team_member_path(@project, member)
7   -
8   - %td= truncate user.email, :lenght => 16
  6 + = link_to truncate(user.name, :lenght => 24), project_team_member_path(@project, member)
  7 + %br
  8 + .cgray{:style => "padding-top:10px;"}= truncate user.email, :lenght => 24
9 9 - if can? current_user, :admin_project, @project
10 10 = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
11 11 %td= f.check_box :read, :onclick => "$(this.form).submit();"
... ...
app/views/team_members/create.js.haml
  Diff comments   View file @1ce55d1
... ... @@ -6,4 +6,4 @@
6 6 :plain
7 7 $("#new_tm_dialog").empty();
8 8 $("#new_tm_dialog").append("#{escape_javascript(render('form'))}");
9   - $('select#team_member_user_id').selectmenu({width:300});
  9 + $('select#team_member_user_id').chosen();
... ...
app/views/team_members/new.js.haml
  Diff comments   View file @1ce55d1
... ... @@ -12,4 +12,4 @@
12 12 modal: true
13 13  
14 14 });
15   - $('select#team_member_user_id').selectmenu({width:300});
  15 + $('select#team_member_user_id').chosen();
... ...
spec/requests/team_members_spec.rb
  Diff comments   View file @1ce55d1
... ... @@ -31,8 +31,8 @@ describe "TeamMembers" do
31 31  
32 32 describe "fill in" do
33 33 before do
34   - click_link "Select user"
35   - click_link @user_1.name
  34 + page.execute_script("$('#team_member_user_id').show();")
  35 + select @user_1.name, :from => "team_member_user_id"
36 36  
37 37 within "#team_member_new" do
38 38 check "team_member_read"
... ...