From 02696a063eabec1715c4d0b359744fef10049486 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 21 Mar 2016 17:18:30 +0100 Subject: [PATCH] Change default avatar, redirect to home after sign up --- app/assets/images/avatars/missing.png | Bin 909 -> 9880 bytes app/assets/stylesheets/accounts.scss | 1 + .../auth/registrations_controller.rb | 2 +- app/views/accounts/show.html.haml | 10 +++++++--- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/images/avatars/missing.png b/app/assets/images/avatars/missing.png index 223b4ed2ce532f2110a2e8338b75076d0fac4aee..f22c6c04902be1820e6eb0a17e810970828c9d02 100644 GIT binary patch literal 9880 zcmcI~1x#FFwC3P21I4|_V8xvl3beTU;4Xz0Xp2j68Qk67-MzRLhvF31;uI|d%uZkO z-X@#fTBg#QjCKzb$_!ieE4uPlwRi9(ErgD*4{7YhK; z0_3H{HQiTEv%V!7>UbY?-*xKP>YT&!wJVy&l0Pgb*G1`Yzu+<09Pr~A%3g}aW{4#x zdqGY{AV=2sA{$8sAiN9Z!Oqabju4|1uDGizxAi?=|GT55#br~bxHf;} zQPY*<^e}SPbkybf{`?Ns*%4aOyiqQO34S4FL5L^8%r1eMSBnWIA^}6ybfI_>X88YQ zgZ9z=mkl#W`ajnFv*7_F{$t%g+kgDVR1r^Vn;Zb=kcC=KvkJeG=7{68?Yw*YoxL3wCW06O9yQ?&{uQN!x14~ zZ|D*gNSA_hb?{v4a#hOz)U&%OJ8gMuMW$o2>L&pAW`p8=^X^tsOpW9BpcagbD|t8t zfx;tN)Hg?({Tr+otz{Y2V%)~!`IR5Z(|)}xPHp+&ig zqu%h%f)bvKiiFUdaEU|Y(fqbh6w##L9bL(^=^OL@!SBB`*i9Eh@sK5^u7b146<>AL z(e%gUK1*{AP3!iLHT|DinX<*^<&?`2jyeG)+_Bp6+gvw_B!>G}aFJ`ppm z%UaW;?)ImFx{v&gp7%E%IY?i4+LFsKWN?E>`U^xk_o)0WnPqms2rEpu0bgf19ccKx zlTo+b)Myu)jM`HamU7QJv zjoJn{CtB6{@xVazHfIlMQ!NyX_X*di@Y4(3zdDpN_qR!h?Qj4cY$%l}-jYyjaDl@4 zc~Nnz>e8q&L^2OYO9_iqaso%0R5iMNji{>_@cQ}6)!E0~X(nWNAV@Elv-Tk&qi!pw z+OK3Z1NLh${~;Y6Xq%_`xvK3Df(vEJO_W%hm{__kpj7v|SW`6u zbD5dyXH5?t6;b*6eD%WcA^nv&TQ)x}6UX#dHu0v? zKi7xMxiM%kyfFc=of(Bhnfx-I3!nc z9jx>%G0-n_a&wG((&ib?vR>J=-+8&Fl(Y2b>3Gu)i*w952t?r|Us0OT&>ED~c;c^C zxudf*3v3LjJsp0twK;4ev#m7#jer0WGczS{u8d25p$RjEig1sLPD`Rk#$tGgwU8EL zU?0BYcvHe$!T=H1Bj7a?FJ?^CjFpGM5&6MN&=O85-=8U$j0Wl{7`zI&=OoeJC}E-jzL4R|l1s0|_Et zlx0>?UU6J^=KDFY{=-*BX?2W1Y8=GUpeD8a;l5AqP8od2#72P{K*}zA#s}&%nJL_8 zb~uy2zSaJ7W#=hd^L+keJS%iTrw_6dSTYJKm=!))Gf_5C6gnPjwkM(HDg9laF|YKz zz=joaxIr6bsCAD#`1MfyTSc<)4P-mhw|U;9RAkB%1Zmp_a;8 zh}fFY7=yWNKhZ(}<+;>=-f~jv%2V$mSx+6;Nn5MukEsWP_6@(5-k8mDM@^HTexqNS zrUM}|*GpiCNuM~`1OV`%y54WvwIeBi#KpUl$%?=m4l z4u{EfaNMbRLZhjhmw3VZD`k0grJEGcT{~87*P^=g%>`k5&+W!{EEPt9%$~E39K98D zFRO(9�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 P89-iIMXFlDG~j;#=M1Nn literal 909 zcmeAS@N?(olHy`uVBq!ia0y~yVAKI&4mO}jWo=(6kYY>nc6VX;4}uH!E}sk(;Vkfo zEM{Qf76xHPhFNnYfP(BLp1!W^513?lRD?EONq!F$k}PqJC~?lu%}vcKVQ?-=O)N=G zQ7F$W$xv|j^bH7a+KaoK?Va3hK)fV-!^1iV4Uvpzopr0DGJM@&Et; diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss index ab39c8be02..571cee5c9b 100644 --- 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 index 3114ae60a8..5e1f5214bc 100644 --- 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 index f994600835..815d05f0c2 100644 --- 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