diff options
| author | Aleksei Kvitinskii <aleksei.wm@gmail.com> | 2011-11-07 23:29:28 +0400 |
|---|---|---|
| committer | Aleksei Kvitinskii <aleksei.wm@gmail.com> | 2011-11-07 23:29:28 +0400 |
| commit | 444b69ddc2382489dbd01304b605c3be5af75f28 (patch) | |
| tree | 3cced0b681ddd18631541d0b72644c042c23db90 /app/views/admin | |
| parent | 4a1b70f7b2d55bf26be35a2544e3b8e76bdc0585 (diff) | |
| parent | 9054f64c530625e5f6f555daf3f9d6a741c177bb (diff) | |
Merge branch 'dev' into issue-184
Conflicts:
app/views/layouts/project.html.haml
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/users/_form.html.haml | 72 | ||||
| -rw-r--r-- | app/views/admin/users/index.html.haml | 1 |
2 files changed, 36 insertions, 37 deletions
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index 51b5d5c76eb..06e5be19aa4 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -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 diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index cbec1060962..e12cfc7763b 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -21,4 +21,5 @@ %br = paginate @admin_users + = link_to 'New User', new_admin_user_path |