From fcc681df71f7876a609b105e06fa72d173e5999b Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 22 Sep 2010 16:32:52 -0700 Subject: [PATCH] DG IZ moved to be APP_CONFIG for host --- app/controllers/services_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/views/shared/_aspect_nav.haml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 567a1d144..b254b0a63 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -11,7 +11,7 @@ class ServicesController < ApplicationController code = params['code'] # Facebooks verification string if code - access_token_hash = MiniFB.oauth_access_token(FB_APP_ID, HOST + "services/create", FB_SECRET, code) + access_token_hash = MiniFB.oauth_access_token(FB_APP_ID, APP_CONFIG[:pod_url] + "services/create", FB_SECRET, code) p access_token_hash @access_token = access_token_hash["access_token"] diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 76ed944dd..c425729b2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -14,7 +14,7 @@ class UsersController < ApplicationController @profile = @user.profile @photos = Photo.find_all_by_person_id(@person.id).paginate :page => params[:page], :order => 'created_at DESC' - @fb_access_url = MiniFB.oauth_url(FB_APP_ID, HOST + "services/create", + @fb_access_url = MiniFB.oauth_url(FB_APP_ID, APP_CONFIG[:pod_url] + "services/create", :scope=>MiniFB.scopes.join(",")) end diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml index dbca3bbef..55da1bcdf 100644 --- a/app/views/shared/_aspect_nav.haml +++ b/app/views/shared/_aspect_nav.haml @@ -8,11 +8,11 @@ - for aspect in @aspects %li{:class => ("selected" if current_aspect?(aspect))} = link_for_aspect aspect - - %ul{ :style => "position:absolute;right:0;bottom:0.01em;"} %li{:class => ("selected" if @aspect == :all)} = link_to "All Aspects", root_url + %ul{ :style => "position:absolute;right:0;bottom:0.01em;"} + %li{ :style => "margin-right:0;", :class => ("selected" if @aspect == :manage)} = link_to ( (@request_count == 0)? "Manage Aspects" : "Manage Aspects (#{@request_count})"), {:controller => :aspects, :action => :manage}, :class => "edit_aspect_button", :class => new_request(@request_count), :title => "Manage your Aspects"