button common style + flash messages fix

This commit is contained in:
gitlabhq 2011-11-21 02:26:10 -05:00
parent 46bebac983
commit 31e51dd116
28 changed files with 80 additions and 76 deletions

View file

@ -6,29 +6,32 @@
- @admin_team_member.errors.full_messages.each do |msg|
%li= msg
.span-10
- if @admin_team_member.new_record?
.field
= f.label :user_id
%br
= f.select :user_id, User.all.map { |user| [user.name, user.id] }
.field
= f.label :project_id
%br
= f.select :project_id, Project.all.map { |user| [user.name, user.id] }
.span-10
- if @admin_team_member.new_record?
.span-6
%b Access:
.span-8
= f.check_box :read
Web Access (Browse Repo)
.span-8
= f.check_box :write
Git Access (User will be added to commiters list)
.span-6.append-bottom
= f.check_box :admin
Admin (Can manage project)
%hr
= f.label :user_id
.span-6
= f.select :user_id, User.all.map { |user| [user.name, user.id] }
.span-6
= f.label :project_id
.span-6
= f.select :project_id, Project.all.map { |user| [user.name, user.id] }
.span-6
%b Access:
.span-6
= f.check_box :read
Web Access (Browse Repo)
.span-6
= f.check_box :write
Git Access (User will be added to commiters list)
.span-6
= f.check_box :admin
Admin (Can manage project)
%br
.actions
= f.submit 'Save'
= f.submit 'Save', :class => "grey-button"
:javascript
$('select#team_member_user_id').selectmenu({width:300});
$('select#team_member_project_id').selectmenu({width:300});

View file

@ -1,5 +1,6 @@
= render 'form'
%br
= link_to 'Show', admin_team_member_path(@admin_team_member)
\|
= link_to 'Back', admin_team_members_path

View file

@ -10,7 +10,6 @@
%th Added
%th
%th
%th
- members.each do |tm|
- user = tm.user
%tr
@ -20,11 +19,10 @@
%td.span-1= check_box_tag "commit", 1, project.writers.include?(user), :disabled => :disabled
%td.span-2= check_box_tag "admin", 1, project.admins.include?(user), :disabled => :disabled
%td.span-3= time_ago_in_words(tm.updated_at) + " ago"
%td= link_to 'Show', admin_team_member_path(tm)
%td= link_to 'Edit', edit_admin_team_member_path(tm), :id => "edit_#{dom_id(tm)}"
%td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
%br
= paginate @admin_team_members
= link_to 'New Team Member', new_admin_team_member_path
= link_to 'New Team Member', new_admin_team_member_path, :class => "grey-button"

View file

@ -2,4 +2,5 @@
= render 'form'
%br
= link_to 'Back', admin_team_members_path

View file

@ -1,5 +1,3 @@
%p#notice= notice
#infoblock
%p
%b Name:
@ -9,22 +7,25 @@
= @admin_team_member.project.name
%p
%b Since:
= @admin_team_member.updated_at
= @admin_team_member.updated_at.stamp("Nov 11, 2010")
#infoblock
.span-6
%b Access:
.span-8
%br
.span-6
= check_box_tag "read", 1, @admin_team_member.read, :disabled => :disabled
Web Access (Browse Repo)
.span-8
%br
.span-6
= check_box_tag "commit", 1, @admin_team_member.write, :disabled => :disabled
Git Access (User will be added to commiters list)
%br
.span-6.append-bottom
= check_box_tag "admin", 1, @admin_team_member.admin, :disabled => :disabled
Admin (Can manage project)
%hr
%br
= link_to 'Edit', edit_admin_team_member_path(@admin_project)
\|