Commit b5d7fb5e authored by gitlabhq's avatar gitlabhq

restyled user profile

parent 3f0d8079
...@@ -12,5 +12,5 @@ ...@@ -12,5 +12,5 @@
= f.label :key = f.label :key
= f.text_area :key, :style => "width:300px; height:130px" = f.text_area :key, :style => "width:300px; height:130px"
.form-row .form-row
= f.submit 'Save', :class => "lbutton vm" = f.submit 'Save', :class => "grey-button"
%tr %tr
%td= truncate key.title, :lenght => 12 %td= truncate key.title, :lenght => 12
%td= truncate key.key, :lenght => 1114 %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
%div#new-key-holder %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 %table.round-borders#keys-table
%tr %tr
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
%br %br
= f.password_field :password_confirmation = f.password_field :password_confirmation
.actions .actions
= f.submit 'Save', :class => "lbutton vm" = f.submit 'Save', :class => "grey-button"
%br %br
%br %br
...@@ -30,4 +30,4 @@ ...@@ -30,4 +30,4 @@
%em.cred %em.cred
keep it in secret! keep it in secret!
.actions .actions
= f.submit 'Reset', :confirm => "Are you sure?", :class => "lbutton vm" = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
.span-2 %h2.icon
= image_tag gravatar_icon(@user.email), :class => "left", :width => 60, :style => "padding-right:5px;" %span>
%p
%b Name:
= @user.name = @user.name
%p
%b Email:
= @user.email
%br .clear
= form_for @user, :url => profile_edit_path, :method => :put do |f| = form_for @user, :url => profile_edit_path, :method => :put do |f|
-if @user.errors.any? -if @user.errors.any?
...@@ -16,6 +11,14 @@ ...@@ -16,6 +11,14 @@
- @user.errors.full_messages.each do |msg| - @user.errors.full_messages.each do |msg|
%li= 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 .form-row
= f.label :skype = f.label :skype
%br %br
...@@ -29,5 +32,5 @@ ...@@ -29,5 +32,5 @@
%br %br
= f.text_field :twitter = f.text_field :twitter
.actions .actions
= f.submit 'Save', :class => "lbutton vm" = f.submit 'Save', :class => "grey-button"
...@@ -11,7 +11,6 @@ describe "Profile" do ...@@ -11,7 +11,6 @@ describe "Profile" do
end end
it { page.should have_content(@user.name) } it { page.should have_content(@user.name) }
it { page.should have_content(@user.email) }
end end
describe "Profile update" do describe "Profile update" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment