From 131166841af72189f75fa17a43cad85eded3d23e Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
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 21ee8d15be..eb0b768e27 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 9e0179ecdc..51b38d3198 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 0000000000..4595bf96ef
--- /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 ed138b60bf..a8f04bca5e 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 4c72ff89ba..64a68efd6d 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 baff416dda..77f62a1700 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 056caa20ac..de8aa188cd 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
-- 
GitLab