Merge pull request #5655 from svbergerem/contacts-page-add-invitations

Add invitation link to contacts page

Changelog.md

@@ -166,6 +166,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Dynamically compute minimum and maximum valid year for birthday field [#5639](https://github.com/diaspora/diaspora/pull/5639)
 * Show hovercard on mentions [#5652](https://github.com/diaspora/diaspora/pull/5652)
 * Make help sections linkable [#5667](https://github.com/diaspora/diaspora/pull/5667)
+* Add invitation link to contacts page [#5655](https://github.com/diaspora/diaspora/pull/5655)
 
 # 0.4.1.2
 

app/views/contacts/_sidebar.html.haml

@@ -1,7 +1,14 @@
 %h3
   = t('contacts.index.title')
 = render 'contacts/aspect_listings'
-- if AppConfig.settings.community_spotlight.enable?
 %hr
+- if AppConfig.settings.community_spotlight.enable?
   .text-center.spotlight
     = link_to t('contacts.spotlight.community_spotlight'), community_spotlight_path, :class => "element_selector"
+.text-center
+  .btn.btn-link{ 'data-toggle' => 'modal', 'data-target' => '#invitationsModal'}
+    = t('invitations.new.invite_someone_to_join')
+  = render 'shared/modal',
+      :path => new_user_invitation_path,
+      :id => 'invitationsModal',
+      :title => t('invitations.new.invite_someone_to_join')

app/views/contacts/index.html.haml

@@ -21,6 +21,9 @@
             %p
               != t('.no_contacts_message',
                    :community_spotlight => link_to(t('.community_spotlight'), community_spotlight_path))
+            %p
+              .btn.btn-link{ 'data-toggle' => 'modal', 'data-target' => '#invitationsModal'}
+                = t('invitations.new.invite_someone_to_join')
 
 -if @aspect
   #new_conversation_pane