diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-09-26 16:49:20 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-09-26 16:49:20 +0300 |
| commit | 9270b6c3c7cdb99eef1c99af8274dae5789d9830 (patch) | |
| tree | e3c0f7e8663f3ab14bbd4c21ded91d67cf58402c /app/views/admin | |
| parent | 3c132f2e6896c7c1aa787ddc61ae230d9a205700 (diff) | |
| download | gitlab-ce-9270b6c3c7cdb99eef1c99af8274dae5789d9830.tar.gz | |
Fix milestone calendar, Removed unnecessary selects from admin
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/projects/show.html.haml | 10 | ||||
| -rw-r--r-- | app/views/admin/users/show.html.haml | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 639874109eb..ede48ea26da 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -1,6 +1,8 @@ -%h3 - = @admin_project.name - = link_to 'Edit', edit_admin_project_path(@admin_project), class: "btn right small" +%h3.page_title + Project: #{@admin_project.name} + = link_to edit_admin_project_path(@admin_project), class: "btn right" do + %i.icon-edit + Edit %br %table.zebra-striped @@ -56,7 +58,7 @@ %tr %td = link_to tm.user_name, admin_user_path(tm.user) - %td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), class: "medium project-access-select", disabled: :disabled + %td= tm.project_access_human %td= link_to 'Edit Access', edit_admin_team_member_path(tm), class: "btn small" %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn danger small" diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 731916e97de..e73f4d10876 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -1,10 +1,12 @@ -%h3 - = @admin_user.name +%h3.page_title + User: #{@admin_user.name} - if @admin_user.blocked %small Blocked - if @admin_user.admin %small Administrator - = link_to 'Edit', edit_admin_user_path(@admin_user), class: "btn small right" + = link_to edit_admin_user_path(@admin_user), class: "btn right" do + %i.icon-edit + Edit %br @@ -94,6 +96,6 @@ - project = tm.project %tr %td= link_to project.name, admin_project_path(project) - %td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), class: "medium project-access-select", disabled: :disabled + %td= tm.project_access_human %td= link_to 'Edit Access', edit_admin_team_member_path(tm), class: "btn small" %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn small danger" |