Merge pull request #6349 from Faldrian/beautify-blocked-persons

Beautify ignored people list and add diaspora handle for identification

Changelog.md

@@ -48,6 +48,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Replace mobile icons for post interactions with Entypo icons [#6291](https://github.com/diaspora/diaspora/pull/6291)
 * Replace jquery.autocomplete with typeahead.js [#6293](https://github.com/diaspora/diaspora/pull/6293)
 * Redesign sidebars on stream pages [#6309](https://github.com/diaspora/diaspora/pull/6309)
+* Improve ignored users styling [#6349](https://github.com/diaspora/diaspora/pull/6349)
 
 ## Bug fixes
 * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

app/assets/stylesheets/mobile/settings.scss

@@ -29,3 +29,12 @@
     padding: 1rem;
   }
 }
+
+#blocked_people {
+  .blocked_person {
+    border-bottom: 1px solid $border-grey;
+    margin-top: 0;
+    .avatar { max-width: 35px; }
+    .info { color: $text; }
+  }
+}

app/assets/stylesheets/people.scss

@@ -28,3 +28,19 @@
     .info { font-size: $font-size-small; }
   }
 }
+#blocked_people {
+  .blocked_person {
+    border-bottom: 1px solid $border-grey;
+    padding: 10px;
+    margin: 0px;
+    font-size: 13px;
+    line-height: 16px;
+    min-height: 50px;
+    .avatar {
+      width: 50px;
+      height: 50px;
+    }
+    .info { font-size: $font-size-small; }
+    .btn-danger { margin-top: 9px; }
+  }
+}

app/views/users/_blocked_person.haml

@@ -0,0 +1,12 @@
+.media.blocked_person{id: person.id}
+  .pull-right
+    = link_to t("users.privacy_settings.stop_ignoring"), block_path(block),  class: "btn btn-danger", method: :delete
+  .media-object.pull-left
+    = person_image_link(person, size: :thumb_small)
+  .media-body
+    = person_link(person)
+    .info.diaspora_handle
+      = block.person.diaspora_handle
+    .info.tags
+      = Diaspora::Taggable.format_tags(person.profile.tag_string)
+  .clearfix

app/views/users/_privacy_settings.haml

@@ -18,7 +18,7 @@
                   = t('.strip_exif')
                 = f.submit t('users.edit.change'), class: 'btn btn-primary pull-right'
       %hr
-      
+
       .row
         .col-md-12
           %h3
@@ -27,9 +27,7 @@
           - if @blocks.length.zero?
             %p
               = t('.no_user_ignored_message')
-
+          - else
-          - @blocks.each do |block|
+            #blocked_people
-            = block.person_name
+              - @blocks.each do |block|
-            \-
+                = render partial: "blocked_person", locals: {block: block, person: block.person}
-            = link_to t('.stop_ignoring'), block_path(block),
-              method: :delete

config/locales/diaspora/en.yml

@@ -1387,7 +1387,7 @@ en:
       title: "Privacy settings"
       strip_exif: "Strip metadata such as location, author, and camera model from uploaded images (recommended)"
       ignored_users: "Ignored users"
-      stop_ignoring: "stop ignoring"
+      stop_ignoring: "Stop ignoring"
       no_user_ignored_message: "You are not currently ignoring any other user"
 
     destroy: