visual fixes on people/show. contact count on aspect filters. contact list searches again.

app/controllers/application_controller.rb

@@ -16,7 +16,7 @@ class ApplicationController < ActionController::Base
     if user_signed_in?
       @aspect = nil
       @object_aspect_ids = []
-      @all_aspects = current_user.aspects.fields(:name)
+      @all_aspects = current_user.aspects.fields(:name, :contacts)
       @aspects_dropdown_array = @all_aspects.collect{|x| [x.to_s, x.id]}
       @notification_count = Notification.for(current_user, :unread =>true).all.count
     end

app/views/aspects/_aspect.haml

@@ -1,7 +1,8 @@
-%li{:data=>{:guid=>aspect.id}}
+%li{:data=>{:guid=>aspect.id}, :class => ("dull" if contacts.length == 0)}
   .right
-    = link_to t('contacts', :count => contact_count), edit_aspect_path(aspect), :rel => 'facebox'
-  %b{:class => ("dull" if contacts.length == 0)}
+    %b
+      = link_to t('contacts', :count => contact_count), edit_aspect_path(aspect), :rel => 'facebox'
+  %b
     = aspect.name
   %br
 

app/views/aspects/_aspect_listings.haml

@@ -4,8 +4,11 @@
 
 
 %h4
+  .right
+    = link_to t('contacts', :count => @contacts.count), aspects_manage_path
+
+  = @aspect_hashes.count
   = t('_aspects')
-  = link_to @aspect_hashes.count, aspects_manage_path
 
 %ul
   - for a_hash in aspect_hashes

app/views/layouts/_header.html.haml

@@ -46,8 +46,7 @@
 
         - for aspect in @all_aspects
           %li{:data=>{:guid=>aspect.id}, :class => ("selected" if @object_aspect_ids.include?(aspect.id))}
-            = link_for_aspect(aspect, :class => 'aspect_selector')
-            = link_to '▼', edit_aspect_path(aspect), :class => 'aspect_selector_edit', :rel => 'facebox'
+            = link_for_aspect(aspect, :class => 'aspect_selector', :title => "#{aspect.contacts.count} contacts")
 
         %li
           = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect'), :rel => 'facebox'

app/views/people/show.html.haml

@@ -5,19 +5,6 @@
 - content_for :page_title do
   = @person.name
 
-.span-24.last
-  #author_info
-    .from{:style=>"padding-left:0;display:block;"}
-      %h2{:style=>"display:block;"}
-        = @person.name
-        .right{:style => "top:0;"}
-          %span.description
-            = @person.diaspora_handle
-
-      #person_nav_links
-        = link_to t('layouts.header.view_profile'), person_path(@person)
-        = link_to t('_photos'), person_photos_path(@person)
-
 .span-8.append-1.last
   = render :partial => 'people/profile_sidebar', :locals => {:person => @person, :contact => @contact }
 
@@ -31,6 +18,17 @@
           = person_image_link person
 
 .span-15.last
+  #author_info
+    .right#person_nav_links
+      = link_to t('layouts.header.view_profile'), person_path(@person)
+      = link_to t('_photos'), person_photos_path(@person)
+
+    %h3
+      = @person.name
+      .description
+        = @person.diaspora_handle
+  %hr
+
   - unless @contact || current_user.person == @person
     - if @incoming_request
       .floating
@@ -42,18 +40,11 @@
 
   - if @posts.count > 0
     -if @post_type == :photos
-      %h4
-        = t('_photos')
       = render 'photos/index', :photos => @posts
     - else
-      %h4
-        - if @contact
-          = t('.recent_posts')
-        - else
-          = t('.recent_public_posts')
-
       #main_stream.stream
         = render 'shared/stream', :posts => @post_hashes
+
     = will_paginate @posts
 
   - else

app/views/photos/_index.html.haml

@@ -4,7 +4,6 @@
 
 
 - content_for :head do
-
   :javascript
     $(document).ready(function(){
       $("#thumbnails").find("img").bind("mouseenter",function(){

public/javascripts/contact-list.js

@@ -7,7 +7,7 @@
 $(document).ready(function() {
   var List = {
     initialize: function() {
-      $(".contact_list_search").keyup(function(e) {
+      $(".contact_list_search").live("keyup", function(e) {
         var search = $(this);
         var list   = $(this).siblings("ul").first();
         var query  = new RegExp(search.val(),'i');
@@ -15,11 +15,11 @@ $(document).ready(function() {
         $("li", list).each( function() {
           var element = $(this);
           if( !element.text().match(query) ) {
-            if( !element.hasClass('invis') ) {
-              element.addClass('invis').fadeOut(100);
+            if( !element.hasClass('hidden') ) {
+              element.addClass('hidden');
             }
           } else {
-            element.removeClass('invis').fadeIn(100);
+            element.removeClass('hidden');
           }
         });
       });

public/javascripts/view.js

@@ -137,6 +137,15 @@ var View = {
       }
     },
 
+    aspect_nav: {
+      bind: function() {
+        $("a", "#aspect_nav").tipsy({
+          gravity:"n",
+          delayIn: 600
+        });
+      }
+    },
+
     avatars: {
       bind: function() {
         $("#aspect_listings img.avatar, #manage_aspect_zones img.avatar").tipsy({

public/stylesheets/sass/application.sass

@@ -246,7 +246,7 @@ header
 
     &:hover
       :background
-        :color #fafafa
+        :color #fff
       :border
         :bottom 1px solid #ddd
       .right
@@ -294,9 +294,8 @@ header
     .from
       :padding 0
 
-  h2,h3
-    :margin
-      :bottom -2px
+  h3
+    :display inline-block
 
   #person_nav_links
     a
@@ -912,6 +911,9 @@ label
     :min-width 100px
     :height 100px
     :min-height 100px
+    :margin
+      :bottom 15px
+      :right 15px
 
     img
       :height 100px
@@ -1232,13 +1234,20 @@ ul#settings_nav
   :margin 0
   :padding 0
 
-#aspect_listings
-
 .dull
   :color #aaa
   :font
     :style italic
 
+  a
+    :color #69AEDD
+
+    &:hover
+      :color #82DAE9
+
+    &:active
+      :color #005D9C
+
 .section
   :margin
     :bottom 24px
@@ -1669,7 +1678,6 @@ ul#request_result
     :padding 0
 
     > li
-      :display block
       :position relative
       :height 50px
       :padding 4px
@@ -2162,3 +2170,4 @@ ul.show_comments
 
   :border
     :bottom 1px solid #ccc
+