From 34819b4128dbcae7a019b94cf2e14ac58c9d91ba Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Mon, 7 May 2012 15:40:13 -0700
Subject: [PATCH] temp button instead of textbox for beta-limbo users

---
 app/assets/javascripts/app/pages/framer.js |  2 +-
 app/views/aspects/_aspect_stream.haml      | 12 ++++++++++--
 app/views/layouts/main_stream.html.haml    |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/app/pages/framer.js b/app/assets/javascripts/app/pages/framer.js
index b6465405c..aab1e5c1e 100644
--- a/app/assets/javascripts/app/pages/framer.js
+++ b/app/assets/javascripts/app/pages/framer.js
@@ -59,5 +59,5 @@ app.views.framerControls = app.views.Base.extend({
 
 //crazy hack for model publisher.
 function closeIFrame(){
-  location.reload()
+  location = "/people/" + app.currentUser.get("guid")
 };
\ No newline at end of file
diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml
index 13786de1d..40eba445a 100644
--- a/app/views/aspects/_aspect_stream.haml
+++ b/app/views/aspects/_aspect_stream.haml
@@ -5,10 +5,18 @@
 %h3#aspect_stream_header.stream_title
   = stream.title
 
-= render 'shared/publisher', :selected_aspects => stream.aspects, :aspect_ids => stream.aspect_ids, :for_all_aspects => stream.for_all_aspects?, :aspect => stream.aspect
+- if current_user.beta?
+  = link_to "Make something", "#composer", :rel => "facebox", :class => "button primary", :style => "display: block; margin: 20px 10px; margin-bottom: 30px; padding: 10px; text-align:center; font-weight: bold;"
+
+  #composer{:style => "display:none;"}
+    %iframe{:src => '/posts/new', :height => 500, :width => 700, :style => "border:none;"}
+
+- else
+  = render 'shared/publisher', :selected_aspects => stream.aspects, :aspect_ids => stream.aspect_ids, :for_all_aspects => stream.for_all_aspects?, :aspect => stream.aspect
 = render 'aspects/no_posts_message'
 
-#gs-shim{:title => popover_with_close_html("3. #{t('.stay_updated')}"), 'data-content' => t('.stay_updated_explanation')}
+- unless current_user.beta?
+  #gs-shim{:title => popover_with_close_html("3. #{t('.stay_updated')}"), 'data-content' => t('.stay_updated_explanation')}
 
 #main_stream.stream
 
diff --git a/app/views/layouts/main_stream.html.haml b/app/views/layouts/main_stream.html.haml
index 4aa30e9fd..e08963a1a 100644
--- a/app/views/layouts/main_stream.html.haml
+++ b/app/views/layouts/main_stream.html.haml
@@ -6,7 +6,7 @@
 - content_for :head do
   = javascript_include_tag :home
 
-- if current_user.getting_started?
+- if current_user.getting_started? && !current_user.beta?
   #welcome-to-diaspora
     .container{:style => "position: relative;"}
       .right