diff --git a/app/views/aspects/_all_aspects_contacts.haml b/app/views/aspects/_all_aspects_contacts.haml index 0ede5e5b8..ab2bcc68e 100644 --- a/app/views/aspects/_all_aspects_contacts.haml +++ b/app/views/aspects/_all_aspects_contacts.haml @@ -8,17 +8,6 @@ = new_request_link(@request_count) #left_pane.everyone - %h3= t('.all_contacts') - - .section.contact_pictures - - for contact in @contact_hashes - = person_image_link(contact[:person]) - - - if @contacts.count == 0 - %h4 - = t('.no_contacts') - = form_tag(people_path, :method => 'get') do - = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5 .section.aspect_listings %h3 @@ -30,6 +19,19 @@ - for a_hash in @aspect_hashes = render :partial => 'aspects/aspect', :locals => a_hash + .section.contact_pictures + %h3 + = t('.all_contacts') + + - for contact in @contact_hashes + = person_image_link(contact[:person]) + + - if @contacts.count == 0 + %h4 + = t('.no_contacts') + = form_tag(people_path, :method => 'get') do + = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5 + .section %h3= t('shared.invitations.invites') = render "shared/invitations", :invites => @invites diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 9dbf397a5..e349c350d 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -21,5 +21,11 @@ = will_paginate @posts .span-8.last + + - if @request_count > 0 + #new_request_pane{:class => "everyone"} + %h1.new_request{:style => 'text-align:center'} + = new_request_link(@request_count) + = render 'aspects/all_aspects_contacts'