diff --git a/static/css/egi.css b/static/css/egi.css new file mode 100644 index 0000000..6c7be4c --- /dev/null +++ b/static/css/egi.css @@ -0,0 +1,40 @@ +/* + * Some style for the footer + */ + +html { + position: relative; + min-height: 100%; +} + +body { + margin-bottom: 60px; /* Margin bottom by footer height */ + font-family: "DM Sans", sans-serif; +} + +.footer { + z-index: 10; + position: fixed; + bottom: 0; + width: 100%; + height: 40px; + line-height: 20px; + opacity: 0.8; + font-size: 0.85rem; +} + +.footer img { + height: 30px; + margin-right: 20px; +} + +#jupyterhub-logo .jpy-logo { + height: 60px; + margin-top: 5px; + margin-right: 20px; +} + +/* this is mainly for the policy pages */ +address { + white-space: pre-line; +} diff --git a/static/images/full-notebooks.png b/static/images/full-notebooks.png new file mode 100644 index 0000000..1958c2f Binary files /dev/null and b/static/images/full-notebooks.png differ diff --git a/templates/401.html b/templates/401.html index 069039d..cabd883 100644 --- a/templates/401.html +++ b/templates/401.html @@ -17,12 +17,8 @@

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.

- {% endblock %} diff --git a/templates/egi-login.html b/templates/egi-login.html index 294d61a..97383c1 100644 --- a/templates/egi-login.html +++ b/templates/egi-login.html @@ -4,84 +4,96 @@ {% set announcement = announcement_login %} {% endif %} +{% block stylesheet %} + +{{ super() }} + +{% endblock stylesheet %} + {% block nav_bar_right_items %} -
  • - - - User Guide - -
    • {% endblock %} {% block main %} -{% block login %} -
    -
    - {% block main_intro %} -

    Notebooks LogoNotebooks

    -

    - Notebooks is an environment based on Jupyter and - the EGI cloud service that - offers a browser-based, scalable tool for interactive data analysis. The Notebooks - environment provides users with notebooks where they can combine text, mathematics, - computations and rich media output. -

    -

    - Access requires a valid EGI account - and enrolling to the - vo.notebooks.egi.eu VO. -

    - {% endblock main_intro %} - {% block checkin_button %} -
    -

    - - Continue with EGI Check-in - -

    -
    - {% endblock checkin_button %} - {% block main_outro %} -

    - User communities/advanced users can have their customised EGI Notebooks service - instance. EGI offers consultancy and support, as well as can operate the setup. - Order a community - notebooks instance via the EOSC Marketplace. -

    - {% endblock main_outro %} -
    +
    +
    +
    +
    +

    Notebooks

    +

    + Create interactive documents with live code, visualisations and text +

    + {% block login %} + Continue with EGI Check-in + {% endblock login %} +
    +
    + Full Notebooks Logo +
    +
    +
    -{% endblock login %} -{% block footer %} - -{% endblock %} +
    -{% endblock %} +{% endblock main %} diff --git a/templates/page.html b/templates/page.html index 335ff35..1ae4c2a 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,86 +1,39 @@ {% extends "templates/page.html" %} - {% set service_name = service_name|default('Notebooks') %} {% block stylesheet %} {{ super() }} - - - + + {% endblock %} - {% block title %}EGI {{ service_name }}{% endblock %} -{% block logo %} - -{% endblock %} +{% block footer %} + +{% endblock footer %}