diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1314686d8..2af6df199 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -94,7 +94,7 @@ class ApplicationController < ActionController::Base def redirect_unless_admin unless current_user.admin? - redirect_to root_url, :notice => 'you need to be an admin to do that' + redirect_to multi_url, :notice => 'you need to be an admin to do that' return end end diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 5d43d159c..08c22913e 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -52,7 +52,7 @@ class PostsController < ApplicationController current_user.retract(@post) respond_to do |format| format.js {render 'destroy'} - format.all {redirect_to root_url} + format.all {redirect_to multi_path} end else Rails.logger.info "event=post_destroy status=failure user=#{current_user.diaspora_handle} reason='User does not own post'" diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index d10318101..b4151a935 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -71,7 +71,7 @@ class StatusMessagesController < ApplicationController respond_to do |format| format.js { render :create, :status => 201} format.html { redirect_to :back} - format.mobile{ redirect_to root_url} + format.mobile{ redirect_to multi_path} end else unless photos.empty? diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c1215bdad..5777c8e33 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -85,7 +85,7 @@ class UsersController < ApplicationController current_user.lock_access! sign_out current_user flash[:notice] = I18n.t 'users.destroy.success' - redirect_to root_path + redirect_to multi_path else if params[:user].present? && params[:user][:current_password].present? flash[:error] = t 'users.destroy.wrong_password' @@ -109,7 +109,7 @@ class UsersController < ApplicationController format.any { redirect_to person_path(user.person.id) } end else - redirect_to root_url, :error => I18n.t('users.public.does_not_exist', :username => params[:username]) + redirect_to multi_path, :error => I18n.t('users.public.does_not_exist', :username => params[:username]) end end @@ -125,14 +125,14 @@ class UsersController < ApplicationController def logged_out @page = :logged_out if user_signed_in? - redirect_to root_path + redirect_to multi_path end end def getting_started_completed user = current_user user.update_attributes(:getting_started => false) - redirect_to root_path + redirect_to multi_path end def export diff --git a/app/controllers/vanna_controller.rb b/app/controllers/vanna_controller.rb index eced7e909..8f75b31b3 100644 --- a/app/controllers/vanna_controller.rb +++ b/app/controllers/vanna_controller.rb @@ -88,7 +88,7 @@ class VannaController < Vanna::Base def redirect_unless_admin unless current_user.admin? - redirect_to root_url, :notice => 'you need to be an admin to do that' + redirect_to multi_path, :notice => 'you need to be an admin to do that' return end end diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 923013d72..e7bcd912e 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -4,9 +4,9 @@ .container{:style => "position:relative;"} - if current_user - = link_to image_tag('logo_small.png', :height => "16px", :width => "161px", :class => "diaspora_header_logo"), root_path + = link_to image_tag('logo_small.png', :height => "16px", :width => "161px", :class => "diaspora_header_logo"), multi_path - else - = link_to image_tag('logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), root_path + = link_to image_tag('logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), multi_path - if !current_user .right diff --git a/app/views/users/logged_out.haml b/app/views/users/logged_out.haml index 2ae90f64a..b0ae96e93 100644 --- a/app/views/users/logged_out.haml +++ b/app/views/users/logged_out.haml @@ -25,7 +25,7 @@ %h4 = t('.simply_visit') %strong - = link_to AppConfig[:pod_url], root_url + = link_to AppConfig[:pod_url], multi_path = t('.on_your_mobile_device') %p.dull diff --git a/public/index.html b/public/index.html index c573f40c8..606fc4c45 100644 --- a/public/index.html +++ b/public/index.html @@ -58,7 +58,7 @@ DIASPORA* ALPHA
  • @joindiaspora
  • github
  • blog
  • -
  • log in
  • +
  • Login
  • diff --git a/spec/controllers/admins_controller_spec.rb b/spec/controllers/admins_controller_spec.rb index 703043f1c..776a54e80 100644 --- a/spec/controllers/admins_controller_spec.rb +++ b/spec/controllers/admins_controller_spec.rb @@ -14,7 +14,7 @@ describe AdminsController do context 'admin not signed in' do it 'is behind redirect_unless_admin' do get :user_search - response.should redirect_to root_url + response.should redirect_to multi_path end end @@ -64,7 +64,7 @@ describe AdminsController do context 'admin not signed in' do it 'is behind redirect_unless_admin' do get :admin_inviter - response.should redirect_to root_url + response.should redirect_to multi_path end end