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

app/controllers/application_controller.rb

 class ApplicationController < ActionController::Base
   protect_from_forgery :except => :receive
   layout 'application'
-
+  before_filter :set_friends
+  
+  def set_friends
+    @friends = Friend.all
+  end
+  
 end

app/controllers/status_messages_controller.rb

@@ -2,7 +2,6 @@ class StatusMessagesController < ApplicationController
   before_filter :authenticate_user!
 
   def index
-    @status_message = StatusMessage.new
     @status_messages = StatusMessage.sort(:created_at.desc).all
     
 

app/views/dashboard/index.html.haml

 %h1 your network stream
+= render "status_messages/new_status_message"
 %ul#stream
   - for post in @posts
     = render type_partial(post), :post => post

app/views/friends/_sidebar.html.haml

+%h1 your friends
+%ul#stream
+  - for friend in @friends
+    = link_to friend.real_name, friend_path(friend)
+    %br
+  %br
+  %hr
+  = link_to "add a new friend", new_friend_path
\ No newline at end of file

app/views/layouts/application.html.haml

@@ -82,5 +82,8 @@
 
 
     #content
-      = yield
-      = render "posts/debug"
+      #main
+        = yield
+        = render "posts/debug"
+      #friends_list
+        = render 'friends/sidebar'
\ No newline at end of file

app/views/status_messages/_new_status_message.haml

-= form_for status_message, :remote => true do |f|
+= form_for StatusMessage.new, :remote => true do |f|
   = f.error_messages
   %p
     /= f.label :message

public/stylesheets/application.css

@@ -177,6 +177,18 @@ h3 {
   width: 100%;
   margin-bottom: 1em; }
 
+#main {
+  width: 70%;
+  min-width: 400px;
+  max-width: 700px;
+  float: left; }
+
+#friends_list {
+  float: right;
+  width: 20%;
+  min-width: 130px;
+  padding-left: 10%; }
+
 form {
   font-size: 130%;
   margin: 1em;

public/stylesheets/sass/application.sass

@@ -214,7 +214,19 @@ h3
     :width 100%
     :margin
       :bottom 1em
-
+      
+#main
+  :width 70%
+  :min-width 400px
+  :max-width 700px
+  :float left
+  
+#friends_list
+  :float right
+  :width 20%
+  :min-width 130px
+  :padding-left 10%
+  
 form
   :font
     :size 130%

spec/controllers/dashboard_controller_spec.rb

@@ -3,10 +3,19 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe DashboardController do
  render_views
   
-  it "index action should render index template" do
+  before do
     request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user)
+  end
+  
+  it "index action should render index template" do
     get :index
     response.should render_template(:index)
   end
+  
+  it "on index sets a friends variable" do
+    Factory.create :friend
+    get :index
+    assigns[:friends].should == Friend.all
+  end
 
 end