diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index fc2066823..6f39cc674 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -21,6 +21,15 @@
.content
= t('aspects.index.cubbies.explanation')
= link_to t('aspects.index.cubbies.learn_more'), token_path
+.section
+ .title
+ = image_tag('/images/icons/heart.png')
+ %h5
+ = t('aspects.index.new_here.title')
+ .content
+ != t('aspects.index.new_here.follow', :link => link_to('#NewHere', tag_path(:name => "NewHere")))
+ %br
+ = link_to(t('aspects.index.new_here.learn_more'), "https://github.com/diaspora/diaspora/wiki/Welcoming-Committee")
.section
.title
@@ -40,11 +49,9 @@
%br
%br
%p
- != t('aspects.index.help.feature_and_forum', :gs=> link_to("GetSatisfaction", "http://getsatisfaction.com/diaspora", :target => '_blank'), :forum => link_to("Forum", "http://www.diasporaforum.org/", :target => '_blank'))
+ != t('aspects.index.help.tutorials_wiki_and_forum', :tutorial => link_to("Diasporial" , "http://diasporial.com/tutorials", :target => '_blank'), :wiki => link_to('Wiki','http://github.com/diaspora/diaspora/wiki', :target => '_blank'), :forum => link_to("Forum", "http://www.diasporaforum.org/", :target => '_blank'))
%p
- != t('aspects.index.help.tutorials_and_wiki', :tutorial => link_to("Diasporial" , "http://diasporial.com/tutorials", :target => '_blank'), :wiki => link_to('Wiki','http://github.com/diaspora/diaspora/wiki', :target => '_blank'))
- %p
- != t('aspects.index.help.email_feedback', :link => link_to("Email" , "mailto:yosem@joindiaspora.com"))
+ != t('aspects.index.help.email_feedback', :link => link_to("Email" , "mailto:feedback@joindiaspora.com"))
- unless AppConfig.configured_services.blank? || all_services_connected?
.section
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 8332f02ab..25c08ff57 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -165,6 +165,11 @@ en:
welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
introduce_yourself: "This is your stream. Jump in and introduce yourself."
+ new_here:
+ title: "Welcome New Users"
+ follow: "Follow %{link} and welcome new users to Diaspora*!"
+ learn_more: "Learn more"
+
help:
need_help: "Need Help?"
here_to_help: "The Diaspora community is here!"
@@ -173,9 +178,8 @@ en:
find_a_bug: "... find a %{link}?"
feature_suggestion: "... have a %{link} suggestion?"
- tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+ tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
- feature_and_forum: "%{gs} & %{forum}: Community-powered support and feature requests"
satisfaction: "%{link}: Community-powered support"
email_feedback: "%{link} your feedback, if you prefer"