diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 98ef6ae6d..0628ce12f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -110,6 +110,7 @@ class UsersController < ApplicationController end def logged_out + @page = :logged_out if user_signed_in? redirect_to root_path end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 64eb7c5e2..0beb4d220 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -20,7 +20,7 @@ / Social Media Icons are by Paul Robert Lloyd @ http://paulrobertlloyd.com/2009/06/social_media_icons / bootstrap/blueprint switch - - if @aspect == :getting_started + - if @aspect == :getting_started || @page == :logged_out = stylesheet_link_tag "bootstrap.min.css" - else = stylesheet_link_tag "blueprint/screen", :media => 'screen' @@ -92,17 +92,22 @@ ⇧ #notifications - - flash.each do |name, msg| - %div{:id => "flash_#{name}"} - .message - = msg + + - unless @page == :logged_out + - flash.each do |name, msg| + %div{:id => "flash_#{name}"} + .message + = msg %header{:class=>('landing' unless current_user)} = render 'layouts/header' .container{:style=> "#{yield(:break_the_mold)}"} - .span-24.last{:style=> "#{yield(:break_the_mold)}"} + - if @aspsect == :getting_started || @page == :logged_out = yield + - else + .span-24.last{:style=> "#{yield(:break_the_mold)}"} + = yield %footer .container diff --git a/app/views/users/logged_out.haml b/app/views/users/logged_out.haml index 4595bf96e..2ae90f64a 100644 --- a/app/views/users/logged_out.haml +++ b/app/views/users/logged_out.haml @@ -2,36 +2,31 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. +- content_for :head do + :css + body { + margin-top: 220px; + } + + #grey_header - .container{:style => 'text-align:center;'} - %h2 + .row + %h3 = t('.signed_out') %h1 = t('.go_mobile') .container{:style => 'text-align:center;'} - %br - %br - %br - %br - %br - %br - %br - %br - %br + .row.mobile_row + = image_tag 'diaspora_mobile_screens.png', :width => 480, :height => 300 - = image_tag 'mobile.jpg', :width => 150, :height => 294 + .row + %h4 + = t('.simply_visit') + %strong + = link_to AppConfig[:pod_url], root_url + = t('.on_your_mobile_device') - %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') + %p.dull + = t('.works_on_modern') diff --git a/public/images/diaspora_mobile_screens.png b/public/images/diaspora_mobile_screens.png new file mode 100644 index 000000000..4319811cb Binary files /dev/null and b/public/images/diaspora_mobile_screens.png differ diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 6d09e1512..4de97deb7 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -3332,6 +3332,10 @@ a.toggle_selector :border :bottom 1px solid #ddd +.mobile_row + :margin + :bottom 50px + .field_with_errors :position relative