From af5c469f1062242779923387f5fe4de141d59be3 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 7 Nov 2011 23:21:00 +0200 Subject: [PATCH] Created missing view for mobile bookmarklet. Adjusted status_messages_controller.rb to render it. --- app/controllers/status_messages_controller.rb | 6 +++++- .../status_messages/bookmarklet.mobile.haml | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 app/views/status_messages/bookmarklet.mobile.haml diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index b15a447c2..b66965f5c 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -34,7 +34,11 @@ class StatusMessagesController < ApplicationController @aspects = current_user.aspects @selected_contacts = @aspects.map { |aspect| aspect.contacts }.flatten.uniq @aspect_ids = @aspects.map{|x| x.id} - render :layout => nil + if is_mobile_device? + #render :layout + else + render :layout => nil + end end def create diff --git a/app/views/status_messages/bookmarklet.mobile.haml b/app/views/status_messages/bookmarklet.mobile.haml new file mode 100644 index 000000000..7a3bae975 --- /dev/null +++ b/app/views/status_messages/bookmarklet.mobile.haml @@ -0,0 +1,20 @@ +-# Copyright (c) 2010-2011, Diaspora Inc. This file is +-# licensed under the Affero General Public License version 3 or later. See +-# the COPYRIGHT file. + += include_javascripts :mobile + +:javascript + $(document).ready(function() + { + var contents = "#{params[:title]} - #{params[:url]}"; + if ("#{params[:notes]}".length > 0){ + contents = contents + " - #{params[:notes]}"; + } + if (contents.length > 0) { + $("#status_message_text").val(contents); + } + }); + += render :partial => 'shared/publisher', :locals => { :aspect => :profile, :selected_aspects => @aspects, :aspect_ids => @aspect_ids } +