deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

User blocking improved. Admin area styled

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-16 23:33:03 +03:00
parent c0df0cd70c
commit c9def945d4
13 changed files with 231 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/projects/index.html.haml
View file

@ -2,7 +2,7 @@
Projects
= link_to 'New Project', new_admin_project_path, :class => "btn small right"
%br
%table.zebra-striped.table-bordered
%table.admin-table
%thead
%th Name
%th Path

75
app/views/admin/projects/show.html.haml
View file

@ -2,9 +2,8 @@
= @admin_project.name
= link_to 'Edit', edit_admin_project_path(@admin_project), :class => "btn right small"
%hr
%table.zebra-striped
%br
%table.zebra-striped.table-bordered
%tr
%td
%b
@ -29,47 +28,47 @@
Description:
%td
= @admin_project.description
%br
%h3
Team
%small
(#{@admin_project.users_projects.count})
%br
%table.zebra-striped.table-bordered
%thead
%tr
%th Name
%th Project Access
%th Repository Access
%th
- @admin_project.users_projects.each do |tm|
%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= 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"
.span12
%h3
Team
%small
(#{@admin_project.users_projects.count})
%hr
%table.zebra-striped
%br
%h3 Add new team member
%br
= form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do
%table.zebra-striped.table-bordered
%thead
%tr
%th Name
%th Project Access
%th Repository Access
%th
%th Users
%th Project Access:
- @admin_project.users_projects.each do |tm|
%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= 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"
%tr
%td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name), :multiple => true
%td= select_tag :project_access, options_for_select(Project.access_options), :class => "project-access-select"
= form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do
%table
%thead
%tr
%th Users
%th Project Access:
%th Repo Access:
%tr
%td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name), :multiple => true
%td= select_tag :project_access, options_for_select(Project.access_options), :class => "project-access-select"
.actions
= submit_tag 'Add', :class => "btn primary"
%tr
%td= submit_tag 'Add', :class => "btn primary"
%td
Read more about project permissions
%strong= link_to "here", help_permissions_path, :class => "vlink"
:css
form select {