diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index 512f139017219a5d354931b0437c76cb625b817c..33ff1a2ce401a4957c9fec1ef689d6a142fbe88a 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -11,7 +11,17 @@ class StatusMessagesController < ApplicationController :mobile, :json - layout 'blank', :only => [ :bookmarklet ] + layout :bookmarklet_layout, :only => :bookmarklet + + # Define bookmarklet layout depending on whether + # user is in mobile or desktop mode + def bookmarklet_layout + if request.format == :mobile + 'application' + else + 'blank' + end + end # Called when a user clicks "Mention" on a profile page # @param person_id [Integer] The id of the person to be mentioned diff --git a/app/views/status_messages/bookmarklet.mobile.haml b/app/views/status_messages/bookmarklet.mobile.haml index 8ccafc26aacb5b916e156933cfbd290badc5a22e..64ccf6189a9212ccdff8cdddcebbe5a14f2c2769 100644 --- a/app/views/status_messages/bookmarklet.mobile.haml +++ b/app/views/status_messages/bookmarklet.mobile.haml @@ -18,4 +18,4 @@ }); - content_for(:head) do - = javascript_include_tag :mobile \ No newline at end of file + = javascript_include_tag :jquery, :mobile