fix the paths of static content so a base config parameter can be used

This commit is contained in:
Damien Churchill 2010-03-09 22:12:12 +00:00
commit 00c896ff1d

View file

@ -292,91 +292,91 @@ class TopLevel(resource.Resource):
addSlash = True addSlash = True
__stylesheets = [ __stylesheets = [
"/css/ext-all-notheme.css", "css/ext-all-notheme.css",
"/css/ext-extensions.css", "css/ext-extensions.css",
"/css/deluge.css" "css/deluge.css"
] ]
__scripts = [ __scripts = [
"/js/ext-base.js", "js/ext-base.js",
"/js/ext-all.js", "js/ext-all.js",
"/js/ext-extensions.js", "js/ext-extensions.js",
"/config.js", "config.js",
"/gettext.js", "gettext.js",
"/js/deluge-all.js" "js/deluge-all.js"
] ]
__debug_scripts = [ __debug_scripts = [
"/js/ext-base-debug.js", "js/ext-base-debug.js",
"/js/ext-all-debug.js", "js/ext-all-debug.js",
"/js/ext-extensions-debug.js", "js/ext-extensions-debug.js",
"/config.js", "config.js",
"/gettext.js", "gettext.js",
"/js/deluge-all-debug.js" "js/deluge-all-debug.js"
] ]
__dev_scripts = [ __dev_scripts = [
"/js/ext-base-debug.js", "js/ext-base-debug.js",
"/js/ext-all-debug.js", "js/ext-all-debug.js",
"/js/ext-extensions/BufferView.js", "js/ext-extensions/BufferView.js",
"/js/ext-extensions/FileUploadField.js", "js/ext-extensions/FileUploadField.js",
"/js/ext-extensions/JSLoader.js", "js/ext-extensions/JSLoader.js",
"/js/ext-extensions/Spinner.js", "js/ext-extensions/Spinner.js",
"/js/ext-extensions/SpinnerField.js", "js/ext-extensions/SpinnerField.js",
"/js/ext-extensions/StatusBar.js", "js/ext-extensions/StatusBar.js",
"/js/ext-extensions/ToggleField.js", "js/ext-extensions/ToggleField.js",
"/js/ext-extensions/TreeGridSorter.js", "js/ext-extensions/TreeGridSorter.js",
"/js/ext-extensions/TreeGridColumnResizer.js", "js/ext-extensions/TreeGridColumnResizer.js",
"/js/ext-extensions/TreeGridNodeUI.js", "js/ext-extensions/TreeGridNodeUI.js",
"/js/ext-extensions/TreeGridLoader.js", "js/ext-extensions/TreeGridLoader.js",
"/js/ext-extensions/TreeGridColumns.js", "js/ext-extensions/TreeGridColumns.js",
"/js/ext-extensions/TreeGridRenderColumn.js", "js/ext-extensions/TreeGridRenderColumn.js",
"/js/ext-extensions/TreeGrid.js", "js/ext-extensions/TreeGrid.js",
"/config.js", "config.js",
"/gettext.js", "gettext.js",
"/js/deluge-all/Deluge.js", "js/deluge-all/Deluge.js",
"/js/deluge-all/Deluge.Formatters.js", "js/deluge-all/Deluge.Formatters.js",
"/js/deluge-all/Deluge.Menus.js", "js/deluge-all/Deluge.Menus.js",
"/js/deluge-all/Deluge.Events.js", "js/deluge-all/Deluge.Events.js",
"/js/deluge-all/Deluge.OptionsManager.js", "js/deluge-all/Deluge.OptionsManager.js",
"/js/deluge-all/Deluge.MultiOptionsManager.js", "js/deluge-all/Deluge.MultiOptionsManager.js",
"/js/deluge-all/Deluge.Add.js", "js/deluge-all/Deluge.Add.js",
"/js/deluge-all/Deluge.Add.File.js", "js/deluge-all/Deluge.Add.File.js",
"/js/deluge-all/Deluge.Add.Url.js", "js/deluge-all/Deluge.Add.Url.js",
"/js/deluge-all/Deluge.Add.Infohash.js", "js/deluge-all/Deluge.Add.Infohash.js",
"/js/deluge-all/Deluge.Client.js", "js/deluge-all/Deluge.Client.js",
"/js/deluge-all/Deluge.ConnectionManager.js", "js/deluge-all/Deluge.ConnectionManager.js",
"/js/deluge-all/Deluge.Details.js", "js/deluge-all/Deluge.Details.js",
"/js/deluge-all/Deluge.Details.Status.js", "js/deluge-all/Deluge.Details.Status.js",
"/js/deluge-all/Deluge.Details.Details.js", "js/deluge-all/Deluge.Details.Details.js",
"/js/deluge-all/Deluge.Details.Files.js", "js/deluge-all/Deluge.Details.Files.js",
"/js/deluge-all/Deluge.Details.Peers.js", "js/deluge-all/Deluge.Details.Peers.js",
"/js/deluge-all/Deluge.Details.Options.js", "js/deluge-all/Deluge.Details.Options.js",
"/js/deluge-all/Deluge.EditTrackers.js", "js/deluge-all/Deluge.EditTrackers.js",
"/js/deluge-all/Deluge.FileBrowser.js", "js/deluge-all/Deluge.FileBrowser.js",
"/js/deluge-all/Deluge.Keys.js", "js/deluge-all/Deluge.Keys.js",
"/js/deluge-all/Deluge.Login.js", "js/deluge-all/Deluge.Login.js",
"/js/deluge-all/Deluge.MoveStorage.js", "js/deluge-all/Deluge.MoveStorage.js",
"/js/deluge-all/Deluge.Plugin.js", "js/deluge-all/Deluge.Plugin.js",
"/js/deluge-all/Deluge.Preferences.js", "js/deluge-all/Deluge.Preferences.js",
"/js/deluge-all/Deluge.Preferences.Downloads.js", "js/deluge-all/Deluge.Preferences.Downloads.js",
#"/js/deluge-all/Deluge.Preferences.Network.js", #"js/deluge-all/Deluge.Preferences.Network.js",
"/js/deluge-all/Deluge.Preferences.Encryption.js", "js/deluge-all/Deluge.Preferences.Encryption.js",
"/js/deluge-all/Deluge.Preferences.Bandwidth.js", "js/deluge-all/Deluge.Preferences.Bandwidth.js",
"/js/deluge-all/Deluge.Preferences.Interface.js", "js/deluge-all/Deluge.Preferences.Interface.js",
"/js/deluge-all/Deluge.Preferences.Other.js", "js/deluge-all/Deluge.Preferences.Other.js",
"/js/deluge-all/Deluge.Preferences.Daemon.js", "js/deluge-all/Deluge.Preferences.Daemon.js",
"/js/deluge-all/Deluge.Preferences.Queue.js", "js/deluge-all/Deluge.Preferences.Queue.js",
"/js/deluge-all/Deluge.Preferences.Proxy.js", "js/deluge-all/Deluge.Preferences.Proxy.js",
"/js/deluge-all/Deluge.Preferences.Cache.js", "js/deluge-all/Deluge.Preferences.Cache.js",
"/js/deluge-all/Deluge.Preferences.Plugins.js", "js/deluge-all/Deluge.Preferences.Plugins.js",
"/js/deluge-all/Deluge.Remove.js", "js/deluge-all/Deluge.Remove.js",
"/js/deluge-all/Deluge.Sidebar.js", "js/deluge-all/Deluge.Sidebar.js",
"/js/deluge-all/Deluge.Statusbar.js", "js/deluge-all/Deluge.Statusbar.js",
"/js/deluge-all/Deluge.Toolbar.js", "js/deluge-all/Deluge.Toolbar.js",
"/js/deluge-all/Deluge.Torrent.js", "js/deluge-all/Deluge.Torrent.js",
"/js/deluge-all/Deluge.Torrents.js", "js/deluge-all/Deluge.Torrents.js",
"/js/deluge-all/Deluge.UI.js" "js/deluge-all/Deluge.UI.js"
] ]
def __init__(self): def __init__(self):
@ -403,7 +403,7 @@ class TopLevel(resource.Resource):
theme = component.get("DelugeWeb").config["theme"] theme = component.get("DelugeWeb").config["theme"]
if not os.path.isfile(rpath("css", "xtheme-%s.css" % theme)): if not os.path.isfile(rpath("css", "xtheme-%s.css" % theme)):
theme = CONFIG_DEFAULTS.get("theme") theme = CONFIG_DEFAULTS.get("theme")
self.__stylesheets.insert(1, "/css/xtheme-%s.css" % theme) self.__stylesheets.insert(1, "css/xtheme-%s.css" % theme)
self.base = component.get("DelugeWeb").config["base"] self.base = component.get("DelugeWeb").config["base"]