show actual screenshots of diaspora mobile on logout; supress log out flash message; bootstrap on logged out page (can we get d* shots in wp7 and android emulators?)

This commit is contained in:
danielgrippi 2011-10-24 20:51:16 -07:00
parent 5d54fc6c28
commit 28e08fb6a3
5 changed files with 35 additions and 30 deletions

View file

@ -110,6 +110,7 @@ class UsersController < ApplicationController
end end
def logged_out def logged_out
@page = :logged_out
if user_signed_in? if user_signed_in?
redirect_to root_path redirect_to root_path
end end

View file

@ -20,7 +20,7 @@
/ Social Media Icons are by Paul Robert Lloyd @ http://paulrobertlloyd.com/2009/06/social_media_icons / Social Media Icons are by Paul Robert Lloyd @ http://paulrobertlloyd.com/2009/06/social_media_icons
/ bootstrap/blueprint switch / bootstrap/blueprint switch
- if @aspect == :getting_started - if @aspect == :getting_started || @page == :logged_out
= stylesheet_link_tag "bootstrap.min.css" = stylesheet_link_tag "bootstrap.min.css"
- else - else
= stylesheet_link_tag "blueprint/screen", :media => 'screen' = stylesheet_link_tag "blueprint/screen", :media => 'screen'
@ -92,6 +92,8 @@
&#8679; &#8679;
#notifications #notifications
- unless @page == :logged_out
- flash.each do |name, msg| - flash.each do |name, msg|
%div{:id => "flash_#{name}"} %div{:id => "flash_#{name}"}
.message .message
@ -101,6 +103,9 @@
= render 'layouts/header' = render 'layouts/header'
.container{:style=> "#{yield(:break_the_mold)}"} .container{:style=> "#{yield(:break_the_mold)}"}
- if @aspsect == :getting_started || @page == :logged_out
= yield
- else
.span-24.last{:style=> "#{yield(:break_the_mold)}"} .span-24.last{:style=> "#{yield(:break_the_mold)}"}
= yield = yield

View file

@ -2,31 +2,26 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :head do
:css
body {
margin-top: 220px;
}
#grey_header #grey_header
.container{:style => 'text-align:center;'} .row
%h2 %h3
= t('.signed_out') = t('.signed_out')
%h1 %h1
= t('.go_mobile') = t('.go_mobile')
.container{:style => 'text-align:center;'} .container{:style => 'text-align:center;'}
%br .row.mobile_row
%br = image_tag 'diaspora_mobile_screens.png', :width => 480, :height => 300
%br
%br
%br
%br
%br
%br
%br
= image_tag 'mobile.jpg', :width => 150, :height => 294
%br
%br
%br
.row
%h4 %h4
= t('.simply_visit') = t('.simply_visit')
%strong %strong

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

View file

@ -3332,6 +3332,10 @@ a.toggle_selector
:border :border
:bottom 1px solid #ddd :bottom 1px solid #ddd
.mobile_row
:margin
:bottom 50px
.field_with_errors .field_with_errors
:position relative :position relative