about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-21 17:18:30 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-21 17:18:30 +0100
commit02696a063eabec1715c4d0b359744fef10049486 (patch)
tree650e285c34e49c9ecbdb8c8730575f7c6571b79e
parent9d55529318a285ced484b9216df9064914d6f790 (diff)
Change default avatar, redirect to home after sign up
-rw-r--r--app/assets/images/avatars/missing.pngbin909 -> 9880 bytes
-rw-r--r--app/assets/stylesheets/accounts.scss1
-rw-r--r--app/controllers/auth/registrations_controller.rb2
-rw-r--r--app/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
index 223b4ed2c..f22c6c049 100644
--- a/app/assets/images/avatars/missing.png
+++ b/app/assets/images/avatars/missing.png
Binary files differdiff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss
index ab39c8be0..571cee5c9 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 3114ae60a..5e1f5214b 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 f99460083..815d05f0c 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