From 83ad9f03316f6feac68acc70ee1de11177fd04b5 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Thu, 12 Sep 2024 15:18:08 +0100 Subject: [PATCH] Linting fixes --- ec-templates/401.html | 21 +- ec-templates/403.html | 20 +- ec-templates/egi-login.html | 8 +- ec-templates/home.html | 191 ++++++++------- ec-templates/logout.html | 10 +- ec-templates/page.html | 395 +++++++++++++++++++++++++------- ec-templates/spawn.html | 87 ++++--- ec-templates/spawn_pending.html | 163 ++++++------- ec-templates/token.html | 392 +++++++++++++++++-------------- 9 files changed, 802 insertions(+), 485 deletions(-) diff --git a/ec-templates/401.html b/ec-templates/401.html index 069039d..5be7ff6 100644 --- a/ec-templates/401.html +++ b/ec-templates/401.html @@ -1,6 +1,6 @@ -{% extends "error.html" %} {% block main %} - +{% extends "error.html" %} +{% block main %}

Unauthorized!

@@ -17,12 +17,17 @@

Unauthorized!

See - - Documentation related to EGI Notebooks about granting access. You can also - place an - order in EOSC portal - for the Notebooks service if you are interested in your own community deployment. + + Documentation related to EGI Notebooks + about granting access. You can also + place an order in EOSC portal + for the Notebooks service if you are interested in your own community + deployment.

- {% endblock %} diff --git a/ec-templates/403.html b/ec-templates/403.html index 069039d..0bb3c36 100644 --- a/ec-templates/403.html +++ b/ec-templates/403.html @@ -1,6 +1,7 @@ -{% extends "error.html" %} {% block main %} +{% extends "error.html" %} +{% block main %}

Unauthorized!

@@ -17,12 +18,17 @@

Unauthorized!

See - - Documentation related to EGI Notebooks about granting access. You can also - place an - order in EOSC portal - for the Notebooks service if you are interested in your own community deployment. + + Documentation related to EGI Notebooks + about granting access. You can also + place an order in EOSC portal + for the Notebooks service if you are interested in your own community + deployment.

- {% endblock %} diff --git a/ec-templates/egi-login.html b/ec-templates/egi-login.html index 4ffb997..c4be3d5 100644 --- a/ec-templates/egi-login.html +++ b/ec-templates/egi-login.html @@ -1,6 +1,8 @@ - -{% extends "page.html" %} {% if announcement_login %} {% set announcement = -announcement_login %} {% endif %} + +{% extends "page.html" %} +{% if announcement_login %} + {% set announcement = announcement_login %} +{% endif %} {% block main %}
diff --git a/ec-templates/home.html b/ec-templates/home.html index b006884..f324afd 100644 --- a/ec-templates/home.html +++ b/ec-templates/home.html @@ -1,95 +1,112 @@ + {% extends "page.html" %} {% if announcement_home is string %} {% set announcement = announcement_home %} {% endif %} + {% block main %} -
-

JupyterHub home page

-
-
- {% if default_server.active %} - Stop My Server{% endif %} - - {% if not default_server.active %}Start{% endif %} - My Server - -
+
+

JupyterHub home page

+
+
+ {% if default_server.active %} + Stop My Server{% endif %} + + {% if not default_server.active %}Start{% endif %} My Server +
- {% if allow_named_servers %} -

Named Servers

-

- In addition to your default server, - you may have additional - {% if named_server_limit_per_user > 0 %}{{ named_server_limit_per_user }}{% endif %} - server(s) with names. - This allows you to have more than one server running at the same time. -

