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

app/controllers/status_messages_controller.rb

@@ -9,6 +9,7 @@ class StatusMessagesController < ApplicationController
   end
   
   def create
+    puts params.inspect
     @status_message = current_user.post(:status_message, params[:status_message])
     
     if @status_message.created_at

app/helpers/application_helper.rb

@@ -1,4 +1,9 @@
 module ApplicationHelper
+  
+  def current_group?(group)
+    @group.id == group.id
+  end
+  
   def object_path(object)
     eval("#{object.class.to_s.underscore}_path(object)")
   end

app/helpers/people_helper.rb

@@ -4,7 +4,7 @@ module PeopleHelper
     if params[:q]
       " results for #{params[:q]}"
     else
-      " people on this pod"
+      " people on pod is aware of"
     end
     
   end

app/views/shared/_publisher.haml

@@ -1,14 +1,18 @@
 #publisher
-
   #publisher_form
     = form_for StatusMessage.new, :remote => true do |f|
       = f.error_messages
 
       -if group_id
         = f.hidden_field :group_id, :value => group_id
+        
 
-      %p
+      %label{:for => "status_message_message"} Message
-        %label{:for => "status_message_message"} Message
+      = f.text_area :message, :rows => 2
-        = f.text_area :message, :rows => 2
+      %ul
-      %p.right
+        - for group in current_user.groups
+          %li
+            = group.name
+            = check_box_tag("groups_id[]", group.id, current_group?(group))
+      .right
         = f.submit "Post"

public/stylesheets/application.css

@@ -274,7 +274,7 @@ input[type='text'], textarea {
   font-size: 14px;
   padding: 0.3em;
   display: block;
-  width: 100%;
+  width: 66%;
   box-shadow: 0 2px 0px white;
   -webkit-box-shadow: 0 2px 0px white;
   -moz-box-shadow: 0 2px 0px white;

public/stylesheets/sass/application.sass

@@ -337,7 +337,7 @@ input[type='text'], textarea
     :size 14px
   :padding 0.3em
   :display block
-  :width 100%
+  :width 66%
   :box-shadow 0 2px 0px #fff
   :-webkit-box-shadow 0 2px 0px #fff
   :-moz-box-shadow 0 2px 0px #fff