From ca494b235010f32e4a63c98fabc07091114287e4 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Tue, 13 Jun 2017 13:34:27 +0100
Subject: [PATCH 1/8] Remove Jinja and use tornado templates

---
 remoteappmanager/base_application.py          | 18 ------
 .../handlers/admin/admin_home_handler.py      |  2 +-
 remoteappmanager/handlers/base_handler.py     | 18 ++++--
 .../handlers/user_home_handler.py             |  2 +-
 .../{admin/page.html => admin_page.html}      |  9 ++-
 remoteappmanager/templates/error.html         | 29 ++++------
 remoteappmanager/templates/page.html          | 57 +++++++++----------
 .../{user/page.html => user_page.html}        | 11 ++--
 .../tests/test_jinja2_adapters.py             | 47 ---------------
 requirements.txt                              |  1 -
 10 files changed, 62 insertions(+), 132 deletions(-)
 rename remoteappmanager/templates/{admin/page.html => admin_page.html} (91%)
 rename remoteappmanager/templates/{user/page.html => user_page.html} (69%)
 delete mode 100644 remoteappmanager/tests/test_jinja2_adapters.py

diff --git a/remoteappmanager/base_application.py b/remoteappmanager/base_application.py
index 5989b3580..00b8650fa 100644
--- a/remoteappmanager/base_application.py
+++ b/remoteappmanager/base_application.py
@@ -4,14 +4,12 @@
 from traitlets import Instance, default
 from tornado import web
 import tornado.ioloop
-from jinja2 import Environment, FileSystemLoader
 
 from tornadowebapi.registry import Registry
 
 from remoteappmanager.db.interfaces import ABCDatabase
 from remoteappmanager.logging.logging_mixin import LoggingMixin
 from remoteappmanager.docker.container_manager import ContainerManager
-from remoteappmanager.jinja2_adapters import Jinja2LoaderAdapter, gravatar_id
 from remoteappmanager.user import User
 from remoteappmanager.traitlets import as_dict
 from remoteappmanager.services.hub import Hub
@@ -84,8 +82,6 @@ def __init__(self,
         settings["static_url_prefix"] = (
             self._command_line_config.base_urlpath + "static/")
 
-        self._jinja_init(settings)
-
         handlers = self._get_handlers()
 
         super().__init__(handlers, **settings)
@@ -181,17 +177,3 @@ def _get_handlers(self):
         web_api = self.registry.api_handlers(base_urlpath)
         web_handlers = self._web_handlers()
         return web_api+web_handlers
-
-    def _jinja_init(self, settings):
-        """Initializes the jinja template system settings.
-        These will be passed as settings and will be accessible at
-        rendering."""
-        jinja_env = Environment(
-            loader=FileSystemLoader(
-                settings["template_path"]
-            ),
-            autoescape=True,
-        )
-
-        jinja_env.filters["gravatar_id"] = gravatar_id
-        settings["template_loader"] = Jinja2LoaderAdapter(jinja_env)
diff --git a/remoteappmanager/handlers/admin/admin_home_handler.py b/remoteappmanager/handlers/admin/admin_home_handler.py
index c90909d67..a081db5ae 100644
--- a/remoteappmanager/handlers/admin/admin_home_handler.py
+++ b/remoteappmanager/handlers/admin/admin_home_handler.py
@@ -9,4 +9,4 @@ class AdminHomeHandler(BaseHandler):
     @web.authenticated
     @gen.coroutine
     def get(self):
-        self.render('admin/page.html')
+        self.render('admin_page.html')
diff --git a/remoteappmanager/handlers/base_handler.py b/remoteappmanager/handlers/base_handler.py
index 9b8b9ef12..e136deb92 100644
--- a/remoteappmanager/handlers/base_handler.py
+++ b/remoteappmanager/handlers/base_handler.py
@@ -1,5 +1,6 @@
 from http.client import responses
 from urllib.parse import urljoin
+import hashlib
 
 from tornado import web, gen
 
@@ -36,12 +37,17 @@ def render(self, template_name, **kwargs):
 
         args.update(kwargs)
 
-        if file_config.ga_tracking_id:
-            args.update({
-                "analytics": {
-                    "tracking_id": file_config.ga_tracking_id
-                }
-            })
+        args.update({
+            "analytics": {
+                "tracking_id": file_config.ga_tracking_id
+            } if file_config.ga_tracking_id else None
+        })
+
+        args.update({
+            "gravatar_id": hashlib.md5(
+                str(self.current_user.name).strip().lower().encode(
+                    "utf-8")).hexdigest()
+        })
 
         super(BaseHandler, self).render(template_name, **args)
 
diff --git a/remoteappmanager/handlers/user_home_handler.py b/remoteappmanager/handlers/user_home_handler.py
index 57da924bd..385e933ab 100644
--- a/remoteappmanager/handlers/user_home_handler.py
+++ b/remoteappmanager/handlers/user_home_handler.py
@@ -9,4 +9,4 @@ class UserHomeHandler(BaseHandler):
     @web.authenticated
     @gen.coroutine
     def get(self):
-        self.render('user/page.html')
+        self.render('user_page.html')
diff --git a/remoteappmanager/templates/admin/page.html b/remoteappmanager/templates/admin_page.html
similarity index 91%
rename from remoteappmanager/templates/admin/page.html
rename to remoteappmanager/templates/admin_page.html
index 0f6b4bb9b..0148ca813 100644
--- a/remoteappmanager/templates/admin/page.html
+++ b/remoteappmanager/templates/admin_page.html
@@ -1,6 +1,6 @@
 {% extends "page.html" %}
 
-{% set skin = "skin-red" %}
+{% block skin %} skin-red {% end %}
 
 {% block sidebar %}
   <section class="sidebar">
@@ -12,7 +12,7 @@
       <router-link to="/applications" tag="li" exact-active-class="active"><a>Applications</a></router-link>
     </ul>
   </section>
-{% endblock %}
+{% end %}
 
 {% block main %}
   <section class="content">
@@ -25,9 +25,8 @@
     <!-- component matched by the route will render here -->
     <router-view></router-view>
   </section>
-{% endblock %}
+{% end %}
 
 {% block script_init %}
-    {{  super() }}
     <script src="{{ static_url("dist/admin.js") }}"></script>
-{% endblock %}
+{% end %}
diff --git a/remoteappmanager/templates/error.html b/remoteappmanager/templates/error.html
index bef771a63..ae4cb44a3 100644
--- a/remoteappmanager/templates/error.html
+++ b/remoteappmanager/templates/error.html
@@ -1,28 +1,23 @@
 {% extends "page.html" %}
 
 {% block login_widget %}
-{% endblock %}
+{% end %}
 
 {% block main %}
 
 <div class="error">
   {% block h1_error %}
-  <h1>
-    {{status_code}} : {{status_message}}
-  </h1>
-  {% endblock h1_error %}
+    <h1>
+      {{status_code}} : {{status_message}}
+    </h1>
+  {% end %}
   {% block error_detail %}
-  {% if message %}
-  <p>
-    {{message}}
-  </p>
-  {% endif %}
-  {% if message_html %}
-  <p>
-    {{message_html | safe}}
-  </p>
-  {% endif %}
-  {% endblock error_detail %}
+    {% if message %}
+      <p>
+        {{message}}
+      </p>
+    {% end %}
+  {% end %}
 </div>
 
-{% endblock %}
+{% end %}
diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index 608a0f245..99eb1ac21 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -1,17 +1,15 @@
-{% set skin = skin | default("skin-blue") %}
-
 <!DOCTYPE html>
 <html>
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>{% block title %}RemoteApp Manager{% endblock %}</title>
+  <title>{% block title %}RemoteApp Manager{% end %}</title>
   <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
 
   <link rel="stylesheet" href="{{ static_url("dist/sharedDependencies.css")}}">
 
   {% block stylesheet %}
-  {% endblock %}
+  {% end %}
 
   {% block script %}
     <script type="text/javascript">
@@ -23,13 +21,13 @@
       window.ga.l = 1 * new Date();
       window.GoogleAnalyticsObject = "ga";
     </script>
-    {% if analytics %}
-    <script src='https://www.google-analytics.com/analytics.js' async type="text/javascript"></script>
-    {% endif %}
-  {% endblock %}
+    {% if analytics is not None %}
+      <script src='https://www.google-analytics.com/analytics.js' async type="text/javascript"></script>
+    {% end %}
+  {% end %}
 </head>
 
-<body class="hold-transition {{ skin }} sidebar-mini">
+<body class="hold-transition {% block skin %}{% end %} sidebar-mini">
 
   <noscript>
     <div id='noscript'>
@@ -52,7 +50,7 @@
       <nav class="navbar navbar-static-top" role="navigation">
         <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
           {% block topbar %}
-          {% endblock %}
+          {% end %}
         </div>
 
         <!-- Navbar Right Menu -->
@@ -63,14 +61,14 @@
               <!-- Menu Toggle Button -->
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                 <!-- The user image in the navbar-->
-                <img src="https://www.gravatar.com/avatar/{{ user.name | gravatar_id }}" class="user-image" alt="User Image">
+                <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="user-image" alt="User Image">
                 <!-- hidden-xs hides the username on small devices so only the image appears. -->
                 <span class="hidden-xs">{{ user.name }}</span>
               </a>
               <ul class="dropdown-menu">
                 <!-- The user image in the menu -->
                 <li class="user-header">
-                  <img src="https://www.gravatar.com/avatar/{{ user.name | gravatar_id }}" class="img-circle" alt="User Image">
+                  <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="img-circle" alt="User Image">
                   <p>
                     {{ user.name }}
                   </p>
@@ -83,7 +81,7 @@
                   <div class="pull-right">
                     {% block login_widget %}
                     <a id="logout" href="{{ logout_url }}" class="btn btn-default btn-flat"><i class="fa fa-sign-out"> Sign out</i></a>
-                    {% endblock %}
+                    {% end %}
                   </div>
                 </li>
               </ul>
@@ -95,13 +93,13 @@
 
     <aside class="main-sidebar">
       {% block sidebar %}
-      {% endblock %}
+      {% end %}
     </aside>
 
     <div class="content-wrapper">
       <!-- Main content -->
       {% block main %}
-      {% endblock %}
+      {% end %}
     </div>
   </div>
 
@@ -109,22 +107,21 @@
 
   <script src="{{ static_url("dist/sharedDependencies.js") }}"></script>
 
+  <script type="text/javascript">
+    window.apidata = {
+      base_url: "{{base_url}}",
+      {% if user %}
+        user: "{{user.name}}",
+      {% end %}
+      {% if analytics is not None %}
+        analytics: {
+          tracking_id: "{{ analytics.tracking_id }}"
+        },
+      {% end %}
+    }
+  </script>
   {% block script_init %}
-    <script type="text/javascript">
-      window.apidata = {
-        base_url: "{{base_url}}",
-        prefix: "{{prefix}}",
-        {% if user %}
-          user: "{{user.name}}",
-        {% endif %}
-        {% if analytics %}
-          analytics: {
-            tracking_id: "{{ analytics.tracking_id }}"
-          },
-        {% endif %}
-      }
-    </script>
-  {% endblock %}
+  {% end %}
 
 </body>
 </html>
diff --git a/remoteappmanager/templates/user/page.html b/remoteappmanager/templates/user_page.html
similarity index 69%
rename from remoteappmanager/templates/user/page.html
rename to remoteappmanager/templates/user_page.html
index 5f7b0a51f..e00c1e7df 100644
--- a/remoteappmanager/templates/user/page.html
+++ b/remoteappmanager/templates/user_page.html
@@ -1,20 +1,19 @@
 {% extends "page.html" %}
 
-{% set skin = "skin-black" %}
+{% block skin %} skin-black {% end %}
 
 {% block topbar %}
   <div id="applabel"></div>
-{% endblock %}
+{% end %}
 
 {% block sidebar %}
   <div id="applist"></div>
-{% endblock %}
+{% end %}
 
 {% block main %}
   <div id="appview"></div>
-{% endblock %}
+{% end %}
 
 {% block script_init %}
-    {{  super() }}
     <script src="{{ static_url("dist/user.js") }}"></script>
-{% endblock %}
+{% end %}
diff --git a/remoteappmanager/tests/test_jinja2_adapters.py b/remoteappmanager/tests/test_jinja2_adapters.py
deleted file mode 100644
index ab6f4d6dc..000000000
--- a/remoteappmanager/tests/test_jinja2_adapters.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import unittest
-import os
-from jinja2 import Environment, FileSystemLoader
-
-from remoteappmanager.tests import fixtures
-from remoteappmanager.jinja2_adapters import (
-    Jinja2LoaderAdapter,
-    Jinja2TemplateAdapter)
-
-
-class TestJinja2Adapters(unittest.TestCase):
-    def setUp(self):
-        self.template_path = fixtures.get("templates")
-        self.jinja_env = Environment(
-            loader=FileSystemLoader(
-                self.template_path
-            ),
-            autoescape=True
-        )
-
-    def test_initialization(self):
-        loader = Jinja2LoaderAdapter(self.jinja_env)
-        t = loader.load("foo.html")
-
-        self.assertIsInstance(t, Jinja2TemplateAdapter)
-
-    def test_resolve_path(self):
-        loader = Jinja2LoaderAdapter(self.jinja_env)
-        path = loader.resolve_path("foo.html")
-        self.assertEqual(path, os.path.join(self.template_path, "foo.html"))
-        self.assertTrue(os.path.exists(path))
-
-    def test_template_generate(self):
-        loader = Jinja2LoaderAdapter(self.jinja_env)
-        template = loader.load("foo.html")
-        self.assertEqual(template.generate(hello="whatever"), "whatever")
-
-    def test_cache_reset(self):
-        loader = Jinja2LoaderAdapter(self.jinja_env)
-        self.assertEqual(len(self.jinja_env.cache), 0)
-        template = loader.load("foo.html")
-        self.assertEqual(template.generate(hello="whatever"), "whatever")
-        self.assertEqual(len(self.jinja_env.cache), 1)
-
-        loader.reset()
-
-        self.assertEqual(len(self.jinja_env.cache), 0)
diff --git a/requirements.txt b/requirements.txt
index db94425f3..56a5ae19b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,6 @@ requests==2.10.0
 # on ubuntu uses 1.23, so they don't like each other.
 docker-py==1.8
 escapism==0.0.1
-jinja2==2.8
 git+git://github.com/jupyterhub/jupyterhub.git@2d1a45f0190059ef436c2f97dc8d6e391eb2d139#egg=jupyterhub
 jupyter_client==4.3.0
 click==6.6

From 29c9722a3cbae780e75c9bc093ab7f23666ef7fe Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Tue, 13 Jun 2017 13:50:57 +0100
Subject: [PATCH 2/8] Remove last jinja file

---
 remoteappmanager/jinja2_adapters.py | 81 -----------------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 remoteappmanager/jinja2_adapters.py

diff --git a/remoteappmanager/jinja2_adapters.py b/remoteappmanager/jinja2_adapters.py
deleted file mode 100644
index 192d87575..000000000
--- a/remoteappmanager/jinja2_adapters.py
+++ /dev/null
@@ -1,81 +0,0 @@
-import hashlib
-
-from tornado.template import Template
-
-
-class Jinja2LoaderAdapter:
-    """Adapts the Jinja2 environment to act as a loader
-    as desired by tornado.
-
-    The class uses duck typing to implement the interface of tornado.BaseLoader
-    and relies on jinja caching to hold the premade templates.
-    """
-    def __init__(self, env):
-        """Initializes the adapter.
-
-        Parameters
-        ----------
-        env : Environment
-            the jinja2 environment
-
-        """
-        self._env = env
-
-    def reset(self):
-        """Resets the LRU cache in jinja template environment.
-        The method is already thread safe.
-        """
-        self._env.cache.clear()
-
-    def load(self, name, parent_path=None):
-        """Loads the template with a given name.
-
-        Parameters
-        ----------
-        name : str
-            the simple name of the template.
-        parent_path : str
-            The parent path (unused)
-
-        Return
-        ------
-        Jinja2TemplateAdapter object, adapting a jinja template into a tornado
-        template interface
-        """
-        return Jinja2TemplateAdapter(self._env.get_template(name))
-
-    def resolve_path(self, name, parent_path=None):
-        """Returns the absolute name of the template according to the loader.
-
-        Parameters
-        ----------
-        name : str
-            the simple name of the template.
-        parent_path : str
-            The parent path (unused)
-
-        Return
-        ------
-        The absolute path of the template
-        """
-        _, filename, _ = self._env.loader.get_source(self._env, name)
-        return filename
-
-
-class Jinja2TemplateAdapter(Template):
-    """Adapts the Jinja template interface to act as a tornado template.
-    It reimplements the base class, but it uses no functionality of it.
-
-    """
-    def __init__(self, template):
-        self._template = template
-
-    def generate(self, **kwargs):
-        """Generate this template with the given arguments."""
-        return self._template.render(**kwargs)
-
-
-def gravatar_id(value):
-    """Computes the gravatar identifier for a given value (normally email)
-    Used for jinja filter."""
-    return hashlib.md5(str(value).strip().lower().encode("utf-8")).hexdigest()

From d8e9555d7732ea9903340a8d6c46df80395e5e8d Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Tue, 13 Jun 2017 14:04:00 +0100
Subject: [PATCH 3/8] Remove unused blocks

---
 remoteappmanager/templates/error.html | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/remoteappmanager/templates/error.html b/remoteappmanager/templates/error.html
index ae4cb44a3..39b602f2c 100644
--- a/remoteappmanager/templates/error.html
+++ b/remoteappmanager/templates/error.html
@@ -1,22 +1,15 @@
 {% extends "page.html" %}
 
-{% block login_widget %}
-{% end %}
-
 {% block main %}
 
 <div class="error">
-  {% block h1_error %}
-    <h1>
-      {{status_code}} : {{status_message}}
-    </h1>
-  {% end %}
-  {% block error_detail %}
-    {% if message %}
-      <p>
-        {{message}}
-      </p>
-    {% end %}
+  <h1>
+    {{status_code}} : {{status_message}}
+  </h1>
+  {% if message %}
+    <p>
+      {{message}}
+    </p>
   {% end %}
 </div>
 

From f79bca64746000023bb2774c60934ca5075da7a2 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Tue, 13 Jun 2017 15:04:58 +0100
Subject: [PATCH 4/8] Fix two failing python tests

---
 remoteappmanager/handlers/base_handler.py |  9 ++-
 remoteappmanager/templates/page.html      | 74 ++++++++++++-----------
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/remoteappmanager/handlers/base_handler.py b/remoteappmanager/handlers/base_handler.py
index e136deb92..c980184d6 100644
--- a/remoteappmanager/handlers/base_handler.py
+++ b/remoteappmanager/handlers/base_handler.py
@@ -44,9 +44,12 @@ def render(self, template_name, **kwargs):
         })
 
         args.update({
-            "gravatar_id": hashlib.md5(
-                str(self.current_user.name).strip().lower().encode(
-                    "utf-8")).hexdigest()
+            "gravatar_id": (
+                hashlib.md5(
+                    str(self.current_user.name).strip().lower().encode(
+                        "utf-8")).hexdigest()
+                if self.current_user is not None
+                else None)
         })
 
         super(BaseHandler, self).render(template_name, **args)
diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index 99eb1ac21..e8a1361f2 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -53,41 +53,43 @@
           {% end %}
         </div>
 
-        <!-- Navbar Right Menu -->
-        <div class="navbar-custom-menu">
-          <ul class="nav navbar-nav">
-            <!-- User Account Menu -->
-            <li id="user-menu" class="dropdown user user-menu">
-              <!-- Menu Toggle Button -->
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                <!-- The user image in the navbar-->
-                <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="user-image" alt="User Image">
-                <!-- hidden-xs hides the username on small devices so only the image appears. -->
-                <span class="hidden-xs">{{ user.name }}</span>
-              </a>
-              <ul class="dropdown-menu">
-                <!-- The user image in the menu -->
-                <li class="user-header">
-                  <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="img-circle" alt="User Image">
-                  <p>
-                    {{ user.name }}
-                  </p>
-                </li>
-                <!-- Menu Body -->
-                <li class="user-body">
-                </li>
-                <!-- Menu Footer-->
-                <li class="user-footer">
-                  <div class="pull-right">
-                    {% block login_widget %}
-                    <a id="logout" href="{{ logout_url }}" class="btn btn-default btn-flat"><i class="fa fa-sign-out"> Sign out</i></a>
-                    {% end %}
-                  </div>
-                </li>
-              </ul>
-            </li>
-          </ul>
-        </div>
+        {% if user is not None %}
+          <!-- Navbar Right Menu -->
+          <div class="navbar-custom-menu">
+            <ul class="nav navbar-nav">
+              <!-- User Account Menu -->
+              <li id="user-menu" class="dropdown user user-menu">
+                <!-- Menu Toggle Button -->
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                  <!-- The user image in the navbar-->
+                  <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="user-image" alt="User Image">
+                  <!-- hidden-xs hides the username on small devices so only the image appears. -->
+                  <span class="hidden-xs">{{ user.name }}</span>
+                </a>
+                <ul class="dropdown-menu">
+                  <!-- The user image in the menu -->
+                  <li class="user-header">
+                    <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="img-circle" alt="User Image">
+                    <p>
+                      {{ user.name }}
+                    </p>
+                  </li>
+                  <!-- Menu Body -->
+                  <li class="user-body">
+                  </li>
+                  <!-- Menu Footer-->
+                  <li class="user-footer">
+                    <div class="pull-right">
+                      {% block login_widget %}
+                      <a id="logout" href="{{ logout_url }}" class="btn btn-default btn-flat"><i class="fa fa-sign-out"> Sign out</i></a>
+                      {% end %}
+                    </div>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+        {% end %}
       </nav>
     </header>
 
@@ -110,7 +112,7 @@
   <script type="text/javascript">
     window.apidata = {
       base_url: "{{base_url}}",
-      {% if user %}
+      {% if user is not None %}
         user: "{{user.name}}",
       {% end %}
       {% if analytics is not None %}

From 5cce35188b646dccba5663f0b41b38ba487b7134 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Tue, 13 Jun 2017 15:21:41 +0100
Subject: [PATCH 5/8] Fix last pythontest

---
 remoteappmanager/templates/page.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index e8a1361f2..2f6cb4181 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -111,13 +111,13 @@
 
   <script type="text/javascript">
     window.apidata = {
-      base_url: "{{base_url}}",
+      base_url: "{{ base_url }}",
       {% if user is not None %}
-        user: "{{user.name}}",
+        user: "{{ user.name }}",
       {% end %}
       {% if analytics is not None %}
         analytics: {
-          tracking_id: "{{ analytics.tracking_id }}"
+          tracking_id: "{{ analytics['tracking_id'] }}"
         },
       {% end %}
     }

From fbe82d2dd20a0fa0ff9971a5fd4c6812a2b3f34b Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Tue, 13 Jun 2017 15:51:56 +0100
Subject: [PATCH 6/8] Fix doc

---
 doc/source/developer.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/source/developer.rst b/doc/source/developer.rst
index 059b33484..7b3393020 100644
--- a/doc/source/developer.rst
+++ b/doc/source/developer.rst
@@ -21,7 +21,6 @@ API reference
    remoteappmanager.application
    remoteappmanager.command_line_config
    remoteappmanager.file_config
-   remoteappmanager.jinja2_adapters
    remoteappmanager.netutils
    remoteappmanager.traitlets
    remoteappmanager.user
@@ -46,4 +45,3 @@ API reference
    remoteappmanager.webapi.admin.container
    remoteappmanager.services.hub
    remoteappmanager.services.reverse_proxy
-

From 037e7ef4d8ac5d01edb55b040c2794025cd465d2 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Thu, 15 Jun 2017 11:34:37 +0100
Subject: [PATCH 7/8] Add default skin color back

---
 frontend/sharedDependencies.js       | 1 +
 remoteappmanager/templates/page.html | 2 +-
 webpackfile.js                       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/sharedDependencies.js b/frontend/sharedDependencies.js
index 553924ce4..ac537a62e 100644
--- a/frontend/sharedDependencies.js
+++ b/frontend/sharedDependencies.js
@@ -6,6 +6,7 @@ require('ionicons-css');
 require('admin-lte-css');
 require('skin-black-css');
 require('skin-red-css');
+require('skin-blue-css');
 
 // Load JS (Global jQuery so that it's accessible by bootstrap)
 window.jQuery = window.$ = require('jquery');
diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index 2f6cb4181..0602c603b 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -27,7 +27,7 @@
   {% end %}
 </head>
 
-<body class="hold-transition {% block skin %}{% end %} sidebar-mini">
+<body class="hold-transition {% block skin %}skin-blue{% end %} sidebar-mini">
 
   <noscript>
     <div id='noscript'>
diff --git a/webpackfile.js b/webpackfile.js
index 14d7f0f48..fa2124479 100644
--- a/webpackfile.js
+++ b/webpackfile.js
@@ -27,6 +27,7 @@ module.exports = {
       "admin-lte-css": "admin-lte/dist/css/AdminLTE.min",
       "skin-black-css": "admin-lte/dist/css/skins/skin-black.min",
       "skin-red-css": "admin-lte/dist/css/skins/skin-red.min",
+      "skin-blue-css": "admin-lte/dist/css/skins/skin-blue.min",
 
       // JS
       jquery: "admin-lte/plugins/jQuery/jquery-2.2.3.min",

From 57153cf230ec0b5b1e06aecd2f671b94e1f1df98 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Mon, 26 Jun 2017 12:29:34 +0000
Subject: [PATCH 8/8] Separate error page template from the main page template

---
 remoteappmanager/templates/error.html | 90 ++++++++++++++++++++++-----
 remoteappmanager/templates/page.html  | 76 +++++++++++-----------
 2 files changed, 112 insertions(+), 54 deletions(-)

diff --git a/remoteappmanager/templates/error.html b/remoteappmanager/templates/error.html
index 39b602f2c..4044c3ce9 100644
--- a/remoteappmanager/templates/error.html
+++ b/remoteappmanager/templates/error.html
@@ -1,16 +1,78 @@
-{% extends "page.html" %}
-
-{% block main %}
-
-<div class="error">
-  <h1>
-    {{status_code}} : {{status_message}}
-  </h1>
-  {% if message %}
-    <p>
-      {{message}}
-    </p>
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <title>{% block title %}RemoteApp Manager{% end %}</title>
+  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+
+  <link rel="stylesheet" href="{{ static_url("dist/sharedDependencies.css")}}">
+
+  <script type="text/javascript">
+    // This will always be executed and create the basic ga function that
+    // does nothing
+    window.ga = function () {
+      (window.ga.q = window.ga.q || []).push(arguments);
+    };
+    window.ga.l = 1 * new Date();
+    window.GoogleAnalyticsObject = "ga";
+  </script>
+  {% if analytics is not None %}
+    <script src='https://www.google-analytics.com/analytics.js' async type="text/javascript"></script>
   {% end %}
-</div>
+</head>
+
+<body class="fixed hold-transition skin-blue sidebar-mini">
+
+  <noscript>
+    <div id='noscript'>
+      Jupyter Hub requires JavaScript.<br>
+      Please enable it to proceed.
+    </div>
+  </noscript>
+
+  <div class="wrapper" id="app">
+
+    <!-- Main Header -->
+    <header class="main-header">
+      <a href="#" class="logo">
+        <!-- logo for regular state and mobile devices -->
+        <span class="logo-lg"><b>Simphony</b>Remote</span>
+      </a>
+    </header>
+
+    <aside class="main-sidebar">
+    </aside>
+
+    <div class="content-wrapper">
+      <!-- Main content -->
+      <div class="error">
+        <h1>
+          {{status_code}} : {{status_message}}
+        </h1>
+        {% if message %}
+          <p>
+            {{message}}
+          </p>
+        {% end %}
+      </div>
+    </div>
+  </div>
+
+  <div id="error-dialog-container"></div>
+
+  <script src="{{ static_url("dist/sharedDependencies.js") }}"></script>
+
+  <script type="text/javascript">
+    window.apidata = {
+      base_url: "{{ base_url }}",
+      {% if analytics is not None %}
+        analytics: {
+          tracking_id: "{{ analytics['tracking_id'] }}"
+        },
+      {% end %}
+    }
+  </script>
 
-{% end %}
+</body>
+</html>
diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index 6db5586b3..93b5a8836 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -53,43 +53,41 @@
           {% end %}
         </div>
 
-        {% if user is not None %}
-          <!-- Navbar Right Menu -->
-          <div class="navbar-custom-menu">
-            <ul class="nav navbar-nav">
-              <!-- User Account Menu -->
-              <li id="user-menu" class="dropdown user user-menu">
-                <!-- Menu Toggle Button -->
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                  <!-- The user image in the navbar-->
-                  <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="user-image" alt="User Image">
-                  <!-- hidden-xs hides the username on small devices so only the image appears. -->
-                  <span class="hidden-xs">{{ user.name }}</span>
-                </a>
-                <ul class="dropdown-menu">
-                  <!-- The user image in the menu -->
-                  <li class="user-header">
-                    <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="img-circle" alt="User Image">
-                    <p>
-                      {{ user.name }}
-                    </p>
-                  </li>
-                  <!-- Menu Body -->
-                  <li class="user-body">
-                  </li>
-                  <!-- Menu Footer-->
-                  <li class="user-footer">
-                    <div class="pull-right">
-                      {% block login_widget %}
-                      <a id="logout" href="{{ logout_url }}" class="btn btn-default btn-flat"><i class="fa fa-sign-out"> Sign out</i></a>
-                      {% end %}
-                    </div>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </div>
-        {% end %}
+        <!-- Navbar Right Menu -->
+        <div class="navbar-custom-menu">
+          <ul class="nav navbar-nav">
+            <!-- User Account Menu -->
+            <li id="user-menu" class="dropdown user user-menu">
+              <!-- Menu Toggle Button -->
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                <!-- The user image in the navbar-->
+                <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="user-image" alt="User Image">
+                <!-- hidden-xs hides the username on small devices so only the image appears. -->
+                <span class="hidden-xs">{{ user.name }}</span>
+              </a>
+              <ul class="dropdown-menu">
+                <!-- The user image in the menu -->
+                <li class="user-header">
+                  <img src="https://www.gravatar.com/avatar/{{ gravatar_id }}" class="img-circle" alt="User Image">
+                  <p>
+                    {{ user.name }}
+                  </p>
+                </li>
+                <!-- Menu Body -->
+                <li class="user-body">
+                </li>
+                <!-- Menu Footer-->
+                <li class="user-footer">
+                  <div class="pull-right">
+                    {% block login_widget %}
+                    <a id="logout" href="{{ logout_url }}" class="btn btn-default btn-flat"><i class="fa fa-sign-out"> Sign out</i></a>
+                    {% end %}
+                  </div>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </div>
       </nav>
     </header>
 
@@ -114,9 +112,7 @@
   <script type="text/javascript">
     window.apidata = {
       base_url: "{{ base_url }}",
-      {% if user is not None %}
-        user: "{{ user.name }}",
-      {% end %}
+      user: "{{ user.name }}",
       {% if analytics is not None %}
         analytics: {
           tracking_id: "{{ analytics['tracking_id'] }}"