diff --git a/app/views/shared/_public_explain.haml b/app/views/shared/_public_explain.haml index 568f4d884..775051405 100644 --- a/app/views/shared/_public_explain.haml +++ b/app/views/shared/_public_explain.haml @@ -1,9 +1,12 @@ -%h1 you are about to post a public message! -%p - this message is going to be posted to your public feed, - and to any services you may have connected to Diaspora. +%h3 You are about to post a public message! +%p + Public messages will be available for others outside of Diaspora to see. - if @logged_in = connected_fb_as(@access_token) - else = link_to "Connect to Facebook", @fb_access_url + + %br + %br + = link_to "OK", '#', :class => "button", :onClick => '$.fancybox.close();' diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index c1886b5fb..a6f1bd92c 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -6,11 +6,7 @@ $("div.public_toggle input").live("click", function(evt){ if("#{@logged_in}" == "false" && $(this).attr('checked') == true){ - if(confirm("You are currently not connected to facebook. Sign in to facebook?")){ - window.location = "#{@fb_access_url}"; - } else { - $(this).attr('checked', false); - } + $(".question_mark").click(); }; }); @@ -34,8 +30,8 @@ - if @aspect == :all .public_toggle = f.check_box( :public, :value => false ) - share on facebook - = link_to 'public info', "#question_mark_pane", :class => 'question_mark' + make public + = link_to '(?)', "#question_mark_pane", :class => 'question_mark' .yo{:style => "display:none;"} #question_mark_pane = render 'shared/public_explain'