consolidated invite/invite friends sections on aspect/index

app/views/aspects/index.html.haml

@@ -41,12 +41,8 @@
     = render 'aspects/aspect_listings', :aspects => @aspects, :contacts => @contacts
 
   .section
-    %h4= t('shared.invitations.invites')
+    %h4= t('shared.invitations.invite_your_friends')
     = render "shared/invitations", :invites => @invites
 
-  - if SERVICES['facebook']['app_id'] !=""
+
-    .section
-      %h4
-        = t('.invite_your_friends')
-      = link_to t('.from_facebook'), friend_finder_path('facebook'), :rel => 'facebox'
 

app/views/shared/_invitations.haml

@@ -2,8 +2,11 @@
   = t('.invites_closed')
 -else
   -if invites > 0
-    = link_to t('.invite_someone'), new_user_invitation_path, :title => t('.invite_someone')
+    - if SERVICES['facebook']['app_id'] !=""
+      %h4{:style => 'text-align:center;'}
+        = link_to t('.from_facebook'), friend_finder_path('facebook'), :rel => 'facebox'
+        or
+        = link_to t('.by_email'), new_user_invitation_path, :title => t('.invite_someone')
     = t('.invitations_left', :count => invites) 
   - else
     = t('.dont_have_now')
-

config/locales/diaspora/en.yml

@@ -120,6 +120,9 @@ en:
           invitations_left: "(%{count} left)"
           dont_have_now: "You don't have any right now, but more invites are coming soon!"
           invites_closed: "Invites are currently closed on this Diaspora pod"
+          invite_your_friends: "Invite your friends"
+          from_facebook: "From Facebook"
+          by_email: "by Email"
       reshare:
           reshare: "Reshare"
       public_explain:
@@ -189,8 +192,6 @@ en:
       index:
           handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
           no_contacts: "No contacts"
-          invite_your_friends: "Invite your friends"
-          from_facebook: "From Facebook"
   notifications:
       request_accepted: "accepted your share request."
       new_request: "offered to share with you."