logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 02696a063eabec1715c4d0b359744fef10049486
parent: 9d55529318a285ced484b9216df9064914d6f790
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon, 21 Mar 2016 17:18:30 +0100

Change default avatar, redirect to home after sign up

Diffstat:

Mapp/assets/images/avatars/missing.png0
Mapp/assets/stylesheets/accounts.scss1+
Mapp/controllers/auth/registrations_controller.rb2+-
Mapp/views/accounts/show.html.haml10+++++++---
4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/assets/images/avatars/missing.png b/app/assets/images/avatars/missing.png Binary files differ. diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss @@ -267,5 +267,6 @@ font-weight: 500; text-align: center; padding: 15px 0; + padding-bottom: 25px; cursor: default; } diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb @@ -17,6 +17,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController end def after_sign_up_path_for(resource) - account_path(resource.account) + root_path end end diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml @@ -7,8 +7,12 @@ = render partial: 'header' -.activity-stream - - @statuses.each do |status| - = render partial: 'stream_entries/status', locals: { status: status, include_threads: false, is_successor: false, is_predecessor: false } +- if @statuses.empty? + .accounts-grid + = render partial: 'nothing_here' +- else + .activity-stream + - @statuses.each do |status| + = render partial: 'stream_entries/status', locals: { status: status } = will_paginate @statuses, pagination_options