Merge branch 'master' of github.com:diaspora/diaspora

app/controllers/application_controller.rb

@@ -16,9 +16,11 @@ class ApplicationController < ActionController::Base
   end
   
   def set_friends_and_status
-    @group = :all
-    @groups = current_user.groups
-    @friends = current_user.friends
+    unless current_user.nil?
+      @group = :all
+      @groups = current_user.groups
+      @friends = current_user.friends
+    end
   end
 
   def count_requests

app/controllers/dev_utilities_controller.rb

@@ -37,6 +37,8 @@ def warzombie
 
   def zombiefriendaccept
     render :nothing => true
+    set_profile_photo
+
     Request.all.each{|r| 
       current_user.accept_and_respond(r.id, current_user.groups.first.id)
     }
@@ -54,4 +56,15 @@ def warzombie
     file.write(seed_num_hash.to_yaml)
     file.close
   end
+
+  def set_profile_photo
+    album = current_user.post(:album, :name => "Profile Photos")
+    
+    backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
+    username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
+    photo = current_user.post(:photo, :album_id => album.id,
+                      :user_file => "public/images/users/#{username}.jpg") 
+   
+    current_user.update_profile(:image_url => photo.url)
+  end
 end

app/views/shared/_group_nav.haml

@@ -1,9 +1,10 @@
 #friend_pictures
   - for friend in @friends
     = person_image_link(friend)
-  = link_to (image_tag 'add_friend_button.png'), "#add_request_pane", :id => 'add_request_button'
 
   - unless @group == :all
+    = link_to (image_tag 'add_friend_button.png'), "#add_request_pane", :id => 'add_request_button'
+  
     .yo{:style => 'display:none'}
       #add_request_pane
         = render "requests/new_request"

app/views/shared/_publisher.haml

@@ -3,8 +3,8 @@
     = form_for StatusMessage.new, :remote => true do |f|
       = f.error_messages
 
-      .span-15.last
-        .span-2.last
+      .span-15
+        .span-2
           .user_image
             = owner_image_tag
         .span-13.last
@@ -12,8 +12,7 @@
             %label{:for => "status_message_message"} Message
             = f.text_area :message, :rows => 2
       
-      .span-3.last
-
+      .span-3
         %ul.group_selector
           going to...
           - for group in current_user.groups

db/seeds/backer.rb

@@ -19,10 +19,12 @@ def create
                      :password => "#{username+backer_info[backer_number]['pin'].to_s}",
                      :person => Person.new(
                        :email => "#{username}@#{username}.joindiaspora.com",
-                       :profile => Profile.new( :first_name => backer_info[backer_number]['given_name'], :last_name => backer_info[backer_number]['family_name'] ),
+                       :profile => Profile.new( :first_name => backer_info[backer_number]['given_name'], :last_name => backer_info[backer_number]['family_name'],
+                                               :image_url => "http://#{username}.joindiaspora.com/images/users/#{username}.jpg"),
                        :url=> "http://#{username}.joindiaspora.com/")
                     )
   user.person.save
+
   user.group(:name => "Presidents")
 end
 

public/stylesheets/application.css

@@ -319,18 +319,27 @@ label {
     height: 50px;
     padding-left: 10px; }
   #publisher ul.group_selector {
+    float: left;
     padding: 0;
     margin: 0;
-    width: 150px;
+    width: auto;
+    z-index: 10;
+    position: absolute;
+    height: auto;
+    overflow: visible;
     list-style: none; }
     #publisher ul.group_selector > li {
-      z-index: 10;
+      height: auto;
+      font-size: smaller;
+      padding: 2px;
       display: none;
       background-color: white; }
       #publisher ul.group_selector > li:active {
         background-color: yellow; }
     #publisher ul.group_selector:hover li {
       display: block; }
+  #publisher .button {
+    margin-left: 100px; }
 
 #image_picker .small_photo {
   height: 100px;

public/stylesheets/sass/application.sass

@@ -397,14 +397,21 @@ label
         :left 10px
 
   ul.group_selector
+    :float left
     :padding 0
     :margin 0
-    :width 150px
+    :width auto
+    :z-index 10
+    :position absolute
+    :height auto
+    :overflow visible
     :list
       :style none
 
     > li
-      :z-index 10
+      :height auto
+      :font-size smaller
+      :padding 2px
       :display none
       :background
         :color #fff
@@ -415,6 +422,9 @@ label
 
     &:hover li
       :display block
+      
+  .button
+    :margin-left 100px
 
 
 #image_picker

spec/models/person_spec.rb

@@ -144,5 +144,18 @@ describe Person do
     it 'should search by email exactly' do
       Person.by_webfinger(@friend_one.email).should == @friend_one
     end
+    
+    describe 'wall posting' do 
+      it 'should be able to post on another persons wall' do
+        
+        #user2 is in user's group, user is in group2 on user
+        friend_users(@user, @group, @user2, @group2)
+        
+        @user.person.post_to_wall(:person => @user2.person, :message => "youve got a great smile")
+        @user.person.wall_posts.count.should == 1
+        
+      end
+    end
+    
   end
 end