diff --git a/couchpotato/core/plugins/userscript/static/userscript.js b/couchpotato/core/plugins/userscript/static/userscript.js index d6d5983c..b7849766 100644 --- a/couchpotato/core/plugins/userscript/static/userscript.js +++ b/couchpotato/core/plugins/userscript/static/userscript.js @@ -63,28 +63,19 @@ var UserscriptSettingTab = new Class({ self.settings = App.getPage('Settings') self.settings.addEvent('create', function(){ - // See if userscript can be installed - var userscript = false; - try { - if(Components.interfaces.gmIGreasemonkeyService) - userscript = true - } - catch(e){ - userscript = Browser.chrome === true; - } - var host_url = window.location.protocol + '//' + window.location.host; self.settings.createGroup({ 'name': 'userscript', - 'label': 'Install the bookmarklet' + (userscript ? ' or userscript' : ''), + 'label': 'Install the bookmarklet or userscript', 'description': 'Easily add movies via imdb.com, appletrailers and more' }).inject(self.settings.tabs.automation.content, 'top').adopt( - (userscript ? [new Element('a.userscript.button', { + new Element('a.userscript.button', { 'text': 'Install userscript', 'href': Api.createUrl('userscript.get')+randomString()+'/couchpotato.user.js', - 'target': '_self' - }), new Element('span.or[text=or]')] : null), + 'target': '_blank' + }), + new Element('span.or[text=or]'), new Element('span.bookmarklet').adopt( new Element('a.button.green', { 'text': '+CouchPotato', diff --git a/couchpotato/core/plugins/userscript/template.js b/couchpotato/core/plugins/userscript/template.js index c30fad5b..c3dd17dc 100644 --- a/couchpotato/core/plugins/userscript/template.js +++ b/couchpotato/core/plugins/userscript/template.js @@ -1,4 +1,9 @@ // ==UserScript== +// +// If you can read this, you need to enable or install the Greasemonkey add-on for firefox +// If you are using Chrome, download this file and drag it to the extensions tab +// Other browsers, use the bookmarklet +// // @name CouchPotato UserScript // @description Add movies like a real CouchPotato // @grant none diff --git a/couchpotato/static/scripts/couchpotato.js b/couchpotato/static/scripts/couchpotato.js index 5a7dbfba..673323b6 100644 --- a/couchpotato/static/scripts/couchpotato.js +++ b/couchpotato/static/scripts/couchpotato.js @@ -285,23 +285,15 @@ var CouchPotato = new Class({ createUserscriptButtons: function(){ - var userscript = false; - try { - if(Components.interfaces.gmIGreasemonkeyService) - userscript = true - } - catch(e){ - userscript = Browser.chrome === true; - } - var host_url = window.location.protocol + '//' + window.location.host; return new Element('div.group_userscript').adopt( - (userscript ? [new Element('a.userscript.button', { + new Element('a.userscript.button', { 'text': 'Install userscript', 'href': Api.createUrl('userscript.get')+randomString()+'/couchpotato.user.js', - 'target': '_self' - }), new Element('span.or[text=or]')] : null), + 'target': '_blank' + }), + new Element('span.or[text=or]'), new Element('span.bookmarklet').adopt( new Element('a.button.orange', { 'text': '+CouchPotato',