diff --git a/CHANGES.rst b/CHANGES.rst index f162e213d..ffcbc5873 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +pywb 2.6.2 changelist +~~~~~~~~~~~~~~~~~~~~~ + +Fix regression caused by 2.6.1, with static files not being loaded correctly. `#678 `_ + + pywb 2.6.1 changelist ~~~~~~~~~~~~~~~~~~~~~ diff --git a/config.yaml b/config.yaml index a3b638c03..821bb82e9 100644 --- a/config.yaml +++ b/config.yaml @@ -22,7 +22,7 @@ framed_replay: true # default_locale: en # uncomment to set available locales -# locales: -# - en -# - es +locales: + - en + - fr diff --git a/pywb/apps/rewriterapp.py b/pywb/apps/rewriterapp.py index 34f6b64e8..ca5aa9d5c 100644 --- a/pywb/apps/rewriterapp.py +++ b/pywb/apps/rewriterapp.py @@ -334,8 +334,6 @@ def render_content(self, wb_url, kwargs, environ): if is_proxy and self.is_preflight(environ): return WbResponse.options_response(environ) - environ['pywb.host_prefix'] = host_prefix - if self.use_js_obj_proxy: content_rw = self.js_proxy_rw else: diff --git a/pywb/rewrite/templateview.py b/pywb/rewrite/templateview.py index 74c58bb0b..a3f32f729 100644 --- a/pywb/rewrite/templateview.py +++ b/pywb/rewrite/templateview.py @@ -322,7 +322,7 @@ def render_to_string(self, env, **kwargs): kwargs.update(params) kwargs['env'] = env - kwargs['static_prefix'] = env.get('pywb.static_prefix') + kwargs['static_prefix'] = env.get('pywb.static_prefix', '/static') return template.render(**kwargs) diff --git a/pywb/static/css/base.css b/pywb/static/css/base.css new file mode 100644 index 000000000..9618a7eb0 --- /dev/null +++ b/pywb/static/css/base.css @@ -0,0 +1,41 @@ +header { + display: flex; + display: -webkit-box; + display: -moz-box; + display: -webkit-flex; + display: -ms-flexbox; + + justify-content: space-between; + -webkit-box-pack: justify; + -moz-box-pack: justify; + -ms-flex-pack: justify; +} + +header .language-select { + position: absolute; + top: 10px; + right: 10px; +} +header .language-select ul { + display: inline-block; + list-style-type: none; + margin: 0; + padding: 0; +} +header .language-select ul li { + display: inline-block; +} +header .language-select ul li:not(:last-child):after { + content: ' / '; +} + +header .language-select a:link, +header .language-select a:visited, +header .language-select a:active { + text-decoration: none; +} + +header .language-select a:hover { + text-decoration: underline; +} + diff --git a/pywb/version.py b/pywb/version.py index 966b0f7f2..e1e6add7e 100644 --- a/pywb/version.py +++ b/pywb/version.py @@ -1,4 +1,4 @@ -__version__ = '2.6.1' +__version__ = '2.6.2' if __name__ == '__main__': print(__version__) diff --git a/tests/test_integration.py b/tests/test_integration.py index 0a5c315fa..acfef6455 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -17,6 +17,7 @@ def test_home(self): def test_pywb_root(self): resp = self.testapp.get('/pywb/') self._assert_basic_html(resp) + assert '