- {% set named_spawners = user.all_spawners(include_default=False)|list %} - - - - - - - - - - - - - - {% for spawner in named_spawners %} - - {# name #} - - {# url #} - - {# activity #} - - {# actions #} - - - {% endfor %} - -
Server nameURLLast activityActions
-
- - -
-
{{ spawner.name }} - {{ user.server_url(spawner.name) }} - - {% if spawner.last_activity %} - {{ spawner.last_activity.isoformat() + 'Z' }} - {% else %} - Never - {% endif %} - - stop - start - -
- {% endif %}
-{% endblock main %} -{% block script %} - {{ super() }} - + {% if allow_named_servers %} +

Named Servers

+

+ In addition to your default server, you may have additional + {% if named_server_limit_per_user > 0 %}{{ named_server_limit_per_user }}{% endif %} + server(s) with names. This allows you to have more than one server + running at the same time. +

+ {% set named_spawners = user.all_spawners(include_default=False)|list %} + + + + + + + + + + + + + + {% for spawner in named_spawners %} + + {# name #} + + {# url #} + + {# activity #} + + {# actions #} + + + {% endfor %} + +
Server nameURLLast activityActions
+
+ + +
+
{{ spawner.name }} + {{ user.server_url(spawner.name) }} + + {% if spawner.last_activity %} {{ spawner.last_activity.isoformat() + 'Z' }} {% else %} Never {% endif %} + + stop + start + +
+ {% endif %} +
+{% endblock main %} {% block script %} {{ super() }} + {% endblock script %} diff --git a/ec-templates/logout.html b/ec-templates/logout.html index 8f7b578..895bc1a 100644 --- a/ec-templates/logout.html +++ b/ec-templates/logout.html @@ -1,20 +1,14 @@ {% extends "page.html" %} - {% block meta %} - + {% endblock %} - {% if announcement_logout %} {% set announcement = announcement_logout %} {% endif %} {% block main %} -
-

- Successfully logged out. -

+

Successfully logged out.

- {% endblock %} diff --git a/ec-templates/page.html b/ec-templates/page.html index ed6be04..a2266c8 100644 --- a/ec-templates/page.html +++ b/ec-templates/page.html @@ -1,11 +1,9 @@ - -{% extends "templates/page.html" %} -{% set service_name = service_name|default('Notebooks') %} + +{% extends "templates/page.html" %} +{% set service_name = service_name|default('Notebooks') %} {% block stylesheet %} - {{ super() }} - - + + {% endblock script %} -{% block title %}European Open Science Cloud - EU Node Interactive Notebooks{% endblock %} +{% block title %}European Open Science Cloud - EU Node Interactive Notebooks{% endblock title %} {% block nav_bar %} -
+
-
+
+ - European Commission + + European Commission -
- {% if user %} -
@@ -86,30 +136,121 @@
- European Open Science Cloud - EU Node Interactive Notebooks -
+ European Open Science Cloud - EU Node Interactive Notebooks +
-
-
+
+ - + European Commission + alt="European Commission" + /> -
+ +
-
+
-
+
- {% endblock footer %} diff --git a/ec-templates/spawn.html b/ec-templates/spawn.html index 7a3733d..e067ed5 100644 --- a/ec-templates/spawn.html +++ b/ec-templates/spawn.html @@ -1,47 +1,60 @@ -{% extends "page.html" %} + +{% extends "page.html" %} {% if announcement_spawn is string %} {% set announcement = announcement_spawn %} {% endif %} + {% block main %} -
- {% block heading %} -
-

Server Options

-
- {% endblock heading %} -
-
- {% if for_user and user.name != for_user.name -%} -

Spawning server for {{ for_user.name }}

- {% endif -%} - {% if error_message -%}

Error: {{ error_message }}

{% endif %} -
- {{ spawner_options_form | safe }} -
-
{% endblock main %} + {% block script %} - {{ super() }} - +{{ super() }} + {% endblock script %} diff --git a/ec-templates/spawn_pending.html b/ec-templates/spawn_pending.html index 8c13421..7f58058 100644 --- a/ec-templates/spawn_pending.html +++ b/ec-templates/spawn_pending.html @@ -1,95 +1,98 @@ + {% extends "page.html" %} + {% block main %} -
-
-
- {% block message %} -

Your server is starting up.

-

You will be redirected automatically when it's ready for you.

- {% endblock message %} -
-
- 0% Complete -
+
+
+
+ {% block message %} +

Your server is starting up.

+

You will be redirected automatically when it's ready for you.

+ {% endblock message %} +
+
+ 0% Complete
-

+

-
-
-
- Event log -
-
-
+
+
+
+
+ Event log +
+
+
{% endblock main %} + {% block script %} - {{ super() }} - + // signal that page has finished loading (mostly for tests) + window._jupyterhub_page_loaded = true; + }); + {% endblock script %} diff --git a/ec-templates/token.html b/ec-templates/token.html index 89b2dc7..add445a 100644 --- a/ec-templates/token.html +++ b/ec-templates/token.html @@ -1,188 +1,234 @@ + {% extends "page.html" %} -{% block main %} -
-

Manage JupyterHub Tokens

-
-
-
- - -
- This note will help you keep track of what your tokens are for.
-
- -
You can configure when your token will expire.
-
+{% block main %} +
+

Manage JupyterHub Tokens

+
+ +
+ + +
+ This note will help you keep track of what your tokens are for. +
+
+ +
+ You can configure when your token will expire. +
+
{% block expiration_options %} - + {% endblock expiration_options %} -
-
-
- - -
- You can limit the permissions of the token so it can only do what you want it to. - If none are specified, the token will have permission to do everything you can do. - See the JupyterHub documentation for a list of available scopes.
- -
-
- -
- -
-
- - {% if api_tokens %} -
-
-

API Tokens

-

- These are tokens with access to the JupyterHub API. - Permissions for each token may be viewed via the JupyterHub tokens API. - Revoking the API token for a running server will require restarting that server. +

+ +
+ +
+
+
+ {% if api_tokens %} +
+
+

API Tokens

+

+ These are tokens with access to the JupyterHub API. Permissions for each + token may be viewed via the JupyterHub tokens API. Revoking the API + token for a running server will require restarting that server. +

+ + + + + + + + + + + + {% for token in api_tokens %} + + {% block token_row scoped %} + + + + + + + {% endblock token_row %} + + {% endfor %} + +
NotePermissionsLast usedCreatedExpires
{{ token.note }} +
+ scopes + {% for scope in token.scopes %} + 
{{ scope }}
+ {% endfor %} +
+ 		+ {%- if token.last_activity -%} {{ token.last_activity.isoformat() + + 'Z' }} {%- else -%} Never {%- endif -%} + + {%- if token.created -%} {{ token.created.isoformat() + 'Z' }} {%- + else -%} N/A {%- endif -%} + + {%- if token.expires_at -%} {{ token.expires_at.isoformat() + 'Z' + }} {%- else -%} Never {%- endif -%} + + +
+
+
+ {% endif %} {% if oauth_clients %} +
+

Authorized Applications

+

+ These are applications that use OAuth with JupyterHub to identify users + (mostly notebook servers). OAuth tokens can generally only be used to + identify you, not take actions on your behalf. +

+ + + + + + + + + + + {% for client in oauth_clients %} + + {% block client_row scoped %} + + + + + + {% endblock client_row %} + + {% endfor %} + +
ApplicationPermissionsLast usedFirst authorized
{{ client['description'] }} +
+ scopes + {# create set of scopes on all tokens -#} {# sum concatenates all + token.scopes into a single list -#} {# then filter to unique set + and sort -#} {% for scope in client.tokens | + sum(attribute="scopes", start=[]) | unique | sort %} + 
{{ scope }}
+ {% endfor %} +
+ 		+ {%- if client['last_activity'] -%} {{ + client['last_activity'].isoformat() + 'Z' }} {%- else -%} Never {%- + endif -%} + + {%- if client['created'] -%} {{ client['created'].isoformat() + 'Z' + }} {%- else -%} N/A {%- endif -%} + + +
+
+ {% endif %} +
{% endblock main %} + {% block script %} - {{ super() }} - +{{ super() }} + {% endblock script %}