logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 777f527d86f8b0e541571b4f73fa4035010e3c65
parent: 88801f7554edda4d0d0a2403d841edef55443ab8
Author: Eugen <eugen@zeonfederated.com>
Date:   Sun, 15 Jan 2017 02:15:37 +0100

Merge pull request #474 from ineffyble/add-back-link-to-settings

Add a 'Back to Mastodon' link to footer of settings pages

Diffstat:

Mapp/views/settings/shared/_links.html.haml2++
Mconfig/locales/en.yml1+
2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/app/views/settings/shared/_links.html.haml b/app/views/settings/shared/_links.html.haml @@ -5,3 +5,4 @@ %li= link_to t('settings.preferences'), settings_preferences_path - if controller_name != 'registrations' %li= link_to t('auth.change_password'), edit_user_registration_path + %li= link_to t('settings.back'), root_path+ \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml @@ -90,6 +90,7 @@ en: settings: edit_profile: Edit profile preferences: Preferences + back: Back to Mastodon stream_entries: click_to_show: Click to show favourited: favourited a post by