collapsed layout views

app/controllers/application_controller.rb

@@ -10,16 +10,6 @@ class ApplicationController < ActionController::Base
   before_filter :count_requests
   before_filter :set_invites
 
-  layout :layout_by_resource
-
-  def layout_by_resource
-    if devise_controller?
-      "session_wall"
-    else
-      "application"
-    end
-  end
-
   def set_friends_and_status
     if current_user
       if params[:aspect] == nil || params[:aspect] == 'all'

app/views/devise/passwords/new.html.haml

@@ -1,4 +1,7 @@
-%h2 Forgot your password?
+.span-12.prepend-6.last
+  .floating
+    %h3
+      Forgot your password?
     = form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
       = devise_error_messages!
       %p

app/views/devise/sessions/new.html.haml

@@ -1,9 +1,6 @@
-%h1
+.span-10.append-1.last
-  This is a technology preview, do not provide any private information.
+  .floating
-%h3
+    %h3 Login
-  your account may be deleted until we move into a more stable development period.
-%h3
-  USE AT YOUR OWN RISK!!
     = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
       #user
         %p.username
@@ -20,7 +17,17 @@
       /  = f.check_box :remember_me
       /  = f.label :remember_me
       = f.submit "Sign in"
-  = link_to "Have a problem? Find an answer here", 'http://diaspora.shapado.com/'
+    
     %p
       = render :partial => "devise/shared/links"
+    %p
+      = link_to "Have a problem? Find an answer here", 'http://diaspora.shapado.com/'
+
+.span-13.last
+  %h1
+    This is a technology preview, do not provide any private information.
+  %h3
+    your account may be deleted until we move into a more stable development period.
+  %h3
+    USE AT YOUR OWN RISK!!
 

app/views/layouts/application.html.haml

@@ -31,6 +31,7 @@
 
     = javascript_include_tag 'view', 'image_picker', 'stream'
 
+    - if current_user
       = render 'js/websocket_js'
 
     = csrf_meta_tag
@@ -43,10 +44,11 @@
     %header
       .container{:style => "position:relative;"}
         #diaspora_text{:href => root_path}
-          = link_to "DIASPORA*", root_path
+          = link_to "DIASPORA*", (current_user ? root_path : new_user_session_path)
           %span.sub_text
             PREVIEW
 
+        - if current_user
           #global_search
             = form_tag(people_path, :method => 'get') do
               = text_field_tag 'q', nil, :placeholder => "Search", :type => 'search', :results => 5

app/views/layouts/session_wall.html.haml

@@ -1,53 +0,0 @@
--#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-!!!
-%html
-  %head
-    %title
-      DIASPORA | login
-    %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
-    %meta{"http-equiv"=> "X-UA-Compatible", :content =>"chrome=1" }
-
-    = stylesheet_link_tag "sessions"
-    /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
-    = javascript_include_tag 'jquery142'
-    = javascript_include_tag 'jquery.infieldlabel'
-
-    :javascript
-      $(document).ready(function(){
-        $("#user_username").focus();
-        $("label").inFieldLabels();
-      });
-
-    = csrf_meta_tag
-    = yield(:head)
-
-  %body
-
-    :plain
-      <!--[if lt IE 8]>
-      <div style='border: 1px solid #F7941D; background: #FEEFDA; text-align: center; clear: both; height: 75px; position: relative;'>
-        <div style='position: absolute; right: 3px; top: 3px; font-family: courier new; font-weight: bold;'><a href='#' onclick='javascript:this.parentNode.parentNode.style.display="none"; return false;'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-cornerx.jpg' style='border: none;' alt='Close this notice'/></a></div>
-        <div style='width: 640px; margin: 0 auto; text-align: left; padding: 0; overflow: hidden; color: black;'>
-          <div style='width: 75px; float: left;'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-warning.jpg' alt='Warning!'/></div>
-          <div style='width: 275px; float: left; font-family: Arial, sans-serif;'>
-            <div style='font-size: 14px; font-weight: bold; margin-top: 12px;'>You are using an outdated browser</div>
-            <div style='font-size: 12px; margin-top: 6px; line-height: 12px;'>For a better experience using this site, please upgrade to a modern web browser.</div>
-          </div>
-          <div style='width: 75px; float: left;'><a href='http://www.firefox.com' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-firefox.jpg' style='border: none;' alt='Get Firefox 3.5'/></a></div>
-          <div style='width: 75px; float: left;'><a href='http://www.browserforthebetter.com/download.html' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-ie8.jpg' style='border: none;' alt='Get Internet Explorer 8'/></a></div>
-          <div style='width: 73px; float: left;'><a href='http://www.apple.com/safari/download/' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-safari.jpg' style='border: none;' alt='Get Safari 4'/></a></div>
-          <div style='float: left;'><a href='http://www.google.com/chrome' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-chrome.jpg' style='border: none;' alt='Get Google Chrome'/></a></div>
-        </div>
-      </div>
-      <![endif]-->
-
-    - flash.each do |name, msg|
-      = content_tag :div, msg, :id => "flash_#{name}"
-    %div#huge_text
-      DIASPORA*
-    = yield
-
-    /= link_to "signup", "/signup"

app/views/registrations/new.html.haml

@@ -1,5 +1,8 @@
+.span-12.prepend-6.last
+  .floating
+    %h3
+      Sign up for Diaspora
     = image_tag "http://needcoffee.cachefly.net/needcoffee/uploads/2009/02/predator-arnold-schwarzenegger.jpg"
-
     = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
       %p
         = f.label :username
@@ -23,14 +26,11 @@
             = pr.label :last_name
             = pr.text_field :last_name
       = f.submit t('.sign_up')
-= render :partial => "devise/shared/links"
 
 
-%br
+  .floating
-%br
+    %h3
-
+      Upload an existing Diaspora account
-%h2 or, upload yourself
-
 
     = form_tag '/users/import', :multipart => true do