@@ -6,6 +6,7 @@ config/database.yml config/password.txt public/stylesheets/* public/images/screenshots/* +public/images/users/avatars/* db/development.sqlite3 db/test.sqlite3 .idea/* .gitignore @@ -1,27 +1,34 @@ -%h1=t "Edit" +%h1=t "Edit Profile" = error_messages_for :user - form_for(@user, :html => { :multipart => true }) do |f| - %h2 Account - = render :partial => 'form', :locals => {:f => f} + .panel + + %h2 Profile - %h2 Profile - %p - %label{:for => "user_avatar"} Avatar: - = f.file_field :avatar + %p + %label About you: + = f.text_area :about, :size => "35x5" - %p - %strong= "About You" - #user_about= f.text_area :about + %p + %label Links: + = f.text_area :links, :size => "35x5" - %p - %strong= "Your Links" - (Separated by newlines) - #user_links= f.text_area :links + %p + %label{:for => "user_avatar"} Avatar: + = f.file_field :avatar + + %p + = f.submit "Save" + or + = link_to 'Back to Profile', @user + + + .panel - %p - = f.submit "Save" - or - = link_to 'Back to Profile', @user \ No newline at end of file + %h2 Account + = render :partial => 'form', :locals => {:f => f} + + %br.clear \ No newline at end of file app/views/users/edit.html.haml @@ -1,17 +1,17 @@ %h1=t @user.full_name #user_photo - = image_tag @user.avatar.url(:large) + = image_tag @user.avatar.url(:medium) -%p - = link_to 'Edit Info & Avatar', edit_user_path(@user) - -- if @user.about +- unless @user.about.blank? %p %strong= "About #{@user.first_name}" - #user_about= @user.about + = @user.about -- if @user.links +- unless @user.links.blank? %p - %strong= "#{@user.first_name}'s Links" - #user_links= linkify @user.links if @user.links + %strong= "#{@user.first_name}’s Links" + = linkify @user.links if @user.links + +%p + = link_to 'Edit Profile', edit_user_path(@user) \ No newline at end of file app/views/users/show.html.haml @@ -60,10 +60,13 @@ h2 form :margin 12px 0 input, textarea + :color #666 :display block :font-size 16px :margin 3px 0 12px 0 :padding 3px + input[type=submit] + :color #000 label :display block :font-size 16px @@ -79,7 +82,8 @@ p + h2 p :line-height 20px :margin 12px 0 - + strong + :display block a :color #fff &:hover @@ -373,3 +377,7 @@ ul#filter .clear :clear both + +.panel + :float left + :margin-right 60px public/sass/application.sass 1ca2852938e2535c432ae88e00d8bc99f7938fc4 Patrick Crowley patrick@mokolabs.com http://github.com/mokolabs/sdruby/commit/5744ed17505236a0a0f1ad637c0e3cd492352a25 5744ed17505236a0a0f1ad637c0e3cd492352a25 2009-07-02T17:58:31-07:00 2009-07-02T17:58:31-07:00 improved user profile appearance 1b08b51165eb9051dcf46cadff8078633efab51d Patrick Crowley patrick@mokolabs.com