Merge branch 'railsgirls-generator-app-4304-add-ignore-user-icon' into develop

Changelog.md

@@ -23,6 +23,8 @@
 * Disable "mark all as read" link if all notifications are read [#4463](https://github.com/diaspora/diaspora/pull/4463)
 * Collapse aspect list and tag followings list when switching to other views [#4462](https://github.com/diaspora/diaspora/pull/4462)
 * Highlight current stream in left sidebar [#4445](https://github.com/diaspora/diaspora/pull/4445)
+* Added ignore user icon [#4417](https://github.com/diaspora/diaspora/pull/4417)
+
 
 # 0.2.0.0
 

app/assets/javascripts/people.js

@@ -9,4 +9,18 @@
 $(document).ready(function() {
   $('#profile_buttons .profile_button div').tooltip({placement: 'bottom'});
   $('#profile_buttons .sharing_message_container').tooltip({placement: 'bottom'});
+  $("#block_user_button").click(function(evt) {
+    if(!confirm(Diaspora.I18n.t('ignore_user'))) { return; }
+      var personId = $(this).data('person-id');
+      var block = new app.models.Block();
+      block.save({block : {person_id : personId}}, {
+        success: function() {
+          $('#profile_buttons').attr('class', 'blocked');
+          $('#sharing_message').attr('class', 'icons-circle');
+          $('.profile_button, .white_bar').remove();
+        }
+      });
+
+      return false;
+   });
 });

app/assets/javascripts/profile.js

@@ -2,4 +2,5 @@
  *   licensed under the Affero General Public License version 3 or later.  See
  *   the COPYRIGHT file.
  */
-//= require jquery.autoSuggest.custom
+//= require jquery.autoSuggest.custom
+

app/assets/stylesheets/profile.css.scss

@@ -41,8 +41,7 @@
   .mutual {
     background-color: rgb(142, 222, 61);
     .profile_button {
-      //width: 50px;
-      width: 75px;
+      width: 50px;
     }
   }
   .only_sharing {
@@ -54,8 +53,7 @@
   .receiving {
     background-color: rgb(211, 211, 211);
     .profile_button {
-      //width: 75px;
-      width: 150px;
+      width: 75px;
     }
   }
   .not_sharing {

app/views/people/_profile_sidebar.html.haml

@@ -14,19 +14,20 @@
         - if @contact.receiving?
           .profile_button
             = link_to content_tag(:div, nil, :class => 'icons-mention', :title => t('people.show.mention'), :id => 'mention_button'), new_status_message_path(:person_id => @person.id), :rel => 'facebox'
-          //.white_bar
+          .white_bar
         
         - if @contact.mutual?
-          // remove the following line when adding the ignore button
-          .white_bar
+          
+          
           .profile_button
             = link_to content_tag(:div, nil, :class => 'icons-message', :title => t('people.show.message'), :id => 'message_button'), new_conversation_path(:contact_id => @contact.id, :name => @contact.person.name), :rel => 'facebox'
-          //.white_bar
+          .white_bar
         
-        //.profile_button
-        //  = link_to content_tag(:div, nil, :class => 'icons-ignoreuser', :title => t('people.show.message'), :id => 'block_user_button'), '/block', :rel => 'facebox'     
-        
-      %br
+        .profile_button
+          = link_to content_tag(:div, nil, :class => 'icons-ignoreuser block_user', :title => t('ignore'), :id => 'block_user_button', :data => { :person_id => @person.id }), '#', :rel => "nofollow" if @block.blank?
+               
+
+      %br 
 
     -if contact.sharing? || person == current_user.person
       %ul#profile_information

config/locales/diaspora/en.yml

@@ -20,6 +20,7 @@ en:
   cancel: "Cancel"
   delete: "Delete"
   hide: "Hide"
+  ignore: "Ignore"
   undo: "Undo?"
   or: "or"
   ago: "%{time} ago"

features/desktop/blocks_user.feature

@@ -20,7 +20,7 @@ Feature: Blocking a user from the stream
   Scenario: Blocking a user from the profile page
     When I am on the home page
     And I follow "Alice Smith"
-    When I click on the first block button
+    When I click on the profile block button
     And I confirm the alert
     And I am on the home page
     Then I should not see any posts in my stream

features/step_definitions/posts_steps.rb

@@ -39,6 +39,10 @@ When /^I click on the first block button/ do
   find(".block_user").click
 end
 
+When /^I click on the profile block button/ do
+  find("#profile_buttons .block_user").click
+end
+
 When /^I expand the post$/ do
   expand_first_post
 end