From c569178f6a63bb32083ac5658a8e8993f3456122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 16 Jul 2024 22:53:58 +0000
Subject: [PATCH] Remove html templating
---
cesnet-central/deployments/fullhub.yaml | 28 +++++--------------------
testing/deployments/hub.yaml | 28 +++++--------------------
2 files changed, 10 insertions(+), 46 deletions(-)
diff --git a/cesnet-central/deployments/fullhub.yaml b/cesnet-central/deployments/fullhub.yaml
index decfbd2..e06dd77 100644
--- a/cesnet-central/deployments/fullhub.yaml
+++ b/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 %}
diff --git a/testing/deployments/hub.yaml b/testing/deployments/hub.yaml
index e98a42f..00cc6dd 100644
--- a/testing/deployments/hub.yaml
+++ b/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 %}
--
GitLab