From 461e4cfd8c5af2f92876cb944b8cad7ede51306e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 10 Oct 2015 22:50:33 +0200
Subject: [PATCH] Cleanup the code

- Extract JS from HTML
- Remove search link on message
- Remove duplicated invitation modal
---
 .../javascripts/app/views/stream_view.js      |  7 ++++++
 app/views/aspects/_no_contacts_message.haml   | 24 +++++--------------
 app/views/shared/_invitations.haml            | 16 ++++---------
 config/locales/diaspora/en.yml                |  3 +--
 4 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/app/assets/javascripts/app/views/stream_view.js b/app/assets/javascripts/app/views/stream_view.js
index 5bec76756..45e2091ff 100644
--- a/app/assets/javascripts/app/views/stream_view.js
+++ b/app/assets/javascripts/app/views/stream_view.js
@@ -11,6 +11,7 @@ app.views.Stream = app.views.InfScroll.extend({
     this.setupNSFW();
     this.setupInfiniteScroll();
     this.markNavSelected();
+    this.initInvitationModal();
   },
 
   postClass : app.views.StreamPost,
@@ -27,6 +28,12 @@ app.views.Stream = app.views.InfScroll.extend({
     var streamSelection = $("#stream_selection");
     streamSelection.find("[data-stream]").removeClass("selected");
     streamSelection.find("[data-stream='" + activeStream + "']").addClass("selected");
+  },
+
+  initInvitationModal : function() {
+    $(".invitations-link").click(function() {
+      app.helpers.showModal("#invitationsModal");
+    });
   }
 });
 // @license-end
diff --git a/app/views/aspects/_no_contacts_message.haml b/app/views/aspects/_no_contacts_message.haml
index 44188f6f7..733db4135 100644
--- a/app/views/aspects/_no_contacts_message.haml
+++ b/app/views/aspects/_no_contacts_message.haml
@@ -4,26 +4,14 @@
 
 #no_contacts.empty_message
   %p.lead
-    = t('.you_should_add_some_more_contacts')
+    = t(".you_should_add_some_more_contacts")
 
   %p
-    != t('.try_adding_some_more_contacts',
-         search_link: link_to(t('.search_link_text'), search_path),
-         invite_link: link_to(t('.invite_link_text'),
-                                "invitationsModal",
-                                id: "invitations-link",
+    != t(".try_adding_some_more_contacts",
+         invite_link: link_to(t(".invite_link_text"),
+                                "#",
+                                class: "invitations-link",
                                 data: {toggle: "modal"}))
 
-  = render "shared/modal",
-      path: new_user_invitation_path,
-      id: "invitationsModal",
-      title: t("invitations.new.invite_someone_to_join")
-
   - if AppConfig.settings.community_spotlight.enable?
-    != t('.or_spotlight', :link => link_to(t(".community_spotlight") , community_spotlight_path))
-
--# This will have to be extracte in a JS view
-:javascript
-  $("#invitations-link").click(function(){
-    app.helpers.showModal("#invitationsModal");
-  });
+    != t(".or_spotlight", link: link_to(t(".community_spotlight"), community_spotlight_path))
diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml
index 83f9b7807..4c45deee7 100644
--- a/app/views/shared/_invitations.haml
+++ b/app/views/shared/_invitations.haml
@@ -1,15 +1,9 @@
-= t('.share_this')
+= t(".share_this")
 = invite_link(current_user.invitation_code)
-#invitations-button.btn.btn-link{ "data-toggle" => "modal"}
+.invitations-link.btn.btn-link#invitations-button{"data-toggle" => "modal"}
   = t(".by_email")
 
-= render 'shared/modal',
+= render "shared/modal",
     path: new_user_invitation_path,
-    id: 'invitationsModal',
-    title: t('invitations.new.invite_someone_to_join')
-
--# This will have to be extracte in a JS view
-:javascript
-  $("#invitations-button").click(function(){
-    app.helpers.showModal("#invitationsModal");
-  });
+    id: "invitationsModal",
+    title: t("invitations.new.invite_someone_to_join")
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index a96ff23ca..bd4f97f42 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -204,8 +204,7 @@ en:
       start_talking: "Nobody has said anything yet!"
     no_contacts_message:
       you_should_add_some_more_contacts: "You should add some more contacts!"
-      try_adding_some_more_contacts: "You can %{search_link} or %{invite_link} more contacts."
-      search_link_text: "search"
+      try_adding_some_more_contacts: "You can search or %{invite_link} more contacts."
       invite_link_text: "invite"
       or_spotlight:  "Or you can share with %{link}"
       community_spotlight: "Community spotlight"