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

app/controllers/application_controller.rb

@@ -2,7 +2,8 @@ class ApplicationController < ActionController::Base
   
   protect_from_forgery :except => :receive
   
-  before_filter :set_friends_and_status, :count_requests
+  before_filter :set_friends_and_status
+  before_filter :count_requests
 
   layout :layout_by_resource
 
@@ -17,8 +18,6 @@ class ApplicationController < ActionController::Base
   def set_friends_and_status
     if current_user
       @groups = current_user.groups 
-      @friends = current_user.friends
-      @group = params[:group] ? current_user.group_by_id(params[:group]) : current_user.groups.first 
     end
   end
 

app/controllers/groups_controller.rb

@@ -2,7 +2,9 @@ class GroupsController < ApplicationController
   before_filter :authenticate_user!
 
   def index
-    @posts = current_user.raw_visible_posts.paginate :page => params[:page], :order => 'created_at DESC'
+    @posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :order => 'created_at DESC'
+    @group = :all
+    @friends = current_user.friends
   end
 
   def create
@@ -28,7 +30,7 @@ class GroupsController < ApplicationController
   end
   
   def show
-    @people_ids = @group.person_ids
+    @person_ids = @group.person_ids
 
     @group = Group.first(:id => params[:id])
 

app/controllers/status_messages_controller.rb

@@ -1,13 +1,6 @@
 class StatusMessagesController < ApplicationController
   before_filter :authenticate_user!
 
-  def index
-    @status_messages = StatusMessage.paginate :page => params[:page], :order => 'created_at DESC'
-    respond_to do |format|
-      format.html 
-    end
-  end
-  
   def create
     params[:status_message][:group_ids] = params[:group_ids]
     @status_message = current_user.post(:status_message, params[:status_message])

app/helpers/application_helper.rb

@@ -1,7 +1,7 @@
 module ApplicationHelper
   
   def current_group?(group)
-    @group.id == group.id
+    @group == :all || @group.id == group.id
   end
   
   def object_path(object)

app/models/user.rb

@@ -71,6 +71,7 @@ class User
  
   def visible_posts( opts = {} )
     if opts[:by_members_of]
+      return raw_visible_posts if opts[:by_members_of] == :all
       group = self.groups.find_by_id( opts[:by_members_of].id )
       group.posts
     end

app/views/groups/index.html.haml

@@ -2,9 +2,7 @@
   welcome,
   = current_user.profile.first_name
 
-- @group.nil? ? group_id = nil : group_id = @group.id
+= render "shared/publisher", :group_ids => :all
-
-= render "shared/publisher", :group_id => group_id
 
 %ul#stream
   - for post in @posts

app/views/people/_sidebar.html.haml

@@ -1,11 +0,0 @@
-%ul#friend_stream.nav
-  %h3 friends
-  - for friend in @friends
-    = person_image_link(friend)
-
-  %li= link_to "view all", people_path
-  
-  %br
-  %br
-
-= link_to "add a new person", requests_path

app/views/shared/_group_nav.haml

@@ -1,8 +1,11 @@
 #group
   %ul
-    = link_to @group.name, @group, :class => "selected"
+    - if @group == :all
-    = link_to "edit", edit_group_path(@group)
+      = link_to "All Groups", root_url, :class => "selected"
 
+    - elsif @group
+      = link_to @group.name, @group, :class => "selected"
+      = link_to "edit", edit_group_path(@group)
     
     - for group in @groups
       - unless (group.id.to_s == params[:id])
@@ -11,16 +14,17 @@
 
     %li.new_group= link_to("NEW GROUP", "#add_group_pane", :id => "add_group_button")
 
-    .yo{ :style => "display:none;"}
+      .yo{ :style => "display:none;"}
-      #add_group_pane
+        #add_group_pane
-        = render "groups/new_group"
+          = render "groups/new_group"
 
   - if @group
     #friend_pictures
-      - for friend in @group.people
+      - for friend in @friends
         = person_image_link(friend)
       = link_to (image_tag 'add_friend_button.png'), "#add_request_pane", :id => 'add_request_button'
 
-      .yo{:style => 'display:none'}
+      - unless @group == :all
-        #add_request_pane
+        .yo{:style => 'display:none'}
-          = render "requests/new_request"
+          #add_request_pane
+            = render "requests/new_request"

app/views/shared/_publisher.haml

@@ -18,7 +18,7 @@
           going to...
           - for group in current_user.groups
             %li
-              = check_box_tag("group_ids[]", group.id, current_group?(group))
+              = check_box_tag("group_ids[]", group.id, current_group?(group) )
               = group.name
       .span-1.last
         = f.submit "Post"

config/routes.rb

@@ -1,9 +1,9 @@
 Diaspora::Application.routes.draw do
-  resources :people
+  resources :people, :only => [:index, :show, :destroy]
   resources :users, :except => [:create, :new]
-  resources :status_messages
+  resources :status_messages, :except => [:index]
-  resources :comments
+  resources :comments, :except => [:index]
-  resources :requests
+  resources :requests, :except => [:edit, :update]
   resources :photos, :except => [:index]
   resources :albums
   resources :groups