@@ -153,4 +153,5 @@ class ApplicationController < ActionController::Base
redirect_to url
end
end
+
end
app/controllers/application_controller.rb
@@ -15,6 +15,9 @@ class SessionsController < ApplicationController
def create
self.current_user = User.authenticate(params[:email], Base64.decode64(params[:encoded_password]))
+ if params[:link_facebook] == "true"
+ self.current_user.link_fb_connect(facebook_session.user.id) unless self.current_user.fb_user_id == facebook_session.user.id
+ end
if logged_in?
handle_remember_me
app/controllers/sessions_controller.rb
@@ -67,6 +67,10 @@ class Story < NewsItem
end
belongs_to :pitch, :foreign_key => 'news_item_id'
+
+ has_many :organizational_donors, :through => :donations, :source => :user, :order => "donations.created_at",
+ :conditions => "users.type = 'organization'",
+ :uniq => true
validate_on_update :extended_description
named_scope :published, :conditions => {:status => 'published'}
app/models/story.rb
@@ -10,33 +10,13 @@
/[if IE 6]
= stylesheet_link_tag 'ie_spotus.css'
= stylesheet_link_tag 'screen','screen_spotus','ie.css','facebox', :media => "screen", :cache => "styles_all"
- =# stylesheet_link_tag 'screen_spotus', :media => "screen"
= stylesheet_link_tag 'print', :media => "print"
- =# stylesheet_link_tag 'ie.css'
= javascript_include_tag 'jquery-1.3.1.min'
%script{:type => 'text/javascript'}
jQuery.noConflict();
= javascript_include_tag 'fckeditor/fckeditor','jquery-ui','jrails','jquery.pngFix','jquery.equalHeights','prototype','effects','jsProgressBarHandler','jquery.livequery','jquery.cookie','jcarousellite_1.0.1','jquery.form','application','auth','facebox', :cache => "js_all"
- =# javascript_include_tag 'jquery-ui'
- =# javascript_include_tag 'jrails'
- =# javascript_include_tag 'jquery.pngFix'
- =# javascript_include_tag 'jquery.equalHeights'
- =# javascript_include_tag 'prototype'
- =# javascript_include_tag 'scriptaculous'
- =# javascript_include_tag 'effects'
- =# javascript_include_tag 'jsProgressBarHandler'
- =# javascript_include_tag 'jquery.livequery'
- =# javascript_include_tag 'jquery.cookie'
- =# javascript_include_tag 'jcarousellite_1.0.1'
- =# javascript_include_tag 'jquery.form'
- =# javascript_include_tag 'application'
- =# javascript_include_tag 'auth'
-
- =# stylesheet_link_tag 'facebox'
- =# javascript_include_tag 'facebox'
-
= iboxify_page
= yield :head
app/views/layouts/_head.html.haml
@@ -1,35 +1,74 @@
-%div#fb_profile
- %h4
- Welcome from facebook. To finish registraton:
- - if @profile && @profile.errors.any?
- .error
- = error_messages_for :profile
- %h3
- Fill out your name and email.
- - form_for :profile, :url => myspot_profile_path, :html => { :method => :put } do |f|
- .register
- %div
- = f.label :first_name, "Your First Name"
- = f.text_field :first_name, :class => "text", :tabindex => 1
- %div
- = f.label :last_name, "Your Last Name"
- = f.text_field :last_name, :class => "text", :tabindex => 2
- %div
- = f.label :email, "Your E-mail Address"
- = f.text_field :email, :class => "text", :tabindex => 5
- %div
- = f.label :type, "I am a"
- = f.select :type, [["Community Member", "Citizen"], ["Reporter", "Reporter"], ["News Publisher", "Organization"]]
- .block-padding.clear
- .row
- .float_left= f.check_box :terms_of_service, {}, '1', '0'
- %label{:for => 'user_terms_of_service', :class => "unpadded", :style => "width: auto;"}
- Accept the
- = link_to 'Terms of Service', page_path('terms')
+%div#fb_updater
+ %div#fb_profile
+ %h4
+ Welcome from facebook. To finish registraton:
+ - if @profile && @profile.errors.any?
+ .error
+ = error_messages_for :profile
+ %h3
+ Fill out your name and email. Or <a href="" class="login_link">Login</a> with existing Spot.Us Account.
+ - form_for :profile, :url => myspot_profile_path, :html => { :method => :put } do |f|
+ .register
+ %div
+ = f.label :first_name, "Your First Name"
+ = f.text_field :first_name, :class => "text", :tabindex => 1
+ %div
+ = f.label :last_name, "Your Last Name"
+ = f.text_field :last_name, :class => "text", :tabindex => 2
+ %div
+ = f.label :email, "Your E-mail Address"
+ = f.text_field :email, :class => "text", :tabindex => 5
+ %div
+ = f.label :type, "I am a"
+ = f.select :type, [["Community Member", "Citizen"], ["Reporter", "Reporter"], ["News Publisher", "Organization"]]
+ .block-padding.clear
+ .row
+ .float_left= f.check_box :terms_of_service, {}, '1', '0'
+ %label{:for => 'user_terms_of_service', :class => "unpadded", :style => "width: auto;"}
+ Accept the
+ = link_to 'Terms of Service', page_path('terms')
+ .block-padding.clear
+ %div{:style => "padding: 0pt 0pt 8px 5px;"}
+ %input{:type => "image", :src => "/images/save.png", :value => "Update", :class => "float-right"}
+ .block-padding.clear
+ %a{:href=>"#", :onclick=>'FB.Connect.logoutAndRedirect("' + destroy_session_path + '")'}
+ No Thanks
+ %div#spotus_login.hide
+ %h4
+ Connect your facebook login to an existing Spot.Us Account:
+ - if @profile && @profile.errors.any?
+ .error
+ = error_messages_for :profile
+ %h3
+ Login or <a href="" class="profile_link">« go back</a>
+ - form_tag session_url(:protocol => 'http') do
+ .register
+ %div
+ %label Your E-mail Address
+ = text_field_tag "email", nil, :class=>"text"
+ %div
+ %label Your Password
+ = password_field_tag "password", nil, :class=>"text", :id=>"passwordField"
+ = hidden_field_tag "encoded_password", nil, :class=>"text", :id=>"passwordHiddenField"
+ = hidden_field_tag "link_facebook", "true"
.block-padding.clear
%div{:style => "padding: 0pt 0pt 8px 5px;"}
- %input{:type => "image", :src => "/images/save.png", :value => "Update", :class => "float-right"}
+ %input{:type => "image", :src => "/images/login.png", :value => "Login", :class => "float-right", :onclick=>"processLoginForm();"}
.block-padding.clear
%a{:href=>"#", :onclick=>'FB.Connect.logoutAndRedirect("' + destroy_session_path + '")'}
No Thanks
+
+:javascript
+ jQuery(document).ready(function(){
+ jQuery('.login_link').click(function(){
+ jQuery('#fb_profile').hide();
+ jQuery('#spotus_login').show();
+ return false;
+ });
+ jQuery('.profile_link').click(function(){
+ jQuery('#fb_profile').show();
+ jQuery('#spotus_login').hide();
+ return false;
+ });
+ });
app/views/users/_popup_form.html.haml
@@ -62,7 +62,7 @@ jQuery(document).ready(function($){
}); // end ajax form
}); // end livequery
- $("#facebox .content #fb_profile form").livequery(function() {
+ $("#facebox .content #fb_updater #fb_profile form").livequery(function() {
var form = $(this);
$(this).ajaxForm({
complete: function(request,message) {
@@ -76,6 +76,21 @@ jQuery(document).ready(function($){
}
});
});
+
+ $("#facebox .content #fb_updater #spotus_login form").livequery(function() {
+ var form = $(this);
+ $(this).ajaxForm({
+ complete: function(request,message) {
+ if(message == "error") {
+ $("#facebox .content #spotus_login").replaceWith(request.responseText);
+ } else {
+ $(document).trigger('close.facebox');
+ renderUserHeader();
+ $("li.start_story a.authbox").removeClass("authbox").removeAttr("return_to").attr("href","/start_story");
+ }
+ }
+ });
+ });
});
function showProfileForm(){
public/javascripts/auth.js
016fe7f5b06bb77e9b699d405d339b4d3b3502fd
Dan Newman
dpnewman@gmail.com
http://github.com/spot-us/spot-us/commit/594ab4b8e7d24dead7aeb7fb4a49e1aceb2d2fa9
594ab4b8e7d24dead7aeb7fb4a49e1aceb2d2fa9
2009-11-05T17:26:58-08:00
2009-11-05T17:26:58-08:00
Link facebook connect to existing login
21453946ed3bf507d2efd71dc46bdd391476c538
Dan Newman
dpnewman@gmail.com