diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index b0d5a2a1a..4864a53a1 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -13,8 +13,6 @@ = link_to "Edit Profile", edit_person_path(current_user.person) | = link_to "Edit Account", edit_user_path(current_user) - | - = link_to "Logout", destroy_user_session_path .span-15.last = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml index 55276ccad..882c64d4b 100644 --- a/app/views/people/_profile_sidebar.html.haml +++ b/app/views/people/_profile_sidebar.html.haml @@ -9,9 +9,9 @@ = action_link(person, is_contact) %ul - - if @posts.first - %li - %i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first)) + /- if @posts.first + /%li + /%i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first)) - if is_contact %li %ul#aspects_for_person @@ -23,16 +23,17 @@ -if is_contact || person == current_user.person %ul#profile_information %li - %b #{t('.bio')} - %br + %h3 #{t('.bio')} = person.profile.bio %li - %b #{t('.gender')} - %br - = person.profile.gender - %li - %b #{t('.born')} - %br - = "#{time_ago_in_words(person.profile.birthday)} #{t('ago')}" if @person.profile.birthday - + .span-4.last + %h3 #{t('.gender')} + = person.profile.gender + .span-4.last + %h3 #{t('.born')} + = "#{time_ago_in_words(person.profile.birthday)} #{t('ago')}" if @person.profile.birthday + %br + %br + %br + %br %b.small= person.diaspora_handle diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index dffd23bf2..53cfe10ab 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -5,6 +5,7 @@ .span-24.last = render 'shared/author_info', :person => @person, :profile => true + .span-8.append-1.last = render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @is_contact} @@ -19,7 +20,9 @@ = will_paginate @posts - else - %h3= t('.no_posts') + %ul#stream + %li + %h3= t('.no_posts') - else .floating diff --git a/app/views/photos/_index.html.haml b/app/views/photos/_index.html.haml index 56d7c736d..050679910 100644 --- a/app/views/photos/_index.html.haml +++ b/app/views/photos/_index.html.haml @@ -11,7 +11,7 @@ }); }); -.span-20.last +.span-18.last #thumbnails - for photo in photos .image_thumb diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index e36021b4b..c7705fecc 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -56,6 +56,7 @@ = link_to t('.delete_photo'), @photo, :confirm => t('are_you_sure'), :method => :delete, :class => 'button' .span-9.last + %h4{:style=>"margin-bottom:5px;"} Comments %div{id => 'photo_stream', :class => 'stream show'} %li.message{:data=>{:guid=>@photo.id}} = render "comments/comments", :post => @photo diff --git a/app/views/shared/_aspect_contacts.haml b/app/views/shared/_aspect_contacts.haml index f7104ddef..f4c005670 100644 --- a/app/views/shared/_aspect_contacts.haml +++ b/app/views/shared/_aspect_contacts.haml @@ -2,13 +2,13 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -- if @request_count > 0 - #left_pane{:class => "everyone"} - %h4 - = "#{@request_count} new requests!" - - %br - %br +- if (aspect == :all) && @request_count > 0 + #new_request_pane{:class => "everyone"} + %h1.new_request + - if @request_count > 1 + = link_to "#{@request_count} new requests!", aspects_manage_path + - else + = link_to "#{@request_count} new request!", aspects_manage_path #left_pane{:class => ("everyone" if aspect == :all)} %h2{:style=>"position:relative;"} diff --git a/app/views/shared/_author_info.html.haml b/app/views/shared/_author_info.html.haml index d348697ab..af6601c4a 100644 --- a/app/views/shared/_author_info.html.haml +++ b/app/views/shared/_author_info.html.haml @@ -1,4 +1,4 @@ -#author_info +#author_info{:class=>("profile" if defined?(profile))} = person_image_link(person) unless defined?(profile) .from %h2 @@ -12,8 +12,7 @@ - else - for aspect in current_user.aspects_with_post( post.id ) %li= link_to aspect.name, aspect - .right{:style=>"margin-right:315px;top:10px;"} - #person_nav_links - = link_to t('.view_profile'), person_path(person) - = link_to t('_photos'), person_photos_path(person) - = link_to t('.status_messages'), person_status_messages_path(person) + #person_nav_links + = link_to t('.view_profile'), person_path(person) + = link_to t('_photos'), person_photos_path(person) + = link_to t('.status_messages'), person_status_messages_path(person) diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index c7d009807..bdccd7ead 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -46,7 +46,6 @@ - for service in current_user.services = image_tag("social_media_logos/#{service.provider}-16x16.png") - = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;" .fancybox_content @@ -54,7 +53,7 @@ = render 'shared/public_explain' - #publisher_photo_upload - = t('or') - = render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id) + /#publisher_photo_upload + /= t('or') + /= render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id) diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 8d4e14fbc..3637fd008 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -192,6 +192,7 @@ header > li :list-style none :padding 12px + :min-height 50px :border :bottom 1px solid #eee @@ -275,6 +276,10 @@ header :padding 12px :top 0 + &.profile + .from + :padding 0 + h2 :display inline :margin @@ -571,6 +576,9 @@ ul.comments :width 300px #profile + h3 + :margin + :bottom 0 ul :list-style-type none :margin 0 @@ -581,7 +589,7 @@ ul.comments :top 1em > li :margin - :bottom 1em + :bottom 2em .stream, #profile, @@ -633,11 +641,12 @@ li.message .from .right :margin-right 1em #show_photo + :display inline-block :background :color #fff :padding 10px - :bottom 20px + :bottom 30px :-webkit-box-shadow 0 2px 4px #333 :-moz-box-shadow 0 2px 4px #333 @@ -660,7 +669,7 @@ li.message .from .right :size 16px :font :family 'marker felt', 'comic sans ms', 'comic sans', sans-serif - :color #555 + :color #333 #debug_info :margin-top 20px @@ -1813,3 +1822,18 @@ h3,h4 h4 :margin :bottom 0 + +#new_request_pane + :background + :color red + + :border-radius 4px + + :-webkit-box-shadow 0 1px 2px #666 + :-moz-box-shadow 0 1px 2px #666 + + h1 + a + :color #fff + :font + :weight bold