diff --git a/ec-templates/error.html b/ec-templates/error.html new file mode 100644 index 0000000..789b9e0 --- /dev/null +++ b/ec-templates/error.html @@ -0,0 +1,45 @@ + +{% extends "page.html" %} +{% block login_widget %} +{% endblock login_widget %} +{% block main %} +
+ {% block h1_error %} +

{{ status_code }} : {{ status_message }}

+ {% endblock h1_error %} + {% block error_detail %} + {% if message %}

{{ message }}

{% endif %} + {% if message_html %}

{{ message_html | safe }}

{% endif %} + {% if extra_error_html %}

{{ extra_error_html | safe }}

{% endif %} + {% endblock error_detail %} +
+{% endblock main %} +{% block script %} + {{ super() }} + +{% endblock script %} diff --git a/ec-templates/home.html b/ec-templates/home.html index c083c33..3344c5e 100644 --- a/ec-templates/home.html +++ b/ec-templates/home.html @@ -10,9 +10,10 @@

JupyterHub home page

{% if default_server.active %} - Stop My Server{% endif %} + > + {% endif %} Named Servers @@ -80,20 +81,20 @@

Named Servers

stop start
-{% endblock main %} {% block script %} {{ super() }} +{% endblock main %} + +{% block script %} +{{ super() }} -{% endblock script %} +{% endblock %} diff --git a/ec-templates/logout.html b/ec-templates/logout.html index 895bc1a..7e4f962 100644 --- a/ec-templates/logout.html +++ b/ec-templates/logout.html @@ -8,7 +8,7 @@ {% endif %} {% block main %} -
+

Successfully logged out.

{% endblock %} diff --git a/ec-templates/not_running.html b/ec-templates/not_running.html new file mode 100644 index 0000000..8a06b67 --- /dev/null +++ b/ec-templates/not_running.html @@ -0,0 +1,78 @@ + +{% extends "page.html" %} +{% block main %} +
+
+
+ {% block heading %} +

+ {% if failed %} + Spawn failed + {% else %} + Server not running + {% endif %} +

+ {% endblock heading %} + {% block message %} +

+ {% if failed %} + The latest attempt to start your server {{ server_name }} has failed. + {% if failed_html_message %} +

+

{{ failed_html_message | safe }}

+

{% elif failed_message %}

+

{{ failed_message }}

+

+ {% endif %} + Would you like to retry starting it? + {% else %} + Your server {{ server_name }} is not running. + {% if implicit_spawn_seconds %} + It will be restarted automatically. + If you are not redirected in a few seconds, + click below to launch your server. + {% else %} + Would you like to start it? + {% endif %} + {% endif %} +

+ {% endblock message %} + {% block start_button %} + + {% if failed %} + Relaunch + {% else %} + Launch + {% endif %} + Server {{ server_name }} + + {% endblock start_button %} +
+
+
+{% endblock main %} +{% block script %} + {{ super () }} + {% if implicit_spawn_seconds %} + + {% endif %} + +{% endblock script %} diff --git a/ec-templates/oauth.html b/ec-templates/oauth.html new file mode 100644 index 0000000..881ae6a --- /dev/null +++ b/ec-templates/oauth.html @@ -0,0 +1,54 @@ + +{% extends "page.html" %} +{% block login_widget %} +{% endblock login_widget %} +{% block main %} +
+
+
+

Authorize access

+

An application is requesting authorization to access data associated with your JupyterHub account

+

+ {{ oauth_client.description }} (oauth URL: {{ oauth_client.redirect_uri }}) + would like permission to identify you. + {% if scope_descriptions | length == 1 and not scope_descriptions[0].scope %} + It will not be able to take actions on + your behalf. + {% endif %} +

+
+
+
+

This will grant the application permission to:

+
+
+ + {# these are the 'real' inputs to the form -#} + {% for scope in allowed_scopes %}{% endfor %} + {% for scope_info in scope_descriptions %} +
+ +
+ {% endfor %} +
+
+ +
+
+
+
+
+
+{% endblock main % diff --git a/ec-templates/page.html b/ec-templates/page.html index 90bc452..9494a71 100644 --- a/ec-templates/page.html +++ b/ec-templates/page.html @@ -4,6 +4,14 @@ {% block stylesheet %} {{ super() }} + + + + {% endblock stylesheet %} + {% block script %} {{ super() }} @@ -250,7 +259,7 @@ > {% endif %} - {% endif %} + {% endif %}
@@ -258,6 +267,49 @@ {% endblock nav_bar %} +{% block announcement %} +{% if announcement %} + +{% endblock announcement %} + {% block footer %}
{% endblock heading %}
-
+
{% if for_user and user.name != for_user.name -%}

Spawning server for {{ for_user.name }}

{% endif -%} {% if error_message -%} diff --git a/ec-templates/stop_pending.html b/ec-templates/stop_pending.html new file mode 100644 index 0000000..82a6160 --- /dev/null +++ b/ec-templates/stop_pending.html @@ -0,0 +1,31 @@ + +{% extends "page.html" %} +{% block main %} +
+
+
+ {% block message %} +

Your server is stopping.

+

You will be able to start it again once it has finished stopping.

+ {% endblock message %} +

+ +

+ refresh +
+
+
+{% endblock main %} +{% block script %} + {{ super() }} + +{% endblock script %} diff --git a/ec-templates/token.html b/ec-templates/token.html index add445a..c9b739c 100644 --- a/ec-templates/token.html +++ b/ec-templates/token.html @@ -4,108 +4,86 @@ {% block main %}

Manage JupyterHub Tokens

-
-
-
- +
+ +
+ +
+
+ -
+ This note will help you keep track of what your tokens are for. -
- -
- -
+ +

+ + {% block expiration_options %} + + {% endblock expiration_options %} + 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. -
- -
-
- +
-
-