app/views/pages/search_results.html.erb app/views/shared/_google_search.html.erb @@ -14,8 +14,9 @@ - else %li = link_to 'Logout', destroy_session_path - %li + %li.no-pipe = fb_login_button('window.location = "/users/link_user_accounts";', :size => "small") + %em.small connect %ul.user-header-nav #not_logged_in.hide %li app/views/layouts/_user_header.html.haml @@ -21,6 +21,8 @@ = link_to network.display_name, root_url(:subdomain => network.name).to_s.downcase - else = network.display_name + .span-360 + = render :partial => "shared/google_search" - if yield(:error) .error %span.dismiss= link_to image_tag('close_square.png'), @close_flash_link || '' # empty string means self app/views/layouts/application.html.haml @@ -14,6 +14,7 @@ ActionController::Routing::Routes.draw do |map| # facebook acct link #map.resources :users, :collection => {:link_user_accounts => :get} map.connect "users/link_user_accounts", :controller => "users", :action => "link_user_accounts" + map.connect "search", :controller => "pages", :action => "search_results" # TODO: remove when done map.resources :ui config/routes.rb @@ -669,7 +669,7 @@ ol.create_a_tip_steps li.pitcher, ol.create_a_pitch_steps li.pitcher { /* --------------------------------------------------------------------------------- General Column specs part 3 - this achieves the float right and size for the columns ------------------------------------------------------------------------------------ */ -.span-145, .span-160, .span-225, .span-270, .span-530 {float: right;} +.span-145, .span-160, .span-225, .span-270, .span-360, .span-530 {float: right;} .span-145 {width:145px;} .span-160 {width:160px;} .span-225 {width:225px;} public/stylesheets/screen_spotus.css 68c9ccd5d3071d6994207a7fc5f379fc30a8e7be Dan Newman dpnewman@gmail.com http://github.com/spot-us/spot-us/commit/40a1ea673bd5024288065cc8d978736209983525 40a1ea673bd5024288065cc8d978736209983525 2009-11-03T15:02:10-08:00 2009-11-03T15:02:10-08:00 Google custom search integrated 38476ce1d0528f711c0fd6fae6beb2f36f910ef1 Dan Newman dpnewman@gmail.com