From f590abb343b7ca075e53092fc7e6b886ccce99ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Rodr=C3=ADguez?= Date: Thu, 15 Nov 2012 18:17:15 -0200 Subject: [PATCH 1/2] fix 3682, use correct image path for padlocks --- app/views/aspects/toggle_contact_visibility.js.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/aspects/toggle_contact_visibility.js.erb b/app/views/aspects/toggle_contact_visibility.js.erb index 9598e4507..6c08e3b40 100644 --- a/app/views/aspects/toggle_contact_visibility.js.erb +++ b/app/views/aspects/toggle_contact_visibility.js.erb @@ -3,10 +3,10 @@ $(document).ready(function() { var padlockImg = $("#contact_visibility_padlock"); if(padlockImg.hasClass('open')) { - padlockImg.attr('src', 'images/icons/padlock-closed.png'); + padlockImg.attr('src', 'assets/icons/padlock-closed.png'); padlockImg.attr('title', "<%= t('aspects.edit.aspect_list_is_not_visible') %>"); } else { - padlockImg.attr('src', 'images/icons/padlock-open.png'); + padlockImg.attr('src', 'assets/icons/padlock-open.png'); padlockImg.attr('title', "<%= t('aspects.edit..aspect_list_is_visible') %>"); } padlockImg.toggleClass('open'); From f3134206e16aa6bb91f6c77cf05ad754cc336815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Rodr=C3=ADguez?= Date: Thu, 15 Nov 2012 18:18:47 -0200 Subject: [PATCH 2/2] update changelog --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index b411f0bd5..c0beae4ee 100644 --- a/Changelog.md +++ b/Changelog.md @@ -27,6 +27,7 @@ ## Bug Fixes +* Fix image path for padlocks [#3682](https://github.com/diaspora/diaspora/pull/3682) * Fix posting to Facebook and Tumblr. Have a look at the updated [services guide](https://github.com/diaspora/diaspora/wiki/Howto-setup-services) for new Facebook instructions. * Fix overflow button in mobile reset password. [#3697](https://github.com/diaspora/diaspora/pull/3697) * Fix issue with interacted_at in post fetcher. [#3607](https://github.com/diaspora/diaspora/pull/3607)