From d6b5c02893934889b43d367c753cf9d29c30f12f Mon Sep 17 00:00:00 2001 From: Mavis Ou Date: Wed, 24 Jan 2018 09:38:49 -0800 Subject: [PATCH 1/9] Related to #951 - Fellowship type page + Science fellowship page --- .../fellows/templates/fellows_home.html | 4 +- .../fellows/templates/fellows_science.html | 48 ++++++++++- .../fellows/templates/fellows_type.html | 84 +++++++++++++++++++ .../networkapi/templates/foundation-base.html | 2 +- source/js/components/people/people.scss | 3 +- source/js/main.js | 18 ++++ source/sass/main.scss | 1 + source/sass/type.scss | 28 ++++--- source/sass/views/fellowships/shared.scss | 19 +++++ 9 files changed, 189 insertions(+), 18 deletions(-) create mode 100644 network-api/networkapi/fellows/templates/fellows_type.html create mode 100644 source/sass/views/fellowships/shared.scss diff --git a/network-api/networkapi/fellows/templates/fellows_home.html b/network-api/networkapi/fellows/templates/fellows_home.html index fc3e0cfd6a5..350f9cfe94b 100644 --- a/network-api/networkapi/fellows/templates/fellows_home.html +++ b/network-api/networkapi/fellows/templates/fellows_home.html @@ -31,12 +31,12 @@

Our Fellowships have 4 areas of focus:

Science

Brief description of the theme of the Fellowship and defining characteristics of it.

- Learn More + Learn More

Open Web

Brief description of the theme of the Fellowship and defining characteristics of it.

- Learn More + Learn More

Tech Policy

diff --git a/network-api/networkapi/fellows/templates/fellows_science.html b/network-api/networkapi/fellows/templates/fellows_science.html index 843e8fdb00b..7b6e4a8450d 100644 --- a/network-api/networkapi/fellows/templates/fellows_science.html +++ b/network-api/networkapi/fellows/templates/fellows_science.html @@ -1,5 +1,47 @@ -{% extends "foundation-base.html" %} +{% extends "fellows_type.html" %} -{% block body %} -science fellows +{% block fellowship_type %} +Science +{% endblock %} + +{% block fellowship_description %} +

The Mozilla Fellowships for Science present a unique opportunity for researchers who want to influence the future of open science and data sharing within their communities.

+

We're looking for researchers with a passion for open source and data sharing, already working to shift research practice to be more collaborative, iterative and open. Fellows will spend 10 months starting September 2017 as community catalysts at their institutions, mentoring the next generation of open data practitioners and researchers and building lasting change in the global open science community.

+

Throughout their fellowship term, chosen fellows will receive training and support from Mozilla to hone their skills around open source, data sharing, open science policy and licensing. They will also craft code, curriculum and other learning resources that help their local communities learn open data practices, and teach their institutional peers.

+{% endblock %} + +{% block fellowship_illustration %} +img +{% endblock %} + +{% block benefit_illustration %} +img +{% endblock %} + +{% block benefit_description %} +

The Fellowships are designed to allow for flexibility for both Fellows and their families. The standard fellowship offers a stipend of $60,000 USD*, paid in 10 monthly installments. Fellows are responsible for remitting all applicable taxes and other government payments as required.

+

To help offset cost of living, the fellowship also provides supplements for childcare and health insurance, and helps pay for research/equipment and books. The fellowships also covers the costs of required travel for fellowship activities.

+{% endblock %} + +{% block benefit_list %} +
  • a stipend of $60,000 USD*, paid in 10 monthly installments
    • +
  • a one-time health insurance supplement for Fellows and their families, ranging from $3,500 for single Fellows to $7,000 for a couple with two or more children
    • +
  • a one-time childcare allotment of up to $6,000 for families with children
    • +
  • an allowance of up to $3,000 towards the purchase of laptop computer, digital cameras, recorders and computer software; fees for continuing studies or other courses, research fees or payments, to the extent such purchases and fees are related to the fellowship +
    • +
  • coverage in full for all approved fellowship trips – domestic and international
    • +{% endblock %} + +{% block eligibility_list %} +
  • be currently based at or affiliated with a research institution
    • +
  • have the ability to accept outside funds for this fellowship directly (i.e., not distributed through the institution)
    • +
  • be an early-career researcher (i.e., graduate students, post-docs, research scientists, lecturers)
    • +
  • specialize in scientific research: physical, life, social, library, or natural sciences
    • +
  • be able to travel
    • +
  • obtain support from their advisors. As fellows will be based at their home institutions, please note that a letter of support from their advisor is mandatory for consideration
    • +
  • have experience participating in open communities
    • +{% endblock %} + +{% block featured_fellow %} + {% endblock %} diff --git a/network-api/networkapi/fellows/templates/fellows_type.html b/network-api/networkapi/fellows/templates/fellows_type.html new file mode 100644 index 00000000000..c985a02ed50 --- /dev/null +++ b/network-api/networkapi/fellows/templates/fellows_type.html @@ -0,0 +1,84 @@ +{% extends "foundation-base.html" %} + +{% block body %} + + + +
    +
    +

    {% block fellowship_type %}{% endblock %} Fellowship

    +
    +
    + {% block fellowship_description %}{% endblock %} +
    +
    {% block fellowship_illustration %}{% endblock %}
    +
    + +
    +
    +
    +

    Stipend and Financial Benefits

    +
    +
    {% block benefit_illustration %}{% endblock %}
    +
    + {% block benefit_description %}{% endblock %} +
    +
    +

    Fellows will receive:

    +
      + {% block benefit_list %} + {% endblock %} +
    +
    +
    + +
    +
    +
    +

    Eligibility Criteria

    +
    +
    +

    Fellows must be:

    +
      + {% block eligibility_list %} + {% endblock %} +
    +
    +
    img
    +
    + +{% block featured_fellow %} +{% endblock %} + +
    +
    img
    +
    +
    +
    +

    Application are open

    +

    short copy short copy short copy short copy short copy short copy short copy short copy short copy

    +
    +
    + +
    +
    +
    +
    + +
    +
    img
    +
    +
    +
    +

    Want to support the incredible work Fellows are doing? Either as a host organization or a funder, you can join us to keep the Internet healthy.

    +
    +
    + +
    +
    +
    +
    + +{% endblock %} diff --git a/network-api/networkapi/templates/foundation-base.html b/network-api/networkapi/templates/foundation-base.html index 8e80cf918c7..f142497ab73 100644 --- a/network-api/networkapi/templates/foundation-base.html +++ b/network-api/networkapi/templates/foundation-base.html @@ -74,7 +74,7 @@
    -