diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index df08808aea9510cc828ba9f5afbd1a5810c9ad90..b4018863bc781bec3b4645e60c48c86822313987 100644
--- a/app/controllers/application_controller.rb
+++ b/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'
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index 1d877b70ec2b62f19aa97c5d8a0487b9f46cbd30..d9431bbb8dc2dd5eb936036165762d9262a20387 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -1,9 +1,12 @@
-%h2 Forgot your password?
-= form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
- = devise_error_messages!
- %p
- = f.label :email
- = f.text_field :email
- %p
- = f.submit "Send me reset password instructions"
-= render :partial => "devise/shared/links"
+.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
+ = f.label :email
+ = f.text_field :email
+ %p
+ = f.submit "Send me reset password instructions"
+ = render :partial => "devise/shared/links"
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 5803415b44cb0b460d2e92a2c123af2694f0f7f6..852a8afd5e08dbcb2b816f4bdac6624f658fc68a 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,26 +1,33 @@
-%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!!
-= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
- #user
- %p.username
- = f.label :username
- = f.text_field :username
- %p.user_network
- ="@#{APP_CONFIG[:terse_pod_url]}"
+.span-10.append-1.last
+ .floating
+ %h3 Login
+ = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+ #user
+ %p.username
+ = f.label :username
+ = f.text_field :username
+ %p.user_network
+ ="@#{APP_CONFIG[:terse_pod_url]}"
+ %p
+ = f.label :password
+ = f.password_field :password
+ /%p
+ /- if devise_mapping.rememberable?
+ / = f.check_box :remember_me
+ / = f.label :remember_me
+ = f.submit "Sign in"
+
%p
- = f.label :password
- = f.password_field :password
- /%p
- /- if devise_mapping.rememberable?
- / = 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"
+ = 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!!
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index ddbdc9377639b95b15c4dd5648ce2943b1dbbd86..c7deeda8ec50a1873e3d6be8769bc982f8baba41 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -31,7 +31,8 @@
= javascript_include_tag 'view', 'image_picker', 'stream'
- = render 'js/websocket_js'
+ - if current_user
+ = render 'js/websocket_js'
= csrf_meta_tag
= yield(:head)
@@ -43,24 +44,25 @@
%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
- #global_search
- = form_tag(people_path, :method => 'get') do
- = text_field_tag 'q', nil, :placeholder => "Search", :type => 'search', :results => 5
-
- %ul#user_menu
- .avatar
- = owner_image_tag
- = link_to current_user.real_name, '#'
- %li= link_to "view profile", current_user.person
- %li= link_to "edit profile", edit_person_path(current_user.person)
- %li= link_to "account settings", edit_user_path(current_user)
- %li= link_to t('.logout.'), destroy_user_session_path
-
- = render "shared/aspect_nav"
+ - if current_user
+ #global_search
+ = form_tag(people_path, :method => 'get') do
+ = text_field_tag 'q', nil, :placeholder => "Search", :type => 'search', :results => 5
+
+ %ul#user_menu
+ .avatar
+ = owner_image_tag
+ = link_to current_user.real_name, '#'
+ %li= link_to "view profile", current_user.person
+ %li= link_to "edit profile", edit_person_path(current_user.person)
+ %li= link_to "account settings", edit_user_path(current_user)
+ %li= link_to t('.logout.'), destroy_user_session_path
+
+ = render "shared/aspect_nav"
.container
.span-24.last
diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
deleted file mode 100644
index bc15063d627a4b65061267b450a9d2f95b6683cf..0000000000000000000000000000000000000000
--- a/app/views/layouts/session_wall.html.haml
+++ /dev/null
@@ -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"
diff --git a/app/views/registrations/new.html.haml b/app/views/registrations/new.html.haml
index cea31ff78e0f076f9c7f2d45c80c033775451328..191f885e66f49185166cb8108d37fea2d9b3664f 100644
--- a/app/views/registrations/new.html.haml
+++ b/app/views/registrations/new.html.haml
@@ -1,50 +1,50 @@
-= 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
- = f.text_field :username
- %p
- = f.label :email
- = f.text_field :email
- %p
- = f.label :password
- = f.password_field :password
- %p
- = f.label :password_confirmation
- = f.password_field :password_confirmation
-
- = f.fields_for :person do |p|
- = p.fields_for :profile do |pr|
+.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
- = pr.label :first_name
- = pr.text_field :first_name
+ = f.label :username
+ = f.text_field :username
%p
- = pr.label :last_name
- = pr.text_field :last_name
- = f.submit t('.sign_up')
-= render :partial => "devise/shared/links"
-
+ = f.label :email
+ = f.text_field :email
+ %p
+ = f.label :password
+ = f.password_field :password
+ %p
+ = f.label :password_confirmation
+ = f.password_field :password_confirmation
-%br
-%br
+ = f.fields_for :person do |p|
+ = p.fields_for :profile do |pr|
+ %p
+ = pr.label :first_name
+ = pr.text_field :first_name
+ %p
+ = pr.label :last_name
+ = pr.text_field :last_name
+ = f.submit t('.sign_up')
-%h2 or, upload yourself
+ .floating
+ %h3
+ Upload an existing Diaspora account
-= form_tag '/users/import', :multipart => true do
+ = form_tag '/users/import', :multipart => true do
- %p
- = label_tag 'user[email]'
- = text_field_tag 'user[email]'
- %p
- = label_tag 'user[password]'
- = password_field_tag 'user[password]'
- %p
- = label_tag 'user[password_confirmation]'
- = password_field_tag 'user[password_confirmation]'
+ %p
+ = label_tag 'user[email]'
+ = text_field_tag 'user[email]'
+ %p
+ = label_tag 'user[password]'
+ = password_field_tag 'user[password]'
+ %p
+ = label_tag 'user[password_confirmation]'
+ = password_field_tag 'user[password_confirmation]'
- %label Select File
- = file_field 'upload', 'file'
- = submit_tag "Upload"
+ %label Select File
+ = file_field 'upload', 'file'
+ = submit_tag "Upload"