From d48ecb6722e3578cdcb6a087e12f1dd256f1b328 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Wed, 13 Nov 2013 20:47:33 -0500 Subject: [PATCH] Use server_dir as replacement for base_href. --- cfg.py | 1 - menu.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cfg.py b/cfg.py index 013a5bdff..e45f56807 100644 --- a/cfg.py +++ b/cfg.py @@ -35,7 +35,6 @@ port = int(get_item(parser, 'Network', 'port')) html_root = None main_menu = Menu() -base_href = "" if store_file.endswith(".sqlite3"): store_file = os.path.splitext(store_file)[0] diff --git a/menu.py b/menu.py index 477ea4ab1..93860dcdb 100644 --- a/menu.py +++ b/menu.py @@ -39,10 +39,10 @@ class Menu(): """This method creates a menu item with the parameters, adds that menu item to this menu, and returns the item. - If BASEHREF is true and url start with a slash, prepend the cfg.base_href to it""" + If BASEHREF is true and url start with a slash, prepend the cfg.server_dir to it""" if basehref and url.startswith("/"): - url = cfg.server_dir + cfg.base_href + url + url = cfg.server_dir + url item = Menu(label=label, icon=icon, url=url, order=order) self.items.append(item)