diff --git a/pywb/apps/frontendapp.py b/pywb/apps/frontendapp.py index 86d6db40..b29e612c 100644 --- a/pywb/apps/frontendapp.py +++ b/pywb/apps/frontendapp.py @@ -107,6 +107,7 @@ class FrontEndApp(object): self.templates_dir = config.get('templates_dir', 'templates') self.static_dir = config.get('static_dir', 'static') + self.static_prefix = config.get('static_prefix', 'static') metadata_templ = os.path.join(self.warcserver.root_dir, '{coll}', 'metadata.yaml') self.metadata_cache = MetadataCache(metadata_templ) @@ -118,8 +119,8 @@ class FrontEndApp(object): specific routes (proxy mode, record) """ self.url_map = Map() - self.url_map.add(Rule('/static/_//', endpoint=self.serve_static)) - self.url_map.add(Rule('/static/', endpoint=self.serve_static)) + self.url_map.add(Rule('/{0}/_//'.format(self.static_prefix), endpoint=self.serve_static)) + self.url_map.add(Rule('/{0}/'.format(self.static_prefix), endpoint=self.serve_static)) self.url_map.add(Rule('/collinfo.json', endpoint=self.serve_listing)) if self.is_valid_coll('$root'): diff --git a/pywb/static/default_banner.js b/pywb/static/default_banner.js index f3a07d09..15e1ee27 100644 --- a/pywb/static/default_banner.js +++ b/pywb/static/default_banner.js @@ -160,7 +160,7 @@ This file is part of pywb, https://github.com/webrecorder/pywb if (window.banner_info.logoImg) { var logo = document.createElement("a"); - logo.setAttribute("href", "/" + (window.banner_info.locale ? window.banner_info.locale + "/" : "")); + logo.setAttribute("href", "/" + (window.banner_info.curr_locale ? window.banner_info.curr_locale + "/" : "")); logo.setAttribute("class", "_wb_linked_logo"); var logoContents = "";