From 1a9d15ecc2018db5c21253a7dd4b5f5c7cecd3ba Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 14 Jan 2012 17:19:37 +0100 Subject: [PATCH] modproxy fix --- couchpotato/runner.py | 2 +- couchpotato/static/scripts/couchpotato.js | 2 +- couchpotato/static/scripts/page.js | 2 +- couchpotato/static/scripts/page/settings.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/couchpotato/runner.py b/couchpotato/runner.py index e63d1b0..9596287 100644 --- a/couchpotato/runner.py +++ b/couchpotato/runner.py @@ -173,7 +173,7 @@ def runCouchPotato(options, base_path, args, handle = None): } # Static path - web.add_url_rule(url_base + '/static/', + web.add_url_rule('static/', endpoint = 'static', view_func = app.send_static_file) diff --git a/couchpotato/static/scripts/couchpotato.js b/couchpotato/static/scripts/couchpotato.js index 4134f55..644e4f7 100644 --- a/couchpotato/static/scripts/couchpotato.js +++ b/couchpotato/static/scripts/couchpotato.js @@ -193,7 +193,7 @@ var Route = new Class({ parse: function(url_string){ var self = this; - var path = History.getPath().replace(Api.getOption('url'), '/') //Remove API front + var path = History.getPath().replace(App.getOption('base_url'), '/') var current = path.replace(/^\/+|\/+$/g, '') var url = current.split('/') diff --git a/couchpotato/static/scripts/page.js b/couchpotato/static/scripts/page.js index 73753ff..af77cfe 100644 --- a/couchpotato/static/scripts/page.js +++ b/couchpotato/static/scripts/page.js @@ -21,7 +21,7 @@ var PageBase = new Class({ if(self.has_tab){ var nav = App.getBlock('navigation'); self.tab = nav.addTab({ - 'href': '/'+self.name, + 'href': App.createUrl(self.name), 'title': self.title, 'text': self.name.capitalize() }); diff --git a/couchpotato/static/scripts/page/settings.js b/couchpotato/static/scripts/page/settings.js index 8c2841f..57c14e5 100644 --- a/couchpotato/static/scripts/page/settings.js +++ b/couchpotato/static/scripts/page/settings.js @@ -152,7 +152,7 @@ Page.Settings = new Class({ var label = (tab.label || tab.name || tab_name).capitalize() var tab_el = new Element('li.t_'+tab_name).adopt( new Element('a', { - 'href': '/'+self.name+'/'+tab_name+'/', + 'href': App.createUrl(self.name+'/'+tab_name), 'text': label }).adopt() ).inject(self.tabs_container);