nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the last broken jasmine spec by restoring the #no_posts div

Browse source
This commit is contained in:
Raphael Sofaer 2011-08-05 15:08:45 -07:00
parent f0f388d9e1
commit 5eadc7d41c
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/aspects/_aspect_stream.haml
View file

@ -18,9 +18,12 @@
= render 'shared/publisher', :aspect => aspect, :aspect_ids => aspect_ids = render 'shared/publisher', :aspect => aspect, :aspect_ids => aspect_ids
- if current_user.contacts.size < 2 - if posts.length == 0
= render 'aspects/no_posts_message' = render 'aspects/no_posts_message'
- if current_user.contacts.size < 2
= render 'aspects/no_contacts_message'
#main_stream.stream{:data => {:guids => aspect_ids.join(',')}} #main_stream.stream{:data => {:guids => aspect_ids.join(',')}}
- if posts.length > 0 - if posts.length > 0
= render 'shared/stream', :posts => posts = render 'shared/stream', :posts => posts

11
app/views/aspects/_no_contacts_message.haml Normal file
View file

@ -0,0 +1,11 @@
-# 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.empty_message
= t('.you_should_add_some_more_contacts')
%br
%br
= t('.try_adding_some_more_contacts')
!= t('.or_featured', :link => link_to(t(".featured_users") , featured_users_path))

9
app/views/aspects/_no_posts_message.haml
View file

@ -2,10 +2,5 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
#no_contacts.empty_message #no_posts.empty_message
= t('.you_should_add_some_more_contacts') = t('.start_talking')
%br
%br
= t('.try_adding_some_more_contacts')
!= t('.or_featured', :link => link_to(t(".featured_users") , featured_users_path))

1
config/locales/diaspora/en.yml
View file

@ -111,6 +111,7 @@ en:
edit_aspect: "edit aspect" edit_aspect: "edit aspect"
no_posts_message: no_posts_message:
start_talking: "Nobody has said anything yet!" start_talking: "Nobody has said anything yet!"
no_contacts_message:
you_should_add_some_more_contacts: "You should add some more contacts!" you_should_add_some_more_contacts: "You should add some more contacts!"
try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts." try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
or_featured: "Or you can share with %{link}" or_featured: "Or you can share with %{link}"