Merge pull request #48 from aio-libs/fix-rendering

jettify · web-flow · commit 8ca719f7908d · 2016-09-26T22:36:58.000+03:00
Fix page rendering #46
diff --git a/aiohttp_debugtoolbar/toolbar.py b/aiohttp_debugtoolbar/toolbar.py
@@ -66,25 +66,23 @@ def inject(self, request, response):
         css_path = request.app.router[STATIC_ROUTE_NAME].url(
             filename='css/toolbar_button.css')
 
+        toolbar_css = toolbar_css_template % {'css_path': css_path}
         toolbar_html = toolbar_html_template % {
             'button_style': button_style,
             'css_path': css_path,
             'toolbar_url': toolbar_url}
 
         toolbar_html = toolbar_html.encode(response.charset or 'utf-8')
+        toolbar_css = toolbar_css.encode(response.charset or 'utf-8')
+        response_html = replace_insensitive(
+            response_html, b'</head>', toolbar_css + b'</head>')
         response.body = replace_insensitive(
             response_html, b'</body>',
             toolbar_html + b'</body>')
+toolbar_css_template = """\
+<link rel="stylesheet" type="text/css" href="%(css_path)s">"""
 
 toolbar_html_template = """\
-<script type="text/javascript">
-    var fileref=document.createElement("link")
-    fileref.setAttribute("rel", "stylesheet")
-    fileref.setAttribute("type", "text/css")
-    fileref.setAttribute("href", "%(css_path)s")
-    document.getElementsByTagName("head")[0].appendChild(fileref)
-</script>
-
 <div id="pDebug">
     <div style="display: block; %(button_style)s" id="pDebugToolbarHandle">
         <a title="Show Toolbar" id="pShowToolBarButton"
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -47,7 +47,13 @@ def create(*, debug=False, ssl_ctx=None, **kw):
         setup(app, **kw)
         port = unused_port
 
-        tplt = "<html><body><h1>{{ head }}</h1>{{ text }}</body></html>"
+        tplt = """
+        <html>
+        <head></head>
+        <body>
+            <h1>{{ head }}</h1>{{ text }}
+        </body>
+        </html>"""
         loader = jinja2.DictLoader({'tplt.html': tplt})
         aiohttp_jinja2.setup(app, loader=loader)
 
diff --git a/tests/test_middleware.py b/tests/test_middleware.py
@@ -13,6 +13,7 @@ def handler(request):
         return aiohttp_jinja2.render_template(
             'tplt.html', request,
             {'head': 'HEAD', 'text': 'text'})
+
     app, url = yield from create_server()
     app.router.add_route('GET', '/', handler)
 
@@ -24,6 +25,7 @@ def handler(request):
                                       loop=loop, connector=conn)
     assert 200 == resp.status
     txt = yield from resp.text()
+    assert 'toolbar_button.css' in txt
     assert 'pDebugToolbarHandle' in txt
     resp.close()
 
