From 7e9585c5f0f027e173db32e3229c86484c344620 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Tue, 19 Oct 2010 11:29:29 -0700 Subject: [PATCH] default user picture change. stream link on all aspects page fix. layout view is not fragmented. --- app/helpers/application_helper.rb | 2 +- app/views/albums/index.html.haml | 25 ++++---- app/views/albums/show.html.haml | 38 ++++++------- app/views/aspects/index.html.haml | 21 +++---- app/views/aspects/manage.html.haml | 54 +++++++++--------- app/views/aspects/show.html.haml | 18 +++--- app/views/layouts/application.html.haml | 5 +- app/views/people/index.html.haml | 26 +++------ app/views/people/show.html.haml | 21 +++---- app/views/photos/show.html.haml | 69 ++++++++++++----------- app/views/shared/_aspect_friends.haml | 6 +- app/views/users/edit.html.haml | 22 ++++---- public/images/user/default.png | Bin 0 -> 2243 bytes public/stylesheets/sass/application.sass | 20 ++++--- 14 files changed, 160 insertions(+), 167 deletions(-) create mode 100644 public/images/user/default.png diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e6fadfef3..1b52892f3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -50,7 +50,7 @@ module ApplicationHelper def person_image_tag(person) image_location = person.profile.image_url - image_location ||= "/images/user/default.jpg" + image_location ||= "/images/user/default.png" image_tag image_location, :class => "avatar", :alt => person.real_name, :title => person.real_name end diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index b6fd490d6..81455b85b 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -8,20 +8,23 @@ $("#add_album_button").fancybox(); }); -- content_for :left_pane do +.span-4.append-1.last = render "shared/aspect_friends" -%h3 Albums -= link_to t('.new_album'), '#new_album_pane', {:class => "button", :id => "add_album_button"} +.span-15.last + %h3 + = @aspect + Albums + = link_to t('.new_album'), '#new_album_pane', {:class => "button", :id => "add_album_button"} -.fancybox_content - #new_album_pane - = render "albums/new_album", :aspect => params[:aspect] + .fancybox_content + #new_album_pane + = render "albums/new_album", :aspect => params[:aspect] -%div - - for album in @albums - = render "album", :post => album + %div + - for album in @albums + = render "album", :post => album -#pagination - = will_paginate @albums + #pagination + = will_paginate @albums diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index f26a514f3..866a266e6 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -9,29 +9,27 @@ }); }); -= content_for :page_title do - = link_to "◂ #{t('.albums')}", albums_path(:aspect => @aspect) - -- content_for :left_pane do +.span-4.append-1.last = render "shared/aspect_friends" -%h3 - = @album.name -="#{t('.updated')} #{how_long_ago(@album)}" --if current_user.owns? @album - =render 'photos/new_photo' - = link_to t('.edit_album'), edit_album_path(@album), :class => 'button' +.span-19.last + %h3 + = link_to "#{@aspect} Albums", albums_path(:aspect => @aspect) -.album_id{:id => @album.id, :style => "display:hidden;"} + = @album.name + ="#{t('.updated')} #{how_long_ago(@album)}" + .right + -if current_user.owns? @album + =render 'photos/new_photo' + = link_to t('.edit_album'), edit_album_path(@album), :class => 'button' --unless current_user.owns? @album - %h4= "#{t('.by')} #{@album.person.real_name}" + .album_id{:id => @album.id, :style => "display:hidden;"} -#thumbnails - - for photo in @album_photos - .image_thumb - = link_to (image_tag photo.url(:thumb_medium)), object_path(photo) + -unless current_user.owns? @album + %h4= "#{t('.by')} #{@album.person.real_name}" + + #thumbnails + - for photo in @album_photos + .image_thumb + = link_to (image_tag photo.url(:thumb_medium)), object_path(photo) -#content_bottom - .back - = link_to "⇧ #{t('.albums')}", albums_path(:aspect => @aspect) diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 8b651bf9a..e61aa4d42 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -2,19 +2,16 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -- content_for :left_pane do +.span-4.append-1.last = render "shared/aspect_friends" -- content_for :publish do - = render "shared/publisher", :aspect_ids => :all, :broadcast => true +.span-15.last + = render 'aspects/empty_messages' + = render "shared/publisher" + %ul#stream + - for post in @posts + = render type_partial(post), :post => post unless post.class == Album -= render 'aspects/empty_messages' - -= render "shared/publisher" -%ul#stream - - for post in @posts - = render type_partial(post), :post => post unless post.class == Album - -#pagination - = will_paginate @posts + #pagination + = will_paginate @posts diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml index dba34ad24..6c0e0150c 100644 --- a/app/views/aspects/manage.html.haml +++ b/app/views/aspects/manage.html.haml @@ -6,7 +6,11 @@ = javascript_include_tag 'jquery-ui-1.8.4.custom.min.js' = javascript_include_tag 'aspect-edit.js' -- content_for :left_pane do +%h2 + Manage aspects + = link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect')) + +.span-4.append-1.last %h3=t('.requests') .requests @@ -27,36 +31,34 @@ = render 'shared/invitations', :invites => @invites -%h2 Manage aspects -= link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect')) +.span-19.last + %ul#aspect_list + - for aspect in @aspects + %li.aspect -%ul#aspect_list - - for aspect in @aspects - %li.aspect + .aspect_name + %span.edit_name_field + %h3{:contenteditable => true}= aspect.name + %span.tip click to edit - .aspect_name - %span.edit_name_field - %h3{:contenteditable => true}= aspect.name - %span.tip click to edit + %ul.tools + %li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button' + %li!= remove_link(aspect) - %ul.tools - %li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button' - %li!= remove_link(aspect) + %ul.dropzone{:id => aspect.id} - %ul.dropzone{:id => aspect.id} + -if aspect.people.size < 1 + %li.grey Drag to add people - -if aspect.people.size < 1 - %li.grey Drag to add people + -else + -for person in aspect.people - -else - -for person in aspect.people + %li.person{:id => person.id, :from_aspect_id => aspect.id} + = person_image_tag(person) + .name + = link_to person.real_name, person - %li.person{:id => person.id, :from_aspect_id => aspect.id} - = person_image_tag(person) - .name - = link_to person.real_name, person - - .fancybox_content - %div{:id => "add_request_pane_#{aspect.id}"} - = render "requests/new_request", :aspect => aspect + .fancybox_content + %div{:id => "add_request_pane_#{aspect.id}"} + = render "requests/new_request", :aspect => aspect diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml index ebe66cf41..e61aa4d42 100644 --- a/app/views/aspects/show.html.haml +++ b/app/views/aspects/show.html.haml @@ -2,16 +2,16 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -- content_for :left_pane do +.span-4.append-1.last = render "shared/aspect_friends" -= render 'aspects/empty_messages' +.span-15.last + = render 'aspects/empty_messages' + = render "shared/publisher" + %ul#stream + - for post in @posts + = render type_partial(post), :post => post unless post.class == Album -= render "shared/publisher" -%ul#stream - - for post in @posts - = render type_partial(post), :post => post unless post.class == Album - -#pagination - = will_paginate @posts + #pagination + = will_paginate @posts diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7bf4c106f..0defb3463 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -59,10 +59,7 @@ = render "shared/aspect_nav" .container - .span-4.append-1.last - = yield :left_pane - - .span-15.last + .span-24.last = yield .span-19.prepend-5.last diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml index 4ad7a93af..e2d4e2656 100644 --- a/app/views/people/index.html.haml +++ b/app/views/people/index.html.haml @@ -2,23 +2,13 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -- content_for :publish do - %h1 - Search +.span-15.prepend-5.last + %h2 + search results for + %u= params[:q] - =form_tag '/people', :method => "get" do - = text_field_tag :q, params[:q] - = submit_tag "search" + %ul#stream + - for person in @people + = render 'people/person', :person => person -- content_for :left_pane do - \. - -%h1 - search results for - %u= params[:q] - -%ul#stream - - for person in @people - = render 'people/person', :person => person - -= will_paginate @people + = will_paginate @people diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 1038d7d94..83e7cf50d 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -5,7 +5,8 @@ - content_for :page_title do profile -- content_for :left_pane do +.span-4.append-1.last + %h2= @person.real_name #profile .profile_photo = person_image_link(@person) @@ -26,12 +27,12 @@ - if @person != current_user.person && current_user.friends.include?(@person) = link_to t('.remove_friend'), @person, :confirm => t('.are_you_sure'), :method => :delete, :class => "button" -.span-20.last - .span-19.last - - if @posts - %ul#stream - - for post in @posts - = render type_partial(post), :post => post unless post.class == Album - = will_paginate @posts - - else - %h3=t('no posts to display!') +.span-15.last + - if @posts.count > 0 + %ul#stream + - for post in @posts + = render type_partial(post), :post => post unless post.class == Album + = will_paginate @posts + - else + %h3=t('no posts to display!') + diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 8d0e66471..8fe22cc9b 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -54,14 +54,12 @@ });//end document ready -= content_for :page_title do - = link_to "◂ #{@photo.album.name}", @photo.album - -- content_for :left_pane do +.span-4.append-1.last = render "shared/aspect_friends" -- content_for :publish do - %h1 +.span-19.last + %h3 + = link_to @photo.album.name, @photo.album = @photo.image = link_to "<< #{t('.prev')}", url_to_prev(@photo, @album), :rel => 'prefetch' @@ -70,39 +68,42 @@ | = link_to "#{t('.next')} >>", url_to_next(@photo, @album), :rel => 'prefetch' - .right - -if current_user.owns? @album - = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button" + -if current_user.owns? @album + = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button" + + %br + %br + + %div{:id => @photo.id} + #show_photo + = linked_scaled_photo @photo, @album + .caption + -if current_user.owns? @photo + -if @photo.caption and @photo.caption != "" + = link_to 'Edit','javascript:void(0)', :id => "edit-desc", :class => "edit-desc" + .description + = @photo.caption -%div{:id => @photo.id} - #show_photo - = linked_scaled_photo @photo, @album - .caption -if current_user.owns? @photo - -if @photo.caption and @photo.caption != "" - = link_to 'Edit','javascript:void(0)', :id => "edit-desc", :class => "edit-desc" - .description - = @photo.caption + %div{:class => 'clear'} + -if !@photo.caption or @photo.caption == "" + = link_to 'Add a description','javascript:void(0)', :id => "add-description", :class => "edit-desc" - -if current_user.owns? @photo - %div{:class => 'clear'} - -if !@photo.caption or @photo.caption == "" - = link_to 'Add a description','javascript:void(0)', :id => "add-description", :class => "edit-desc" + = form_for @photo do |p| + = p.text_field :caption, :value => @photo.caption + = p.submit + %div{:class => 'clear'} - = form_for @photo do |p| - = p.text_field :caption, :value => @photo.caption - = p.submit - %div{:class => 'clear'} + %h4{:class => "show_post_comments"} + = "#{t('.comments')} (#{@photo.comments.count})" + = render "comments/comments", :post => @photo - #content_bottom - .back - = link_to "⇧ #{@album.name}", album_path(@album) + #content_bottom + .back + = link_to "⇧ #{@album.name}", album_path(@album) - -if current_user.owns? @album - .right - = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete, :class => 'button' + -if current_user.owns? @album + .right + = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete, :class => 'button' - %h4{:class => "show_post_comments"} - = "#{t('.comments')} (#{@photo.comments.count})" - = render "comments/comments", :post => @photo diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml index 876da05e7..61deef919 100644 --- a/app/views/shared/_aspect_friends.haml +++ b/app/views/shared/_aspect_friends.haml @@ -28,7 +28,11 @@ %br %br %ul - %li= link_to 'stream', aspect_path(@aspect) + - if @aspect == :all + %li= link_to 'stream', root_path + - else + %li= link_to 'stream', aspect_path(@aspect) + %li= link_to t('.photos'), albums_path(:aspect => @aspect) %br diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 397035a80..984be9a53 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. :javascript - $("#settings_nav li > a").click( function() { + $("#settings_nav li > a").live("click", function() { var target = "#"+$(this).attr('class'); if( !$(target).is(":visible") ) { $(".settings_pane").fadeOut(200, function() { @@ -12,22 +12,20 @@ } }); - -- content_for :publish do - %h2="#{t('.editing_profile')}" - -- content_for :left_pane do +%h2 + Settings %ul#settings_nav %li=link_to 'Profile', '#', :class => 'profile' %li=link_to 'Account', '#', :class => 'account' %li=link_to 'Services', '#', :class => 'services' -#profile.settings_pane{:style=>"display:block;"} - = render 'users/profile' +.span-19.prepend-5.last + #profile.settings_pane{:style=>"display:block;"} + = render 'users/profile' -#account.settings_pane - = render 'users/account' + #account.settings_pane + = render 'users/account' -#services.settings_pane - = render 'users/services' + #services.settings_pane + = render 'users/services' diff --git a/public/images/user/default.png b/public/images/user/default.png new file mode 100644 index 0000000000000000000000000000000000000000..cd0b9059f97721141d8e402b35810bc84992e30a GIT binary patch literal 2243 zcma);c{J4h7soBXN;8%ghJ;9?m>HwTNKub%tdoi~<|`91UrST?714u`7>sS08CodI zv@lU$BN|y!m?hgJTO~sa)1pm^=$V}J`~UYk=kvbz-1ENo+;ji>WFFY(ss_`ADJUqY zxx3-L6%-WF@~5YwEU$QsoRP^x;DNn9&i?-Xq07WBLtCb3nH$U8T}H6X&@!@R3JNL)?sx~ExXT|(;5Dg+Yn+jtI>D;bOV$g=-cc77g2c_r(LJ!K)&8{oW%s}? zoOQH zjU(-2H`^%9>2oV$Ew%#>W2@Neot_D%K)~th2J<&jOa@4{Y}1&IOZCDJY70M}BR(St z=5GY59Ca%p*b}Q7{hm#1(GEbgJ=GV5GR)zVS;2G+{B>3M%7jTF6jh^hw-G8xT4mjK zu+)rto`1|Qdf@_O!bK&-h?uOq5wVH}8F)Yt6<{$O&{oKzc)n46Z(k{dRDIRHzwM)} zT`5)N<%bHDeATd5Un>(3ON7Q`|64}F^2!C}S39=|%VW?}bNR+}7D;UfZzr_wxdJaDbXdeKyZyZ2GU{%fO zA3Z>_Vng%6GW7FY=QJqlok&a6eyiVS8{F4+U>h9aXC*opgW;j)tG=k3)mJgo=DlJ> zN?M=g;(TAkw=aS0pE$8%6j?DTHlWtLmFCTH!mTw*t@`hDUC6&q9nq^7#hkC4*d)coI5z_z~7IVSTPSpk zUR+T=%Z9fTuCDO|^3HP_+s4di#a*I($7nKGcd2WQ33#F;BeWYHx`l$o)Q7!Z@N^+c zI>4Y7vA_e^bDO9af~Rn@<0iTexDnfDy+i6i3KCsk+|6dNEO^Ty%9XqH*n<@Q6pNB_ zP_sqqtEn^@>IZXA_4j*H42L`Ft1sEd$t*jRP|~4C`wJ>44WEp`tOdfYQn!@K>Z`V|{_La?4ZvWBKv2e;{Y02P+ zFXQ{B@XnVr{h@d_$fO6OGv3m{aBj-JcCINbV<^(`V5t%PpF^e+gacwO9sjD?=tsQA zND)f;L>ZX#3)SM*HC+h)a9B}uTWOjuT6|Mjux%(qXcDW1(?l}+0dMg7GtgNdKOFj?kw zp<35}pyMH_Gj6t(pJzGTa6tp%gxk7+D`F`4N_^gEAis9YYUS4U&Bx=pXB%ebz!&_hrC7d(Fm}Rlm=G{dZ5xIp}zOIl^4swUzq| z{#DaoH}`K~5?lPwIy=1=P)08dbf8#C*{p6QgPa@EDW>yT5WBv|mskRw-CBG1vVQt0 z;e2Y}T{6o@%|DZvoQkN^8A`bHcF3mBw!rhGC~!ZC z?J~G>BNO?8|G3x@;)zE8I!_62iJW$Va4#EpM!>}xTSut!8C$b8IeS|PjkQgKwf(_0GpA_paj96%0nmi zn|RGdCw4RnR(1)TrfgNWl&_RWVRH&g+}@Mf`%Z7Z@bS+GVO$aNMS9RwWKNH2@N~o< z4Ufzrs^2L-T)}d}HMm^w?;my%bHi|B*sGt li + :display inline + :margin + :right 1em a - :font - :size smaller - :display block - :height 100% - :border - :bottom 1px solid #eee :padding 2px @@ -1036,3 +1034,7 @@ header .edit_photo :display none + +#section_header + :background + :color #aaa