Download as
Browse Code »

Commit 9054f64c530625e5f6f555daf3f9d6a741c177bb

Authored by Aleksei Kvitinskii
1 parent eb5fa834
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

correct padding in user, keys, password forms

Showing 4 changed files with 41 additions and 42 deletions   Show diff stats
app/views/admin/users/_form.html.haml
  Diff comments   View file @9054f64
@@ -7,44 +7,42 @@ @@ -7,44 +7,42 @@
7 - @admin_user.errors.full_messages.each do |msg| 7 - @admin_user.errors.full_messages.each do |msg|
8 %li= msg 8 %li= msg
9 9
10 - .span-24  
11 - .span-11.colborder  
12 - .field  
13 - = f.label :name  
14 - %br  
15 - = f.text_field :name  
16 - .field  
17 - = f.label :email  
18 - %br  
19 - = f.text_field :email  
20 - .field  
21 - = f.label :password  
22 - %br  
23 - = f.password_field :password  
24 - .field  
25 - = f.label :password_confirmation  
26 - %br  
27 - = f.password_field :password_confirmation  
28 - .field.prepend-top  
29 - = f.check_box :admin  
30 - = f.label :admin  
31 - .span-11  
32 - .field.prepend-top  
33 - = f.text_field :projects_limit, :class => "small_input"  
34 - = f.label :projects_limit 10 + .form-row
  11 + = f.label :name
  12 + %br
  13 + = f.text_field :name
  14 + .form-row
  15 + = f.label :email
  16 + %br
  17 + = f.text_field :email
  18 + .form-row
  19 + = f.label :password
  20 + %br
  21 + = f.password_field :password
  22 + .form-row
  23 + = f.label :password_confirmation
  24 + %br
  25 + = f.password_field :password_confirmation
  26 + .form-row
  27 + = f.check_box :admin
  28 + = f.label :admin
35 29
36 - .field  
37 - = f.label :skype  
38 - %br  
39 - = f.text_field :skype  
40 - .field  
41 - = f.label :linkedin  
42 - %br  
43 - = f.text_field :linkedin  
44 - .field  
45 - = f.label :twitter  
46 - %br  
47 - = f.text_field :twitter 30 + .form-row
  31 + = f.text_field :projects_limit, :class => "small_input"
  32 + = f.label :projects_limit
  33 +
  34 + .form-row
  35 + = f.label :skype
  36 + %br
  37 + = f.text_field :skype
  38 + .form-row
  39 + = f.label :linkedin
  40 + %br
  41 + = f.text_field :linkedin
  42 + .form-row
  43 + = f.label :twitter
  44 + %br
  45 + = f.text_field :twitter
48 .clear 46 .clear
49 %br 47 %br
50 .actions 48 .actions
app/views/admin/users/index.html.haml
  Diff comments   View file @9054f64
@@ -21,4 +21,5 @@ @@ -21,4 +21,5 @@
21 %br 21 %br
22 22
23 = paginate @admin_users 23 = paginate @admin_users
  24 +
24 = link_to 'New User', new_admin_user_path 25 = link_to 'New User', new_admin_user_path
app/views/keys/_form.html.haml
  Diff comments   View file @9054f64
@@ -5,12 +5,12 @@ @@ -5,12 +5,12 @@
5 - @key.errors.full_messages.each do |msg| 5 - @key.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
7 7
8 - .span-6 8 + .form-row
9 = f.label :title 9 = f.label :title
10 = f.text_field :title, :style => "width:300px" 10 = f.text_field :title, :style => "width:300px"
11 - .span-6 11 + .form-row
12 = f.label :key 12 = f.label :key
13 = f.text_area :key, :style => "width:300px; height:130px" 13 = f.text_area :key, :style => "width:300px; height:130px"
14 - .span-6 14 + .form-row
15 = f.submit 'Save', :class => "lbutton vm" 15 = f.submit 'Save', :class => "lbutton vm"
16 16
app/views/profile/password.html.haml
  Diff comments   View file @9054f64
@@ -7,11 +7,11 @@ @@ -7,11 +7,11 @@
7 - @user.errors.full_messages.each do |msg| 7 - @user.errors.full_messages.each do |msg|
8 %li= msg 8 %li= msg
9 9
10 - .div 10 + .form-row
11 = f.label :password 11 = f.label :password
12 %br 12 %br
13 = f.password_field :password 13 = f.password_field :password
14 - .div 14 + .form-row
15 = f.label :password_confirmation 15 = f.label :password_confirmation
16 %br 16 %br
17 = f.password_field :password_confirmation 17 = f.password_field :password_confirmation