Use our own jinja2 template loader

- Our template loader setup was a hack, and that hack seems to
  have stopped working.
- We just use our own loader instead. This means we lose the base
  translation functionality of upstream render_template - but we
  were not using it at all anyway, so 'tis alright.
- Looks like the path for the stylesheet we were 'borrowing'
  from classic notebook changed location, so update to use the
  new location. This will stop existing after notebook v7,
  and we will need to use our own.

Fixes jupyterhub#235

Author: yuvipanda

nbgitpuller/handlers.py

@@ -13,6 +13,11 @@
 from .version import __version__
 
 
+jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader(
+        os.path.join(os.path.dirname(__file__), 'templates')
+    ),
+)
+
 class SyncHandler(IPythonHandler):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -128,19 +133,6 @@ def pull():
 
 
 class UIHandler(IPythonHandler):
-    def initialize(self):
-        super().initialize()
-        # FIXME: Is this really the best way to use jinja2 here?
-        # I can't seem to get the jinja2 env in the base handler to
-        # actually load templates from arbitrary paths ugh.
-        jinja2_env = self.settings['jinja2_env']
-        jinja2_env.loader = jinja2.ChoiceLoader([
-            jinja2_env.loader,
-            jinja2.FileSystemLoader(
-                os.path.join(os.path.dirname(__file__), 'templates')
-            )
-        ])
-
     @web.authenticated
     async def get(self):
         app_env = os.getenv('NBGITPULLER_APP', default='notebook')
@@ -169,10 +161,11 @@ async def get(self):
                 path = 'tree/' + path
 
         self.write(
-            self.render_template(
-                'status.html',
-                repo=repo, branch=branch, path=path, depth=depth, targetpath=targetpath, version=__version__
-            ))
+            jinja_env.get_template('status.html').render(
+                repo=repo, branch=branch, path=path, depth=depth, targetpath=targetpath, version=__version__,
+                **self.template_namespace
+            )
+        )
         await self.flush()
 
 

nbgitpuller/templates/page.html

@@ -5,9 +5,7 @@
     <meta charset="utf-8">
     <title>{% block title %}Jupyter Server{% endblock %}</title>
     {% block favicon %}<link id="favicon" rel="shortcut icon" type="image/x-icon" href="{{ static_url("favicon.ico") }}">{% endblock %}
-    <link rel="stylesheet" href="{{static_url("style/bootstrap.min.css") }}" />
-    <link rel="stylesheet" href="{{static_url("style/bootstrap-theme.min.css") }}" />
-    <link rel="stylesheet" href="{{static_url("style/index.css") }}" />
+    <link rel="stylesheet" href="{{static_url("style/style.min.css") }}" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -23,15 +21,15 @@
 
   <noscript>
     <div id='noscript'>
-      {% trans %}Jupyter Server requires JavaScript.{% endtrans %}<br>
-      {% trans %}Please enable it to proceed. {% endtrans %}
+      Jupyter Server requires JavaScript.<br>
+      Please enable it to proceed.
     </div>
   </noscript>
 
-  <div id="header" role="navigation" aria-label="{% trans %}Top Menu{% endtrans %}">
+  <div id="header" role="navigation" aria-label="Top Menu">
     <div id="header-container" class="container">
       <div id="jupyter_server" class="nav navbar-brand"><a href="{{default_url}}
-    {%- if logged_in and token -%}?token={{token}}{%- endif -%}" title='{% trans %}dashboard{% endtrans %}'>
+    {%- if logged_in and token -%}?token={{token}}{%- endif -%}" title='dashboard'>
           {% block logo %}<img src='{{static_url("logo/logo.png") }}' alt='Jupyter Server' />{% endblock %}
         </a></div>