diff --git a/app/models/fb_status.rb b/app/models/fb_status.rb
index 0e7d2692e62384930422d7f1081fabff09f42656..7076cbd3138b0b72f1951d8ea46824dc40ae93fa 100644
--- a/app/models/fb_status.rb
+++ b/app/models/fb_status.rb
@@ -26,6 +26,4 @@ class FbStatus
:updated_time => Time.parse(hash['updated_time'])
)
end
-
end
-
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 772a71971aaf4887490a4a98ec99edf46a87a863..4935531d6ddc0146bddb9b647eb8f00199aa8111 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -9,7 +9,7 @@
= render "shared/aspect_friends"
- content_for :publish do
- = render "shared/publisher", :aspect_ids => :all
+ = render "shared/publisher", :aspect_ids => :all, :broadcast => true
%ul#stream
- for post in @posts
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index b8de1dd2478db69f6a59a8e99c57768d47fa5cf3..961dd9e0b0b982f68232454ae05c34664b77c04c 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -49,7 +49,7 @@
= text_field_tag 'q'
%li= link_to current_user.real_name, current_user.person
- %li= link_to t('.edit_profile'), edit_user_path(current_user)
+ %li= link_to "settings", edit_user_path(current_user)
%li= link_to t('.logout.'), destroy_user_session_path
= render "shared/aspect_nav"
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index 8d1fa844da53e396f6c23c36f35ff27b0f802c6f..799479a13db48b420ef8b6bf5d6797de238f13df 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -5,14 +5,12 @@
#aspect_nav
%ul
%li{:class => ("selected" if @aspect == :all)}
- = link_to t('.all_aspects'), root_url
+ = link_to "Everyone", root_url
- for aspect in @aspects
%li{:class => ("selected" if current_aspect?(aspect))}
= link_for_aspect aspect
%ul{ :style => "position:absolute;right:0;bottom:0.01em;"}
- %li{:class => ("selected" if @aspect == :public)}
- = link_to "Public", aspects_public_path
%li{ :style => "margin-right:0;", :class => ("selected" if @aspect == :manage)}
= link_to ( (@request_count == 0)? t('.manage') : "#{t('.manage')} (#{@request_count})"), {:controller => :aspects, :action => :manage}, :class => "edit_aspect_button", :class => new_request(@request_count), :title => t('.manage_your_aspects')
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 410670c85596582de166c5a7915e614b8ceaaca8..0a0eff891ee1e49dd898bfb6d38e318fd80970a7 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -10,8 +10,6 @@
%p
%label{:for => "status_message_message"} Message
= f.text_area :message, :rows => 2, :value => params[:prefill]
- = connected_fb_as(@access_token) if @logged_in && @aspect == :public
- = f.hidden_field( :public, :value => (params[:action] == 'public') )
%ul.aspect_selector{ :style => "display:none;"}
going to...
@@ -19,4 +17,12 @@
%li
= check_box_tag("aspect_ids[]", aspect.id, @aspect == :public || @aspect == :all || current_aspect?(aspect) )
= aspect.name
- = f.submit t('.share')
+
+ = connected_fb_as(@access_token) if @logged_in && @aspect == :public
+ = f.hidden_field( :public, :value => (params[:action] == 'public') )
+
+ .buttons
+ = f.submit t('.share'), :name => "share", :id => "fii"
+ - if broadcast
+ = f.submit "Broadcast", :class => "broadcast", :name => "broadcast"
+
diff --git a/app/views/shared/_sub_header.haml b/app/views/shared/_sub_header.haml
index e7dc4e79da51dfcb7f603cc2c1ee24b21f98fa7e..781b38629eef1966a82d05641864d492fa1359e1 100644
--- a/app/views/shared/_sub_header.haml
+++ b/app/views/shared/_sub_header.haml
@@ -7,7 +7,7 @@
- else
%h2
- if @aspect == :all
- = link_to t('.all_aspects'), root_path
+ = link_to "Everyone", root_path
- elsif @aspect == :public
= "Public"
- elsif @aspect == :manage
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 58264470fc51e782ebdc95e0ee231b0645aaa30c..119b86d3de08f63f467e22fd7d69cc573e8991c1 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -66,3 +66,10 @@ $.fn.clearForm = function() {
});
};
+$("#publisher .broadcast").live("click", function(evt){
+ evt.preventDefault();
+ if( confirm("Broadcast to the world?") ) {
+ $("#status_message_public").val("true");
+ $(this).submit();
+ }
+});
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6320a4567d33b8d488392ae2f87c63241246ed6f..4e5f7c3c6bd88fdf22b1e714ab8b9bf1318a9dfb 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -418,16 +418,16 @@ label {
#publisher form {
display: inline; }
#publisher form input[type='submit'] {
- float: right;
+ display: block;
margin-right: 20px;
- margin-top: 26px; }
+ width: 100%; }
#publisher textarea {
- width: 600px;
+ width: 570px;
height: 42px;
margin-top: 0;
margin-bottom: 0; }
- #publisher .button {
- margin-left: 100px; }
+ #publisher .buttons {
+ float: right; }
#image_picker .small_photo {
height: 100px;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 40e824fa02dc02f6828cfd469f08b03fa16ce1f3..46f533b82d23d00c36e72d0b3e5228df1c544552 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -563,20 +563,20 @@ label
:display inline
input[type='submit']
- :float right
+ :display block
:margin
:right 20px
- :top 26px
+ :width 100%
textarea
- :width 600px
+ :width 570px
:height 42px
:margin
:top 0
:bottom 0
- .button
- :margin-left 100px
+ .buttons
+ :float right
#image_picker
.small_photo
diff --git a/spec/models/retraction_spec.rb b/spec/models/retraction_spec.rb
index fd8e3d28a74609b4986fd21e4124b4c412ba386e..4cbb14e9efd8da2547db02aadc3cb71c384a9ae0 100644
--- a/spec/models/retraction_spec.rb
+++ b/spec/models/retraction_spec.rb
@@ -5,25 +5,27 @@
require 'spec_helper'
describe Retraction do
- before do
- @user = Factory.create(:user)
- @person = Factory.create(:person)
- @aspect = @user.aspect(:name => "Bruisers")
- @user.activate_friend(@person, @aspect)
- @post = @user.post :status_message, :message => "Destroy!", :to => @aspect.id
- end
+
+ let(:user) { Factory(:user) }
+ let(:person) { Factory(:person) }
+ let(:aspect) { user.aspect(:name => "Bruisers") }
+ let!(:activation) { user.activate_friend(person, aspect) }
+ let!(:post) { user.post :status_message, :message => "Destroy!", :to => aspect.id }
+
describe 'serialization' do
it 'should have a post id after serialization' do
- retraction = Retraction.for(@post)
+ retraction = Retraction.for(post)
xml = retraction.to_xml.to_s
- xml.include?(@post.id.to_s).should == true
+ xml.include?(post.id.to_s).should == true
end
end
+
describe 'dispatching' do
it 'should dispatch a message on delete' do
Factory.create(:person)
User::QUEUE.should_receive :add_post_request
- @post.destroy
+ post.destroy
end
end
+
end