diff --git a/envri-hub/deployments/envri-hub.yaml b/envri-hub/deployments/envri-hub.yaml index 68776e35beab3b572a64779d66ff712bb460f79b..bcb8653f77fc07b40e17e98ffaacfca798b90dc6 100644 --- a/envri-hub/deployments/envri-hub.yaml +++ b/envri-hub/deployments/envri-hub.yaml @@ -50,6 +50,7 @@ singleuser: kubespawner_override: args: - "--CondaKernelSpecManager.env_filter='/opt/conda$'" + - "--LabApp.custom_css=True" hub: db: @@ -103,12 +104,22 @@ hub: templatePaths: - /egi-notebooks-hub/templates extraFiles: - envri-logo: - mountPath: /usr/local/share/jupyterhub/static/images/envri-hub-next-color@4x.png - binaryData: {{ lookup('file', 'static/images/envri-hub-next-color@4x.png') | b64encode }} + envri-css: + mode: 0644 + mountPath: /home/jovyan/.jupyter/custom/custom.css + binaryData: {{ lookup('file', 'static/css/custom.css') | b64encode }} + envri-lab-logo: + mountPath: /home/jovyan/.jupyter/custom/logo/envri-ntb-logo.png + binaryData: {{ lookup('file', 'static/images/envri-ntb-logo.png') | b64encode }} + envri-hub-header-logo: + mountPath: /usr/local/share/jupyterhub/static/images/envri-hub-next-header-logo.png + binaryData: {{ lookup('file', 'static/images/envri-hub-next-header-logo.png') | b64encode }} + envri-hub-footer-logo: + mountPath: /usr/local/share/jupyterhub/static/images/envri-hub-next-footer-logo.png + binaryData: {{ lookup('file', 'static/images/envri-hub-next-footer-logo.png') | b64encode }} {% for f in "401.html", "egi-login.html", "page.html" %} {{ f }}: mountPath: /egi-notebooks-hub/templates/{{ f }} stringData: |- {{ lookup('file', ('envri-templates', f) | path_join) | indent(8) }} -{% endfor %} +{% endfor %} \ No newline at end of file diff --git a/envri-hub/deployments/envri-templates/egi-login.html b/envri-hub/deployments/envri-templates/egi-login.html index 82e47654657a75ca5626b4110e60c4e99a23e5a9..c92c4e60a20f40ef3745fcb70d17db1191c14f2f 100644 --- a/envri-hub/deployments/envri-templates/egi-login.html +++ b/envri-hub/deployments/envri-templates/egi-login.html @@ -18,7 +18,7 @@ <div id="login-main" class="container"> <div class="jumbotron"> {% block main_intro %} - <h1><img alt="Notebooks Logo" src="{{ static_url('images/egi-icon-notebooks.svg') }}" height="100">Notebooks</h1> + <h1>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 @@ -54,8 +54,8 @@ <img alt="EU logo" src="{{ static_url('images/eu-flag.png') }}" height="40"> </div> <div class="col-sm-1"> - <a href="https://www.egi.eu/projects/egi-ace/"> - <img alt="EGI-ACE logo" src="{{ static_url('images/egi-ace.png') }}" height="40"> + <a href="https://envri.eu/envri-hub-next/"> + <img alt="ENVRI-Hub logo" src="{{ static_url('images/envri-hub-next-footer-logo.png') }}" height="40"> </a> </div> <div class="col-sm-1"> @@ -64,8 +64,8 @@ </a> </div> <div class="col-sm-5"> - {{ service_name }} is a service provided by <a href="https://www.cesnet.cz/?lang=en">CESNET</a>, - co-funded by <a href="https://www.egi.eu/projects/egi-ace/">EGI-ACE</a>. + Service provided by <a href="https://www.cesnet.cz/?lang=en">CESNET</a>, + funded by <a href="https://envri.eu/envri-hub-next/">ENVRI-Hub NEXT</a>. </div> <div class="col-sm-4 text-right"> <a href="https://notebooks.egi.eu/policies/privacy-policy.html">Privacy Notice</a> | diff --git a/envri-hub/deployments/envri-templates/page.html b/envri-hub/deployments/envri-templates/page.html index e0f595fadc7678ac16b1b070d5a5a55589ff9010..be160cd2e059c77c8a5acd92acee4b440facc15e 100644 --- a/envri-hub/deployments/envri-templates/page.html +++ b/envri-hub/deployments/envri-templates/page.html @@ -81,6 +81,6 @@ body { {% block logo %} <span id="jupyterhub-logo" class="pull-left"> - <a href="https://envri.eu/envri-hub-next/"><img src="{{ static_url('images/envri-hub-next-color@4x.png') }}" alt="ENVRI-Hub NEXT {{ service_name }}" class="egi-logo" title="Home"></a> + <a href="https://envri.eu/envri-hub-next/"><img src="{{ static_url('images/envri-hub-next-header-logo.png') }}" alt="ENVRI-Hub NEXT {{ service_name }}" class="egi-logo" title="Home"></a> </span> {% endblock %} diff --git a/envri-hub/deployments/static/css/custom.css b/envri-hub/deployments/static/css/custom.css new file mode 100644 index 0000000000000000000000000000000000000000..c49a529f3c7dc922180a65c38630cc58f2cf36ba --- /dev/null +++ b/envri-hub/deployments/static/css/custom.css @@ -0,0 +1,7 @@ +#jp-MainLogo svg { + visibility: hidden !important; +} + +#jp-MainLogo { + background-image: url("./logo/envri-ntb-logo.png") !important; +} diff --git a/envri-hub/deployments/static/images/envri-hub-next-footer-logo.png b/envri-hub/deployments/static/images/envri-hub-next-footer-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c824b2751b0f4c029323f7eb37c6bfa9a4ff88e9 Binary files /dev/null and b/envri-hub/deployments/static/images/envri-hub-next-footer-logo.png differ diff --git a/envri-hub/deployments/static/images/envri-hub-next-color@4x.png b/envri-hub/deployments/static/images/envri-hub-next-header-logo.png similarity index 100% rename from envri-hub/deployments/static/images/envri-hub-next-color@4x.png rename to envri-hub/deployments/static/images/envri-hub-next-header-logo.png diff --git a/envri-hub/deployments/static/images/envri-ntb-logo.png b/envri-hub/deployments/static/images/envri-ntb-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..1d27895db844b3b2bf74b4fcd51738b980d2dbe2 Binary files /dev/null and b/envri-hub/deployments/static/images/envri-ntb-logo.png differ