diff --git a/app/views/aspects/_no_contacts_message.haml b/app/views/aspects/_no_contacts_message.haml deleted file mode 100644 index 0878ffabc72d84d6a14d151056ed3cd36eef1178..0000000000000000000000000000000000000000 --- a/app/views/aspects/_no_contacts_message.haml +++ /dev/null @@ -1,9 +0,0 @@ --# Copyright (c) 2010, Diaspora Inc. This file is --# licensed under the Affero General Public License version 3 or later. See --# the COPYRIGHT file. - -#no_contacts.floating.empty_message{:style => ("display:none" unless contact_count == 0)} - %h3=t('.nobody') - - if current_user.invites > 0 - %h4= link_to t('.invite'), new_user_invitation_path - diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index eeb06b112b96191a31ae96cee6e89e06a5fe1a42..3983696b2fd1cf66aaa5f70a16facf7502a75ea4 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -6,10 +6,7 @@ - content_for :head do = include_javascripts :home - .span-15.append-2 - = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contact_count - #aspect_stream_container = render 'aspect_stream', :aspect => @aspect, diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 8e58642e4b2bfc1cd463a701255d9613e3c918d2..65a4eb877f7683dc13cec574a316d89a41dcef9c 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -100,12 +100,6 @@ en: post_time: "post time" show: edit_aspect: "edit aspect" - no_contacts_message: - nobody: "Bring the people that matter in your life to Diaspora!" - nobody_in_aspect: "Your aspect '%{aspect_name}' is empty." - add_contact: "Add a contact" - add_contact_to: "Add someone to %{aspect_name}" - invite: "Invite someone to join Diaspora!" no_posts_message: start_talking: "Nobody has said anything yet. Get the conversation started!" manage: diff --git a/features/signs_up.feature b/features/signs_up.feature index ed5ee378aad2950651533eab2363c0cc6e197edd..bb435d781a64d47cf7adb2123c7985bcd6f9fce0 100644 --- a/features/signs_up.feature +++ b/features/signs_up.feature @@ -23,7 +23,6 @@ Feature: new user registration Then I should be on the aspects page And I should not see "skip getting started" - And I should see "Bring the people that matter in your life to Diaspora!" Scenario: new user skips the setup wizard and returns to the setup wizard When I follow "skip getting started" @@ -34,4 +33,3 @@ Feature: new user registration When I follow "skip getting started" And I wait for "the aspects page" to load Then I should be on the aspects page - And I should see "Bring the people that matter in your life to Diaspora!"