From e8c49feca48ef243c42c3e96b128d29c7f5d08fc Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Fri, 15 Oct 2010 14:10:10 -0700
Subject: [PATCH] made the public info link in all aspects publisher
---
app/views/shared/_invitations.haml | 2 +-
app/views/shared/_public_explain.haml | 9 +++++++++
app/views/shared/_publisher.haml | 5 ++++-
app/views/users/_services.haml | 2 +-
public/javascripts/view.js | 1 +
5 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 app/views/shared/_public_explain.haml
diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml
index 86a50c2cbb..b82cca1041 100644
--- a/app/views/shared/_invitations.haml
+++ b/app/views/shared/_invitations.haml
@@ -1,6 +1,6 @@
- unless @aspect == :all
%h4 Invites
- = link_to "Invite a friend", "#invite_user_pane", :class => "invite_user_button", :class => "invite_user_button", :title => "Invite a friend"
+ = link_to "Invite a friend", "#invite_user_pane", :class => "invite_user_button", :title => "Invite a friend"
= "(#{invites} left)"
%br
.yo{ :style => "display:none;"}
diff --git a/app/views/shared/_public_explain.haml b/app/views/shared/_public_explain.haml
new file mode 100644
index 0000000000..568f4d8842
--- /dev/null
+++ b/app/views/shared/_public_explain.haml
@@ -0,0 +1,9 @@
+%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.
+
+ - if @logged_in
+ = connected_fb_as(@access_token)
+ - else
+ = link_to "Connect to Facebook", @fb_access_url
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index b514a5e1e1..c1886b5fbd 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -35,7 +35,10 @@
.public_toggle
= f.check_box( :public, :value => false )
share on facebook
-
+ = link_to 'public info', "#question_mark_pane", :class => 'question_mark'
+ .yo{:style => "display:none;"}
+ #question_mark_pane
+ = render 'shared/public_explain'
.buttons
- if @aspect == :all
= f.submit t('.share'), :title => "Share with all aspects"
diff --git a/app/views/users/_services.haml b/app/views/users/_services.haml
index 80cf336633..a9a6d7977b 100644
--- a/app/views/users/_services.haml
+++ b/app/views/users/_services.haml
@@ -18,7 +18,7 @@
= link_to "Disconnect from Facebook", services_destroy_path
- else
- = link_to "Connect to Facebook (DO NOT USE WITH A REAL ACCOUNT)", @fb_access_url
+ = link_to "Connect to Facebook", @fb_access_url
#content_bottom
.back
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 94874358be..dec170a07b 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -30,6 +30,7 @@ $(document).ready(function(){
$(".add_request_button").fancybox({ 'titleShow': false });
$(".invite_user_button").fancybox({ 'titleShow': false });
$(".add_request_button").fancybox({ 'titleShow': false });
+ $(".question_mark").fancybox({ 'titleShow': false });
$("input[type='submit']").addClass("button");
--
GitLab