Skip to content
Snippets Groups Projects
Commit be8cd3b6 authored by Tim Kreuzer's avatar Tim Kreuzer
Browse files

Merge branch 'staging' into 'production' 

remove Jupyter-JSC texts from website

See merge request !2
parents e2363c98 3fd9117a
Branches
Tags
1 merge request!2remove Jupyter-JSC texts from website
Show whitespace changes
Inline Side-by-side
templates/footer.html
+ 1
− 1
View file @ be8cd3b6
{%- import "macros/svgs.jinja" as svg -%} {%- import "macros/svgs.jinja" as svg -%}
{%- set jupyter_name = "Jupyter-JSC" -%} {%- set jupyter_name = "Jupyter4NFDI" -%}
{#- Get all systems configured for this hub, {#- Get all systems configured for this hub,
sort them by weight and assign status ids -#} sort them by weight and assign status ids -#}
......
templates/login.html
+ 3
− 10
View file @ be8cd3b6
...@@ -57,28 +57,21 @@ ...@@ -57,28 +57,21 @@
<button type="button" data-bs-target="#login-carousel" data-bs-slide-to="3" aria-label="Slide 4"></button> <button type="button" data-bs-target="#login-carousel" data-bs-slide-to="3" aria-label="Slide 4"></button>
</div> </div>
<div class="carousel-inner"> <div class="carousel-inner">
{{ carousel_item("Jupyter", "https://jupyter.org", "Supercomputing in Your Browser",
"Jupyter-JSC is designed to provide the rich high performance computing (HPC) ecosystem
to the world's most popular software: web browsers. JupyterLab is a web-based interactive
development environment for Jupyter notebooks, code, and data. JupyterLab is flexible
to support a wide range of workflows in data science, scientific computing, and machine learning.",
"active") }}
{{ carousel_item("Jupyter Notebooks", "https://jupyter-notebook.readthedocs.io/en/stable/notebook.html", {{ carousel_item("Jupyter Notebooks", "https://jupyter-notebook.readthedocs.io/en/stable/notebook.html",
"Share your Workflows", "Jupyter-JSC allows you to create and share documents that contain "Share your Workflows", "Jupyter4NFDI allows you to create and share documents that contain
live code, equations, visualizations and explanatory text. Uses include: data cleaning and transformation, live code, equations, visualizations and explanatory text. Uses include: data cleaning and transformation,
numerical simulation, statistical modeling, machine learning and much more.") numerical simulation, statistical modeling, machine learning and much more.")
}} }}
{{ carousel_item("JupyterLab", "https://jupyterlab.readthedocs.io", "Next-Generation Notebook Interface", {{ carousel_item("JupyterLab", "https://jupyterlab.readthedocs.io", "Next-Generation Notebook Interface",
"Jupyter-JSC gives access to JupyterLab, a web-based interactive development environment for Jupyter "Jupyter4NFDI gives access to JupyterLab, a web-based interactive development environment for Jupyter
notebooks, code, and data. JupyterLab is flexible: configure and arrange the user interface to support a notebooks, code, and data. JupyterLab is flexible: configure and arrange the user interface to support a
wide range of workflows in data science, scientific computing, and machine learning. JupyterLab is extensible wide range of workflows in data science, scientific computing, and machine learning. JupyterLab is extensible
and modular: write plugins that add new components and integrate with existing ones.") and modular: write plugins that add new components and integrate with existing ones.")
}} }}
{{ carousel_item("JupyterHub", "https://jupyterhub.readthedocs.io", "Serving Jupyter Notebooks for Multiple {{ carousel_item("JupyterHub", "https://jupyterhub.readthedocs.io", "Serving Jupyter Notebooks for Multiple
Users", "Jupyter-JSC is a JupyterHub to serve Jupyter notebooks for multiple users. It can be used in Users", "Jupyter4NFDI is a JupyterHub to serve Jupyter notebooks for multiple users. It can be used in
classes of students, a corporate data science group or scientific research group. It is a multi-user hub classes of students, a corporate data science group or scientific research group. It is a multi-user hub
that spawns, manages, and proxies multiple instances of the single-user Jupyter notebook server.") }} that spawns, manages, and proxies multiple instances of the single-user Jupyter notebook server.") }}
</div> </div>
......
templates/page.html 0 → 100644
+ 135
− 0
View file @ be8cd3b6
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
{% block meta -%}
{%- endblock -%}
<title>{% block title %}Jupyter4NFDI{% endblock %}</title>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<meta property="og:image" content='{{ static_url("images/mini_website.jpg", include_version=True) }}'>
<meta property="og:locale" content="en_US">
<meta property="og:site_name" content="jupyter-jsc">
<meta property="og:title" content="jupyter-jsc">
<meta property="og:type" content="website">
<meta property="og:url" content="https://{{hostname}}{{ base_url|default('', true) }}">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
{% block favicon -%}
<link rel="icon" href='{{static_url("images/favicon.svg", include_version=True)}}' type="jpg/png" />
{%- endblock %}
<link rel="stylesheet" href='{{static_url("components/bootstrap-5.0/dist/css/bootstrap.min.css")}}' type="text/css" />
<link rel="stylesheet" href='{{static_url("components/font-awesome-4.7.0/css/font-awesome.min.css")}}' type="text/css" />
<link rel="stylesheet" href='{{static_url("css/base.css")}}' type="text/css" />
<link rel="stylesheet" href='{{static_url("css/header.css")}}' type="text/css" />
<link rel="stylesheet" href='{{static_url("css/footer.css")}}' type="text/css" />
<link rel="stylesheet" href='{{static_url("components/jquery-confirm/jquery-confirm.min.css")}}' />
{% block stylesheet -%}
{%- endblock %}
<script src='{{static_url("components/jquery/dist/jquery.min.js")}}' type="text/javascript" charset="utf-8"></script>
<script src='{{static_url("components/bootstrap-5.0/dist/js/bootstrap.bundle.min.js")}}' type="text/javascript" charset="utf-8"></script>
<script src='{{static_url("components/requirejs/require.js")}}' type="text/javascript" charset="utf-8"></script>
<script src='{{static_url("components/jquery/dist/jquery.min.js")}}'></script>
<script src='{{static_url("components/jquery-confirm/jquery-confirm.min.js")}}'></script>
{% block scripts -%}
{%- endblock %}
<script>
var evtSourcesGlobal = {};
require.config({
{%- if version_hash -%}
urlArgs: "v={{version_hash}}",
{%- endif -%}
baseUrl: '{{static_url("js", include_version=True)}}',
paths: {
components: '../components',
jquery: '../components/jquery/dist/jquery.min',
bootstrap: '../components/bootstrap-5.0/dist/js/bootstrap.min',
moment: "../components/moment/moment",
},
shim: {
bootstrap: {
deps: ["jquery"],
exports: "bootstrap"
},
}
});
</script>
<script type="text/javascript">
window.jhdata = {
base_url: "{{ base_url }}",
prefix: "{{prefix}}",
{%- if user %}
user: "{{user.json_escaped_name}}",
{%- endif -%}
{%- if user and user.active %}
user_active: true,
{%- else %}
user_active: false,
{%- endif -%}
{%- if admin_access %}
admin_access: true,
{%- else %}
admin_access: false,
{%- endif -%}
{%- if not no_spawner_check and user and user.spawner.options_form %}
options_form: true,
{%- else %}
options_form: false,
{%- endif %}
{%- if cancel_url %}
cancel_url: "{{ cancel_url }}",
{%- endif %}
xsrf_token: "{{ xsrf_token }}",
}
</script>
</head>
<body>
<noscript>
<div id='noscript'>
JupyterHub requires JavaScript.<br>
Please enable it to proceed.
</div>
</noscript>
<div class="d-flex flex-column h-100">
{#- HEADER -#}
{% include "header.html" %}
{#- MAIN #}
<main>
{% block main %}
{% endblock %}
</main>
{#- FOOTER #}
{% include "footer.html" %}
</div>
{#- SCRIPTS #}
<script src='{{static_url("js/logout.js", include_version=True) }}' type="text/javascript" charset="utf-8"></script>
<script type="text/javascript">
// Enable tooltips everywhere
function enableTooltips() {
var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
return new bootstrap.Tooltip(tooltipTriggerEl);
})
}
$( function() { enableTooltips() });
</script>
{% block script -%}
{%- endblock %}
<script>
window.onbeforeunload = function() {
if (typeof evtSourcesGlobal !== 'undefined') {
for (const [key, value] of Object.entries(evtSourcesGlobal)) {
value.close();
}
}
}
</script>
</body>
</html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment