nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed syntax error in mobile layout. removed ipad from mobile_fu

Browse source
This commit is contained in:
zhitomirskiyi 2011-01-27 11:30:15 -08:00
parent 01ce26cbf3
commit 0fa0b7e950
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/application_controller.rb
View file

@ -6,7 +6,6 @@ class ApplicationController < ActionController::Base
has_mobile_fu
protect_from_forgery :except => :receive
#before_filter :mobile_except_ipad
before_filter :set_contacts_notifications_and_status, :except => [:create, :update]
before_filter :count_requests
before_filter :set_invites
@ -21,16 +20,6 @@ class ApplicationController < ActionController::Base
end
end
def mobile_except_ipad
if is_mobile_device?
if request.env["HTTP_USER_AGENT"].include? "iPad"
session[:mobile_view] = false
else
session[:mobile_view] = true
end
end
end
def count_requests
@request_count = Request.where(:recipient_id => current_user.person.id).count if current_user
end

2
app/views/layouts/application.mobile.haml
View file

@ -90,7 +90,7 @@
#footer
= link_to t('.logged_in_as' :name => current_user.name), current_user.person
= link_to t('.logged_in_as', :name => current_user.name), current_user.person
%br
%br

3
vendor/plugins/mobile-fu/lib/mobile_fu.rb vendored
View file

@ -2,11 +2,12 @@ module ActionController
module MobileFu
# These are various strings that can be found in mobile devices. Please feel free
# to add on to this list.
# removed ipad because ipad isn't a mobile device
MOBILE_USER_AGENTS = 'palm|blackberry|nokia|phone|midp|mobi|symbian|chtml|ericsson|minimo|' +
'audiovox|motorola|samsung|telit|upg1|windows ce|ucweb|astel|plucker|' +
'x320|x240|j2me|sgh|portable|sprint|docomo|kddi|softbank|android|mmp|' +
'pdxgw|netfront|xiino|vodafone|portalmmm|sagem|mot-|sie-|ipod|up\\.b|' +
'webos|amoi|novarra|cdm|alcatel|pocket|ipad|iphone|mobileexplorer|' +
'webos|amoi|novarra|cdm|alcatel|pocket|iphone|mobileexplorer|' +
'mobile'
def self.included(base)