diff --git a/.gitignore b/.gitignore index 480d253894128be0fc9ae6b5026260d102e0ff95..b4e83454dfbc77b754c463799ceb8de77388e966 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ cilogon_idp_selector.txt style.min.css -style.min.css.map \ No newline at end of file +style.min.css.map +.DS_Store \ No newline at end of file diff --git a/images/select_idp_cilogon.png b/images/select_idp_cilogon.png new file mode 100644 index 0000000000000000000000000000000000000000..f429f50ea8a4a8cc4f46f15294b35452f02c7b85 Binary files /dev/null and b/images/select_idp_cilogon.png differ diff --git a/login.html b/login.html index 60935777b53a4fc1bafc5dd17d1e5f91edcc596e..6c6cfe0ecd07560f86b819675b555d477993e552 100644 --- a/login.html +++ b/login.html @@ -4,23 +4,33 @@ {% set announcement = 'We are testing customized style / The server works the same way as before' %} {% set csusb_hub_title = 'Welcome to Cal State San Bernardino JupyterHub' %} -{% set csusb_cilogon = 'The following login process (the orange button) uses CSUSB\'s DUO login system' %} +{% set csusb_cilogon = 'The login process (the orange button) uses CSUSB\'s DUO system' %} {% block login %} -<div class="container text-center csusb"> +<div class="container text-center"> <h2>{{ csusb_hub_title }}</h2> <h5> <p>{{ csusb_cilogon | safe }}</p> - <p>Visit <a href="https://www.csusb.edu/high-performance-computing" target="_blank">CSUSB High Performance Computing Initiative</a> for more information about CSUSB HPCI - </p> + {# <p>Visit <a href="https://www.csusb.edu/high-performance-computing" target="_blank">CSUSB High Performance Computing Initiative</a> for more information about CSUSB HPCI + </p> #} </h5> </div> +<p>   </p> +<p>   </p> +<p>   </p> {{ super() }} +<p>   </p> <div id="login-cilogon-info" class="service-login"> - <h5> - <p>Be sure to choose <ins>California State University San Bernardino</ins> on the next page instead of <del>ORCID</del> (or something else)</p> + <h5> + <p>Be sure to choose <ins>California State University San Bernardino</ins> on the next page instead of <del>ORCID</del> </h5> </div> +<div class="container text-center"> +<details> + <summary>Click here for more details</summary> + <img id="idp_selector_info" style="width: 70%" src="{{ static_url("select_idp_cilogon.png") }}" alt="CILogon-CSUSB-Select"> +</details> +</div> {% endblock %} {% block stylesheet %} @@ -38,5 +48,13 @@ padding-left: 0%; width: 380px; } +#idp_selector_info { + max-width:100%; + height:auto; + max-height:100%; +} +p.extra-space { + line-height: 0.7; +} </style> {% endblock %} \ No newline at end of file diff --git a/page.html b/page.html new file mode 100644 index 0000000000000000000000000000000000000000..aa2509d9e34f0e2cd2608bf9003157c835183115 --- /dev/null +++ b/page.html @@ -0,0 +1,25 @@ +{% extends "templates/page.html" %} + +{% block stylesheet %} +{{ super() }} +<style> +.footer-bottom { + position: auto; + bottom: 0px; + text-align: center; + width: 100%; + z-index: -1; +} +</style> +{% endblock %} + +{% block footer %} +<p>   <br>   </p> +<p>   <br>   </p> +<div class="footer-bottom"> + <hr style="width:35%; margin-bottom: 5px;"> + <p style="font-size: 80%">This JupyterHub is provided by the <a href="https://www.csusb.edu/high-performance-computing" target="_blank">High Performance Computing Initiative </a><br/> + at California State Univeristy San Bernardino + </p></div> +{% endblock %} + diff --git a/spawn_pending.html b/spawn_pending.html index 8af368bca6ee88f994b820dbf483906ef2029ce0..4abf7a0799c18fb3a3c2ab10e6fb5e5e71d5cd71 100644 --- a/spawn_pending.html +++ b/spawn_pending.html @@ -1,13 +1,8 @@ {% extends "templates/spawn_pending.html" %} - {% block message %} -{{ super() }} -<p>This step may take several minutes.</p> -<p>Most of the time, the issue or delay is related to the server (upgrading or temporary maintanance).</p> -<p>For errors lasting for an extended period of time, please contact one of the <a href="https://www.csusb.edu/high-performance-computing#team" target="_blank">CSUSB HPCI team members</a>.</p> -<br> -{% for scope in allowed_scopes %} - {{ scope }} -{% endfor %} -<br> -{% endblock %} +{# {{ super() }} #} +<p>Your server is starting up and it may take several minutes</p> +<p>Most issues are related to the server upgrade or temporary maintanance</p> +<p>If it does not start for an extended period of time, <br> please contact one of the <a href="https://www.csusb.edu/high-performance-computing#team" target="_blank">CSUSB HPCI team members</a></p> +<p>   <br>   </p> +{% endblock %} \ No newline at end of file