beautify ignored people list and add diaspora handle for identification

This commit is contained in:
Faldrian 2015-08-25 23:40:08 +02:00
parent e0ad53e465
commit 37793f7dbb
5 changed files with 43 additions and 8 deletions

View file

@ -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; }
}
}

View file

@ -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; }
}
}

View file

@ -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

View file

@ -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')
- @blocks.each do |block|
= block.person_name
\-
= link_to t('.stop_ignoring'), block_path(block),
method: :delete
- else
#blocked_people
- @blocks.each do |block|
= render partial: "blocked_person", locals: {block: block, person: block.person}

View file

@ -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: