logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 943c69c65d6410d1689d4494c9214c90654db56b
parent: a4b8069cf5ed57d7cba066993f683941a6e60bc3
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu,  6 Oct 2016 23:15:50 +0200

Fix #73 - Click on in-UI profile avatar/name to open public profile

Diffstat:

Mapp/assets/javascripts/components/features/account/components/header.jsx11+++++++----
Mapp/controllers/settings_controller.rb2+-
2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/components/features/account/components/header.jsx b/app/assets/javascripts/components/features/account/components/header.jsx @@ -21,11 +21,14 @@ const Header = React.createClass({ return ( <div style={{ flex: '0 0 auto', background: '#2f3441', textAlign: 'center', backgroundImage: `url(${account.get('header')})`, backgroundSize: 'cover' }}> <div style={{ background: 'rgba(47, 52, 65, 0.8)', padding: '30px 10px' }}> - <div style={{ width: '90px', margin: '0 auto', marginBottom: '15px' }}> - <img src={account.get('avatar')} alt='' style={{ display: 'block', width: '90px', height: '90px', borderRadius: '90px' }} /> - </div> + <a href={account.get('url')} target='_blank' rel='noopener' style={{ display: 'block', color: 'inherit', textDecoration: 'none' }}> + <div style={{ width: '90px', margin: '0 auto', marginBottom: '15px' }}> + <img src={account.get('avatar')} alt='' style={{ display: 'block', width: '90px', height: '90px', borderRadius: '90px' }} /> + </div> + + <span style={{ color: '#fff', fontSize: '20px', lineHeight: '27px', fontWeight: '500', display: 'block' }}>{displayName}</span> + </a> - <span style={{ color: '#fff', fontSize: '20px', lineHeight: '27px', fontWeight: '500', display: 'block' }}>{displayName}</span> <span style={{ fontSize: '14px', fontWeight: '400', display: 'block', color: '#2b90d9', marginBottom: '15px' }}>@{account.get('acct')}</span> <p style={{ color: '#616b86', fontSize: '14px' }}>{account.get('note')}</p> </div> diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb @@ -9,7 +9,7 @@ class SettingsController < ApplicationController def update if @account.update(account_params) - redirect_to settings_path + redirect_to settings_path, notice: 'Changes successfully saved!' else render action: :show end