restyled user profile
This commit is contained in:
parent
3f0d807955
commit
b5d7fb5eed
6 changed files with 18 additions and 15 deletions
|
@ -12,5 +12,5 @@
|
|||
= f.label :key
|
||||
= f.text_area :key, :style => "width:300px; height:130px"
|
||||
.form-row
|
||||
= f.submit 'Save', :class => "lbutton vm"
|
||||
= f.submit 'Save', :class => "grey-button"
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
%tr
|
||||
%td= truncate key.title, :lenght => 12
|
||||
%td= truncate key.key, :lenght => 1114
|
||||
%td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "lbutton negative delete-key", :id => "destroy_key_#{key.id}", :remote => true
|
||||
%td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "grey-button negative delete-key", :id => "destroy_key_#{key.id}", :remote => true
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
%div#new-key-holder
|
||||
= link_to "Add new", new_key_path, :remote => true, :class => "lbutton vm"
|
||||
= link_to "Add new", new_key_path, :remote => true, :class => "grey-button"
|
||||
%br
|
||||
|
||||
%table.round-borders#keys-table
|
||||
%tr
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
%br
|
||||
= f.password_field :password_confirmation
|
||||
.actions
|
||||
= f.submit 'Save', :class => "lbutton vm"
|
||||
= f.submit 'Save', :class => "grey-button"
|
||||
|
||||
%br
|
||||
%br
|
||||
|
@ -30,4 +30,4 @@
|
|||
%em.cred
|
||||
keep it in secret!
|
||||
.actions
|
||||
= f.submit 'Reset', :confirm => "Are you sure?", :class => "lbutton vm"
|
||||
= f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
|
||||
|
|
|
@ -1,13 +1,8 @@
|
|||
.span-2
|
||||
= image_tag gravatar_icon(@user.email), :class => "left", :width => 60, :style => "padding-right:5px;"
|
||||
%p
|
||||
%b Name:
|
||||
%h2.icon
|
||||
%span>
|
||||
= @user.name
|
||||
%p
|
||||
%b Email:
|
||||
= @user.email
|
||||
|
||||
%br
|
||||
.clear
|
||||
|
||||
= form_for @user, :url => profile_edit_path, :method => :put do |f|
|
||||
-if @user.errors.any?
|
||||
|
@ -16,6 +11,14 @@
|
|||
- @user.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
.form-row
|
||||
= f.label :name
|
||||
%br
|
||||
= f.text_field :name
|
||||
.form-row
|
||||
= f.label :email
|
||||
%br
|
||||
= f.text_field :email
|
||||
.form-row
|
||||
= f.label :skype
|
||||
%br
|
||||
|
@ -29,5 +32,5 @@
|
|||
%br
|
||||
= f.text_field :twitter
|
||||
.actions
|
||||
= f.submit 'Save', :class => "lbutton vm"
|
||||
= f.submit 'Save', :class => "grey-button"
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ describe "Profile" do
|
|||
end
|
||||
|
||||
it { page.should have_content(@user.name) }
|
||||
it { page.should have_content(@user.email) }
|
||||
end
|
||||
|
||||
describe "Profile update" do
|
||||
|
|
Loading…
Add table
Reference in a new issue