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

Merge branch 'dev' into issue-184

Browse source 
Conflicts:
	app/views/layouts/project.html.haml
This commit is contained in:
Aleksei Kvitinskii 2011-11-07 21:29:28 +02:00
commit 444b69ddc2
17 changed files with 106 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

72
app/views/admin/users/_form.html.haml
View file

@ -7,44 +7,42 @@
- @admin_user.errors.full_messages.each do |msg|
%li= msg
.span-24
.span-11.colborder
.field
= f.label :name
%br
= f.text_field :name
.field
= f.label :email
%br
= f.text_field :email
.field
= f.label :password
%br
= f.password_field :password
.field
= f.label :password_confirmation
%br
= f.password_field :password_confirmation
.field.prepend-top
= f.check_box :admin
= f.label :admin
.span-11
.field.prepend-top
= f.text_field :projects_limit, :class => "small_input"
= f.label :projects_limit
.form-row
= f.label :name
%br
= f.text_field :name
.form-row
= f.label :email
%br
= f.text_field :email
.form-row
= f.label :password
%br
= f.password_field :password
.form-row
= f.label :password_confirmation
%br
= f.password_field :password_confirmation
.form-row
= f.check_box :admin
= f.label :admin
.field
= f.label :skype
%br
= f.text_field :skype
.field
= f.label :linkedin
%br
= f.text_field :linkedin
.field
= f.label :twitter
%br
= f.text_field :twitter
.form-row
= f.text_field :projects_limit, :class => "small_input"
= f.label :projects_limit
.form-row
= f.label :skype
%br
= f.text_field :skype
.form-row
= f.label :linkedin
%br
= f.text_field :linkedin
.form-row
= f.label :twitter
%br
= f.text_field :twitter
.clear
%br
.actions

1
app/views/admin/users/index.html.haml
View file

@ -21,4 +21,5 @@
%br
= paginate @admin_users
= link_to 'New User', new_admin_user_path