Download as
Browse Code »

Commit b5d7fb5eed496dbef766390a57fd8eec53f842d0

Authored by gitlabhq
1 parent 3f0d8079
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

restyled user profile

Showing 6 changed files with 18 additions and 15 deletions   Show diff stats
app/views/keys/_form.html.haml
  Diff comments   View file @b5d7fb5
@@ -12,5 +12,5 @@ @@ -12,5 +12,5 @@
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 .form-row 14 .form-row
15 - = f.submit 'Save', :class => "lbutton vm" 15 + = f.submit 'Save', :class => "grey-button"
16 16
app/views/keys/_show.html.haml
  Diff comments   View file @b5d7fb5
1 %tr 1 %tr
2 %td= truncate key.title, :lenght => 12 2 %td= truncate key.title, :lenght => 12
3 %td= truncate key.key, :lenght => 1114 3 %td= truncate key.key, :lenght => 1114
4 - %td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "lbutton negative delete-key", :id => "destroy_key_#{key.id}", :remote => true 4 + %td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "grey-button negative delete-key", :id => "destroy_key_#{key.id}", :remote => true
app/views/keys/index.html.haml
  Diff comments   View file @b5d7fb5
1 %div#new-key-holder 1 %div#new-key-holder
2 - = link_to "Add new", new_key_path, :remote => true, :class => "lbutton vm" 2 + = link_to "Add new", new_key_path, :remote => true, :class => "grey-button"
  3 +%br
3 4
4 %table.round-borders#keys-table 5 %table.round-borders#keys-table
5 %tr 6 %tr
app/views/profile/password.html.haml
  Diff comments   View file @b5d7fb5
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 %br 16 %br
17 = f.password_field :password_confirmation 17 = f.password_field :password_confirmation
18 .actions 18 .actions
19 - = f.submit 'Save', :class => "lbutton vm" 19 + = f.submit 'Save', :class => "grey-button"
20 20
21 %br 21 %br
22 %br 22 %br
@@ -30,4 +30,4 @@ @@ -30,4 +30,4 @@
30 %em.cred 30 %em.cred
31 keep it in secret! 31 keep it in secret!
32 .actions 32 .actions
33 - = f.submit 'Reset', :confirm => "Are you sure?", :class => "lbutton vm" 33 + = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
app/views/profile/show.html.haml
  Diff comments   View file @b5d7fb5
1 -.span-2  
2 - = image_tag gravatar_icon(@user.email), :class => "left", :width => 60, :style => "padding-right:5px;"  
3 -%p  
4 - %b Name: 1 +%h2.icon
  2 + %span>
5 = @user.name 3 = @user.name
6 -%p  
7 - %b Email:  
8 - = @user.email  
9 4
10 -%br 5 +.clear
11 6
12 = form_for @user, :url => profile_edit_path, :method => :put do |f| 7 = form_for @user, :url => profile_edit_path, :method => :put do |f|
13 -if @user.errors.any? 8 -if @user.errors.any?
@@ -17,6 +12,14 @@ @@ -17,6 +12,14 @@
17 %li= msg 12 %li= msg
18 13
19 .form-row 14 .form-row
  15 + = f.label :name
  16 + %br
  17 + = f.text_field :name
  18 + .form-row
  19 + = f.label :email
  20 + %br
  21 + = f.text_field :email
  22 + .form-row
20 = f.label :skype 23 = f.label :skype
21 %br 24 %br
22 = f.text_field :skype 25 = f.text_field :skype
@@ -29,5 +32,5 @@ @@ -29,5 +32,5 @@
29 %br 32 %br
30 = f.text_field :twitter 33 = f.text_field :twitter
31 .actions 34 .actions
32 - = f.submit 'Save', :class => "lbutton vm" 35 + = f.submit 'Save', :class => "grey-button"
33 36
spec/requests/profile_spec.rb
  Diff comments   View file @b5d7fb5
@@ -11,7 +11,6 @@ describe "Profile" do @@ -11,7 +11,6 @@ describe "Profile" do
11 end 11 end
12 12
13 it { page.should have_content(@user.name) } 13 it { page.should have_content(@user.name) }
14 - it { page.should have_content(@user.email) }  
15 end 14 end
16 15
17 describe "Profile update" do 16 describe "Profile update" do