diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-11-30 23:41:00 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-11-30 23:41:00 +0200 |
| commit | 1ce55d161aaac051cb65963c01e94e718a3a46a3 (patch) | |
| tree | 1ede918b27575ac1c19f9991b4b661d8390100b0 /app/views | |
| parent | 46e77db0991283e54398c5214e25c48ae8708ec2 (diff) | |
| download | gitlab-ce-1ce55d161aaac051cb65963c01e94e718a3a46a3.tar.gz | |
new team memeber selectbox replaced
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_team.html.haml | 1 | ||||
| -rw-r--r-- | app/views/team_members/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/team_members/_show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/team_members/create.js.haml | 2 | ||||
| -rw-r--r-- | app/views/team_members/new.js.haml | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/app/views/projects/_team.html.haml b/app/views/projects/_team.html.haml index 1df19364079..79b1edbf9a8 100644 --- a/app/views/projects/_team.html.haml +++ b/app/views/projects/_team.html.haml @@ -5,7 +5,6 @@ %table.round-borders#team-table %thead %th Name - %th Email %th Web %th Git %th Admin diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml index 042fc09df71..c413485b38e 100644 --- a/app/views/team_members/_form.html.haml +++ b/app/views/team_members/_form.html.haml @@ -8,7 +8,7 @@ .span-6.append-bottom %b Name .span-6 - = f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }) + = f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, { :style => "width:300px" }) .span-6 %b Access: .span-6 diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml index 250bfa198df..1fb3cfae1b7 100644 --- a/app/views/team_members/_show.html.haml +++ b/app/views/team_members/_show.html.haml @@ -3,9 +3,9 @@ %td = link_to image_tag(gravatar_icon(user.email), :class => "left", :width => 40, :style => "padding:0 5px;"), project_team_member_path(@project, member) - = link_to truncate(user.name, :lenght => 16), project_team_member_path(@project, member) - - %td= truncate user.email, :lenght => 16 + = link_to truncate(user.name, :lenght => 24), project_team_member_path(@project, member) + %br + .cgray{:style => "padding-top:10px;"}= truncate user.email, :lenght => 24 - if can? current_user, :admin_project, @project = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f| %td= f.check_box :read, :onclick => "$(this.form).submit();" diff --git a/app/views/team_members/create.js.haml b/app/views/team_members/create.js.haml index 74dacc2820c..a97c9f40cd6 100644 --- a/app/views/team_members/create.js.haml +++ b/app/views/team_members/create.js.haml @@ -6,4 +6,4 @@ :plain $("#new_tm_dialog").empty(); $("#new_tm_dialog").append("#{escape_javascript(render('form'))}"); - $('select#team_member_user_id').selectmenu({width:300}); + $('select#team_member_user_id').chosen(); diff --git a/app/views/team_members/new.js.haml b/app/views/team_members/new.js.haml index 93bebba6d5e..af3e99f6b4b 100644 --- a/app/views/team_members/new.js.haml +++ b/app/views/team_members/new.js.haml @@ -12,4 +12,4 @@ modal: true }); - $('select#team_member_user_id').selectmenu({width:300}); + $('select#team_member_user_id').chosen(); |