diff options
author | gitlabhq <m@gitlabhq.com> | 2011-11-22 08:14:23 -0500 |
---|---|---|
committer | gitlabhq <m@gitlabhq.com> | 2011-11-22 08:14:23 -0500 |
commit | b5d7fb5eed496dbef766390a57fd8eec53f842d0 (patch) | |
tree | ac0717265312c97e92b18f6afa2359516aae2c81 | |
parent | 3f0d8079557e573871cbb1b62e0f90e4e34853f9 (diff) | |
download | gitlab-ce-b5d7fb5eed496dbef766390a57fd8eec53f842d0.tar.gz |
restyled user profile
-rw-r--r-- | app/views/keys/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/keys/_show.html.haml | 2 | ||||
-rw-r--r-- | app/views/keys/index.html.haml | 3 | ||||
-rw-r--r-- | app/views/profile/password.html.haml | 4 | ||||
-rw-r--r-- | app/views/profile/show.html.haml | 21 | ||||
-rw-r--r-- | spec/requests/profile_spec.rb | 1 |
6 files changed, 18 insertions, 15 deletions
diff --git a/app/views/keys/_form.html.haml b/app/views/keys/_form.html.haml index a49164cf378..1cc7e336b5f 100644 --- a/app/views/keys/_form.html.haml +++ b/app/views/keys/_form.html.haml @@ -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" diff --git a/app/views/keys/_show.html.haml b/app/views/keys/_show.html.haml index a4e236256d3..fb3599896af 100644 --- a/app/views/keys/_show.html.haml +++ b/app/views/keys/_show.html.haml @@ -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 diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml index 279b125f53c..8c43ce9b2a5 100644 --- a/app/views/keys/index.html.haml +++ b/app/views/keys/index.html.haml @@ -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 diff --git a/app/views/profile/password.html.haml b/app/views/profile/password.html.haml index 41e6df5cb50..18bae4b6af0 100644 --- a/app/views/profile/password.html.haml +++ b/app/views/profile/password.html.haml @@ -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" diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml index bf45f4400a4..375883fe75b 100644 --- a/app/views/profile/show.html.haml +++ b/app/views/profile/show.html.haml @@ -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? @@ -17,6 +12,14 @@ %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 = f.text_field :skype @@ -29,5 +32,5 @@ %br = f.text_field :twitter .actions - = f.submit 'Save', :class => "lbutton vm" + = f.submit 'Save', :class => "grey-button" diff --git a/spec/requests/profile_spec.rb b/spec/requests/profile_spec.rb index 5d2c01d1063..ea88a651f8f 100644 --- a/spec/requests/profile_spec.rb +++ b/spec/requests/profile_spec.rb @@ -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 |