Merge branch 'master' of github.com:diaspora/diaspora

app/views/aspects/_no_friends_message.haml

@@ -2,12 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-#no_posts.empty_message{:style => ("display:none" unless @posts.count == 0)}
-  .null_arrow ⇧
-  %h3=t('.start_talking')
-
 #no_friends.empty_message{:style => ("display:none" unless @friends.count == 0)}
-
   - if (@aspect == :all) || (@aspect == :public)
     %h3=t('.nobody')
     %h4= link_to t('.add_friend'), aspects_manage_path
@@ -17,4 +12,3 @@
     %h4= link_to t('.add_friend_to', :aspect_name => @aspect.name), "#add_request_pane", :class => "add_request_button"
     %h4= link_to t('.invite', :aspect_name => @aspect.name), "#invite_user_pane", :class => "invite_user_button", :class => "invite_user_button", :title => t('.invite')
 
-

app/views/aspects/_no_posts_message.haml

@@ -0,0 +1,8 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+#no_posts.empty_message{:style => ("display:none" unless @posts.count == 0)}
+  .null_arrow ⇧
+  %h3=t('.start_talking')
+

app/views/aspects/index.html.haml

@@ -6,8 +6,9 @@
   = render "shared/aspect_friends"
 
 .span-15.last
-  = render 'aspects/empty_messages'
+  = render 'aspects/no_friends_message'
-  = render "shared/publisher"
+  = render 'shared/publisher'
+  = render 'aspects/no_posts_message'
   %ul#stream
     - for post in @posts
       = render type_partial(post), :post => post unless post.class == Album

app/views/aspects/show.html.haml

@@ -6,8 +6,9 @@
   = render "shared/aspect_friends"
 
 .span-15.last
-  = render 'aspects/empty_messages'
+  = render 'aspects/no_friends_message'
-  = render "shared/publisher"
+  = render 'shared/publisher'
+  = render 'aspects/no_posts_message'
   %ul#stream
     - for post in @posts
       = render type_partial(post), :post => post unless post.class == Album

config/locales/diaspora/en.yml

@@ -79,13 +79,14 @@ en:
           friends_albums: "Friends Albums"
           your_albums: "Your Albums"
   aspects:
-      empty_messages:
+      no_friends_message:
-          start_talking:  "Nobody has said anything yet.  Get the conversation started!"
           nobody: "We know you have friends, bring them to Diaspora!"
           nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
           add_friend: "Add a friend"
           add_friend_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:
           add_a_new_aspect: "Add a new aspect"
           add_a_new_friend:  "Add a new friend"