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:
parent
5d54fc6c28
commit
28e08fb6a3
5 changed files with 35 additions and 30 deletions
|
|
@ -110,6 +110,7 @@ class UsersController < ApplicationController
|
|||
end
|
||||
|
||||
def logged_out
|
||||
@page = :logged_out
|
||||
if user_signed_in?
|
||||
redirect_to root_path
|
||||
end
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
|
|
|||
BIN
public/images/diaspora_mobile_screens.png
Normal file
BIN
public/images/diaspora_mobile_screens.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
|
|
@ -3332,6 +3332,10 @@ a.toggle_selector
|
|||
:border
|
||||
:bottom 1px solid #ddd
|
||||
|
||||
.mobile_row
|
||||
:margin
|
||||
:bottom 50px
|
||||
|
||||
.field_with_errors
|
||||
:position relative
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue