From 131166841af72189f75fa17a43cad85eded3d23e Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Sun, 25 Sep 2011 11:58:44 -0700 Subject: [PATCH] added logged out page referencing mobile --- app/controllers/application_controller.rb | 4 +++ app/controllers/users_controller.rb | 8 ++++- app/views/users/logged_out.haml | 37 ++++++++++++++++++++++ config/locales/diaspora/en.yml | 6 ++++ config/routes.rb | 4 ++- features/logs_in_and_out.feature | 3 +- public/images/mobile.jpg | Bin 0 -> 5709 bytes public/stylesheets/sass/application.sass | 16 ++++++++++ 8 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 app/views/users/logged_out.haml create mode 100644 public/images/mobile.jpg diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 21ee8d15b..eb0b768e2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -32,6 +32,10 @@ class ApplicationController < ActionController::Base end end + # Overwriting the sign_out redirect path method + def after_sign_out_path_for(resource_or_scope) + logged_out_path + end ##helpers def all_aspects diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9e0179ecd..51b38d319 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -7,7 +7,7 @@ class UsersController < ApplicationController require File.join(Rails.root, 'lib/diaspora/exporter') require File.join(Rails.root, 'lib/collect_user_photos') - before_filter :authenticate_user!, :except => [:new, :create, :public, :user_photo] + before_filter :authenticate_user!, :except => [:new, :create, :public, :user_photo, :logged_out] respond_to :html @@ -103,6 +103,12 @@ class UsersController < ApplicationController render "users/getting_started" end + def go_mobile + if user_signed_in? + redirect_to root_path + end + end + def getting_started_completed user = current_user user.update_attributes(:getting_started => false) diff --git a/app/views/users/logged_out.haml b/app/views/users/logged_out.haml new file mode 100644 index 000000000..4595bf96e --- /dev/null +++ b/app/views/users/logged_out.haml @@ -0,0 +1,37 @@ +-# Copyright (c) 2010-2011, Diaspora Inc. This file is +-# licensed under the Affero General Public License version 3 or later. See +-# the COPYRIGHT file. + +#grey_header + .container{:style => 'text-align:center;'} + %h2 + = t('.signed_out') + + %h1 + = t('.go_mobile') + +.container{:style => 'text-align:center;'} + %br + %br + %br + %br + %br + %br + %br + %br + %br + + = image_tag 'mobile.jpg', :width => 150, :height => 294 + + %br + %br + %br + + %h4 + = t('.simply_visit') + %strong + = link_to AppConfig[:pod_url], root_url + = t('.on_your_mobile_device') + + %p.dull + = t('.works_on_modern') diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index ed138b60b..a8f04bca5 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -814,6 +814,12 @@ en: users: + logged_out: + signed_out: "You've signed out of Diaspora*" + go_mobile: "Now go mobile." + simply_visit: "Simply visit" + on_your_mobile_device: "on your mobile device to access Diaspora* mobile." + works_on_modern: "Works on all modern smartphones" edit: export_data: "Export Data" close_account: "Close Account" diff --git a/config/routes.rb b/config/routes.rb index 4c72ff89b..64a68efd6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -170,7 +170,9 @@ Diaspora::Application.routes.draw do mount Resque::Server.new, :at => '/resque-jobs' end - # Startpage + # Logout Page (go mobile) + get 'logged_out' => 'users#logged_out', :as => 'logged_out' + # Startpage root :to => 'home#show' end diff --git a/features/logs_in_and_out.feature b/features/logs_in_and_out.feature index baff416dd..77f62a170 100644 --- a/features/logs_in_and_out.feature +++ b/features/logs_in_and_out.feature @@ -13,7 +13,8 @@ Feature: user authentication Given I am signed in And I click on my name in the header And I follow "log out" - Then I should be on the home page + Then I should be on the logged out page + And I should see "Now go mobile." Scenario: user uses token auth Given a user with username "ohai" and password "secret" diff --git a/public/images/mobile.jpg b/public/images/mobile.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ce56ac3878393a7aba3d7cff5effb195dbaec77f GIT binary patch literal 5709 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 I726yAFJh&^8~^|S literal 0 HcmV?d00001 diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 056caa20a..de8aa188c 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -3416,3 +3416,19 @@ ul#getting_started :display inline :margin :right 0.5em + +#grey_header + @include box-shadow(0,1px,1px,#eee) + :background + :color #fafafa + :width 100% + :position absolute + :left 0 + :top 0 + :padding + :top 80px + :bottom 20px + :text + :align center + :border + :bottom 1px solid #ddd