From 744693e7fb98cb22d0a978c2008986a2ef883bef Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Mon, 9 Aug 2010 17:21:12 -0700
Subject: [PATCH] RS, DG; There is now a add friend box on the front page that
 passes group idto the app

---
 app/controllers/application_controller.rb |  1 +
 app/controllers/dashboards_controller.rb  |  8 +++++++-
 app/views/blogs/_blog.html.haml           |  2 +-
 app/views/requests/_new_request.haml      |  4 +++-
 app/views/shared/_group_nav.haml          | 11 +++++++----
 public/javascripts/view.js                |  7 +++++--
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a36a8c873..8a6ab051e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -19,6 +19,7 @@ class ApplicationController < ActionController::Base
     @groups = current_user.groups
     @friends = current_user.friends if current_user
     @latest_status_message = StatusMessage.newest_for(current_user) if current_user
+    @group = params[:group] ? Group.first(:id => params[:group]) : Group.first
   end
 
   def count_requests
diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb
index 882cdca50..6801f734f 100644
--- a/app/controllers/dashboards_controller.rb
+++ b/app/controllers/dashboards_controller.rb
@@ -3,6 +3,12 @@ class DashboardsController < ApplicationController
   include ApplicationHelper
 
   def index
-    @posts = Post.paginate :page => params[:page], :order => 'created_at DESC'
+    if params[:group]
+      @people_ids = @group.people.map {|p| p.id}
+
+      @posts = Post.paginate :person_id => @people_ids, :order => 'created_at DESC'
+    else
+      @posts = Post.paginate :page => params[:page], :order => 'created_at DESC'
+    end
   end
 end
diff --git a/app/views/blogs/_blog.html.haml b/app/views/blogs/_blog.html.haml
index 0a4f79feb..0896d7d6b 100644
--- a/app/views/blogs/_blog.html.haml
+++ b/app/views/blogs/_blog.html.haml
@@ -3,7 +3,7 @@
   = person_image_tag(post.person)
 
   %span.from
-    = link_to_person post.person
+    = link_to post.person.real_name, post.person
     %b wrote a new blog post
     %br
   %b= post.title
diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
index 714168fd2..40555ba98 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -1,8 +1,10 @@
-= form_for @request  do |f|
+= form_for Request.new do |f|
   = f.error_messages
 
+
   Enter a Diaspora URL, Diaspora username, or random email address:  
   .field_with_submit
     = f.text_field :destination_url
+    = f.hidden_field :group, :value => @group.id
     = f.submit
 
diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml
index 47810c9c3..bd6af2ca2 100644
--- a/app/views/shared/_group_nav.haml
+++ b/app/views/shared/_group_nav.haml
@@ -1,7 +1,7 @@
 #group
   %ul
     - for group in @groups
-      %li= link_to group.name, group_path(group)
+      %li= link_to group.name, root_path(:group =>group.id)
 
     %li#add_group_button.new_group= link_to "NEW GROUP", "#"
 
@@ -9,8 +9,11 @@
       = render "groups/new_group"
 
   #friend_pictures
-    - for friend in @friends
+    - for friend in @group.people
       = person_image_link(friend)
 
-    .add_new
-      = link_to "+", requests_path
+    #add_request_button.add_new
+      = link_to "+", "#"
+
+    #add_request_pane.contextual_pane
+      = render "requests/new_request"
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 0c14d431e..399521156 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -83,9 +83,11 @@ $(document).ready(function(){
   //buttons//////
   function pane_toggler_button( name ) {
     $("#add_" + name + "_button").toggle(
-    function(){
+    function(evt){
+      evt.preventDefault();
       $("#add_" + name + "_pane").fadeIn(300);
-    },function(){
+    },function(evt){
+      evt.preventDefault();
       $("#add_" + name +"_pane").fadeOut(200);
     }
   );
@@ -94,6 +96,7 @@ $(document).ready(function(){
   pane_toggler_button("album");
   pane_toggler_button("group");
   pane_toggler_button("photo");
+  pane_toggler_button("request");
 
   $("input[type='submit']").addClass("button");