diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index b3ff64ad5..1ebc30a71 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -1887,8 +1887,6 @@ h1.tag .section :margin :bottom 4px - .see_all - :text-align center .avatar :height 45px diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml index 81cbd572f..e349008ab 100644 --- a/app/views/people/_profile_sidebar.html.haml +++ b/app/views/people/_profile_sidebar.html.haml @@ -47,7 +47,7 @@ - if @photos.present? %li %h4 - = t('_photos') + = t('.photos') .item_count = "#{@photos.count}" - @photos.limit(3).each do |photo| @@ -64,17 +64,17 @@ .section.contact_pictures - current_user.contacts.limit(8).each do |contact| = person_image_link contact.person, :size => :thumb_small - %p.see_all= link_to t('people.show.see_all'), contacts_path + %p.see_all= link_to t('layouts.header.view_all'), contacts_path - elsif @contact.persisted? && @contacts_of_contact_count > 0 %li#contacts_of_contact - %h4 + %h4 = t('_contacts') .item_count = @contacts_of_contact_count .section.contact_pictures -@contacts_of_contact.limit(8).each do |person| = person_image_link person, :size => :thumb_small - %p.see_all= link_to t('people.show.see_all'), person_contacts_path(@person) + %p.see_all= link_to t('layouts.header.view_all'), person_contacts_path(@person) %br %br diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 2cbb9ad5b..5506ceae1 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -590,6 +590,7 @@ en: location: "Location" gender: "Gender" born: "Birthday" + photos: "Photos" in_aspects: "in aspects" remove_from: "Remove %{name} from %{aspect}?" helper: