Remove html templating

cesnet-central/deployments/fullhub.yaml

@@ -146,7 +146,7 @@ hub:
       c.JupyterHub.default_url = "/welcome"
       c.JupyterHub.extra_handlers = [(r'/welcome', WelcomeHandler)]
     egi-notebooks-b2drop: |-
-{% raw %}
+{%- raw %}
       import base64
       import json
       from jinja2 import BaseLoader
@@ -414,28 +414,10 @@ hub:
         </div>
         """
 {% endraw %}
-  templatePaths:
-    - /egi-notebooks-hub/templates
   extraFiles:
-    login.html:
-      mountPath: /egi-notebooks-hub/templates/login.html
+    welcome.html:
+      mountPath: /usr/local/share/jupyterhub/templates/welcome.html
       stringData: |-
-{% raw %}
-        {% extends "egi-login.html" %}
-        {% block main_intro %}
-        <h1><img alt="Notebooks Logo" src="{{ static_url('images/egi-icon-notebooks.svg') }}"
-             height="100">Notebooks</h1>
-        <p>
-        Notebooks is an environment based on <a href="http://jupyter.org/">Jupyter</a> and
-        the <a href="https://www.egi.eu/services/cloud-compute/">EGI cloud service</a> that
-        offers a browser-based, scalable tool for interactive data analysis. The Notebooks
-        environment provides users with notebooks where they can combine text, mathematics,
-        computations and rich media output.
-        </p>
-        <p>
-        Access requires a valid <a href="https://docs.egi.eu/users/check-in/signup">EGI account</a>
-        and <a href="https://docs.egi.eu/users/dev-env/notebooks/#notebooks-for-researchers">
-        enrolling to one of the supported VOs</a>.
-        </p>
-        {% endblock main_intro %}
+{%- raw %}
+        {% extends "login.html" %}
 {% endraw %}

testing/deployments/hub.yaml

@@ -163,7 +163,7 @@ hub:
       c.JupyterHub.default_url = "/welcome"
       c.JupyterHub.extra_handlers = [(r'/welcome', WelcomeHandler)]
     egi-notebooks-b2drop: |-
-{% raw %}
+{%- raw %}
       import base64
       import json
       from jinja2 import BaseLoader
@@ -431,28 +431,10 @@ hub:
         </div>
         """
 {% endraw %}
-  templatePaths:
-    - /egi-notebooks-hub/templates
   extraFiles:
-    login.html:
-      mountPath: /egi-notebooks-hub/templates/login.html
+    welcome.html:
+      mountPath: /usr/local/share/jupyterhub/templates/welcome.html
       stringData: |-
-{% raw %}
-        {% extends "egi-login.html" %}
-        {% block main_intro %}
-        <h1><img alt="Notebooks Logo" src="{{ static_url('images/egi-icon-notebooks.svg') }}"
-             height="100">Notebooks</h1>
-        <p>
-        Notebooks is an environment based on <a href="http://jupyter.org/">Jupyter</a> and
-        the <a href="https://www.egi.eu/services/cloud-compute/">EGI cloud service</a> that
-        offers a browser-based, scalable tool for interactive data analysis. The Notebooks
-        environment provides users with notebooks where they can combine text, mathematics,
-        computations and rich media output.
-        </p>
-        <p>
-        Access requires a valid <a href="https://docs.egi.eu/users/check-in/signup">EGI account</a>
-        and <a href="https://docs.egi.eu/users/dev-env/notebooks/#notebooks-for-researchers">
-        enrolling to one of the supported VOs</a>.
-        </p>
-        {% endblock main_intro %}
+{%- raw %}
+        {% extends "login.html" %}
 {% endraw %}