Skip to content

Commit

Permalink
Related to #951 - Fellowship type page + Science fellowship page
Browse files Browse the repository at this point in the history
  • Loading branch information
mmmavis committed Jan 24, 2018
1 parent 255b8e8 commit 1b1dd55
Show file tree
Hide file tree
Showing 9 changed files with 189 additions and 18 deletions.
4 changes: 2 additions & 2 deletions network-api/networkapi/fellows/templates/fellows_home.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ <h4 class="h4-light-black">Our Fellowships have 4 areas of focus:</h4>
<div class="col-md-6 mb-4">
<h3 class="h5-black my-2">Science</h3>
<p>Brief description of the theme of the Fellowship and defining characteristics of it.</p>
<a href="" class="cta-link">Learn More</a>
<a href="{% url 'fellowships-science' %}" class="cta-link">Learn More</a>
</div>
<div class="col-md-6 mb-4">
<h3 class="h5-black my-2">Open Web</h3>
<p>Brief description of the theme of the Fellowship and defining characteristics of it.</p>
<a href="" class="cta-link">Learn More</a>
<a href="{% url 'fellowships-open-web' %}" class="cta-link">Learn More</a>
</div>
<div class="col-md-6 mb-4">
<h3 class="h5-black my-2">Tech Policy</h3>
Expand Down
48 changes: 45 additions & 3 deletions network-api/networkapi/fellows/templates/fellows_science.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
{% extends "foundation-base.html" %}
{% extends "fellows_type.html" %}

{% block body %}
science fellows
{% block fellowship_type %}
Science
{% endblock %}

{% block fellowship_description %}
<p>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.</p>
<p>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.</p>
<p>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.</p>
{% endblock %}

{% block fellowship_illustration %}
img
{% endblock %}

{% block benefit_illustration %}
img
{% endblock %}

{% block benefit_description %}
<p>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.</p>
<p>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.</p>
{% endblock %}

{% block benefit_list %}
<li>a stipend of $60,000 USD*, paid in 10 monthly installments</li>
<li>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</li>
<li>a one-time childcare allotment of up to $6,000 for families with children</li>
<li>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
</li>
<li>coverage in full for all approved fellowship trips – domestic and international</li>
{% endblock %}

{% block eligibility_list %}
<li>be currently based at or affiliated with a research institution</li>
<li>have the ability to accept outside funds for this fellowship directly (i.e., not distributed through the institution)</li>
<li>be an early-career researcher (i.e., graduate students, post-docs, research scientists, lecturers)</li>
<li>specialize in scientific research: physical, life, social, library, or natural sciences</li>
<li>be able to travel</li>
<li>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</li>
<li>have experience participating in open communities</li>
{% endblock %}

{% block featured_fellow %}
<div id="featured-science-fellow" class="featured-fellow"></div>
{% endblock %}
84 changes: 84 additions & 0 deletions network-api/networkapi/fellows/templates/fellows_type.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{% extends "foundation-base.html" %}

{% block body %}

<div id="fellowship-breadcrumb">
<a href="">breadcrumb</a>
</div>

<div class="row mb-5">
<div class="col-md-12 my-b">
<h1 class="h1-white">{% block fellowship_type %}{% endblock %} Fellowship</h1>
</div>
<div class="col-md-9">
{% block fellowship_description %}{% endblock %}
</div>
<div class="col-md-3">{% block fellowship_illustration %}{% endblock %}</div>
</div>

<div class="row mb-5">
<div class="col-md-12 my-5">
<hr class="hr-gradient mt-0">
<h4 class="h2-headings-white">Stipend and Financial Benefits</h4>
</div>
<div class="col-md-6">{% block benefit_illustration %}{% endblock %}</div>
<div class="col-md-6">
{% block benefit_description %}{% endblock %}
</div>
<div class="col-md-12">
<p>Fellows will receive:</p>
<ul class="fellowships-list two-column">
{% block benefit_list %}
{% endblock %}
</ul>
</div>
</div>

<div class="row mb-5">
<div class="col-md-12 my-5">
<hr class="hr-gradient mt-0">
<h4 class="h2-headings-white">Eligibility Criteria</h4>
</div>
<div class="col-md-8">
<p>Fellows must be:</p>
<ul class="fellowships-list">
{% block eligibility_list %}
{% endblock %}
</ul>
</div>
<div class="col-md-4">img</div>
</div>

{% block featured_fellow %}
{% endblock %}

<div class="row py-5 px-md-2">
<div class="col-md-2">img</div>
<div class="col-md-10">
<div class="d-flex flex-column flex-md-row justify-content-around">
<div>
<h2 class="h3-cta-black">Application are open</h2>
<p>short copy short copy short copy short copy short copy short copy short copy short copy short copy</p>
</div>
<div class="ml-md-5 align-self-center">
<button class="btn btn-normal">I want to be a Fellow</button>
</div>
</div>
</div>
</div>

<div class="row py-5 px-md-2">
<div class="col-md-1">img</div>
<div class="col-md-11">
<div class="d-flex flex-column flex-md-row justify-content-around">
<div>
<p>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.</p>
</div>
<div class="ml-md-5 align-self-center">
<button class="btn btn-ghost">Ways to Support</button>
</div>
</div>
</div>
</div>

{% endblock %}
2 changes: 1 addition & 1 deletion network-api/networkapi/templates/foundation-base.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</div>
</div>
</div>
<div id="fellowships-nav" class="nav-links mt-5">
<div id="fellowships-nav" class="my-4">
<div class="container">
<div class="row">
<div class="col">
Expand Down
3 changes: 2 additions & 1 deletion source/js/components/people/people.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#people {
#people,
.featured-fellow {
.headshot {
width: 100%;
}
Expand Down
18 changes: 18 additions & 0 deletions source/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import Leaders from './components/leaders/leaders.jsx';
import HomeNews from './components/home-news/home-news.jsx';
import News from './components/news/news.jsx';
import Upcoming from './components/upcoming/upcoming.jsx';
import Person from './components/people/person.jsx';

const SHOW_MEMBER_NOTICE = false;

Expand Down Expand Up @@ -231,6 +232,23 @@ let main = {
if (document.querySelector(`#news`)) {
ReactDOM.render(<News env={env}/>, document.querySelector(`#news`));
}

// Science Fellowship
if (document.getElementById(`featured-science-fellow`)) {
let metadata = {
featured: true,
'internet_health_issues': [ `Decentralization`, `Open Innovation` ],
links: [],
name: `Firstname Surname`,
role: `[Area Fellowship] Fellow, [Year]`,
location: `City, Country`,
image: `https://images.pexels.com/photos/264206/pexels-photo-264206.jpeg?w=500`,
quote: `Quote quote quote quote quote quote quote quote quote quote quote quote.`,
affiliations: [ `Stanford University Professor; YouthLAB founder`]
};

ReactDOM.render(<Person metadata={metadata} />, document.getElementById(`featured-science-fellow`));
}
}
};

Expand Down
1 change: 1 addition & 0 deletions source/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ $bp-xl: #{map-get($grid-breakpoints, xl)}; // >= 1200px
@import './views/about';
@import './views/contact';
@import './views/projects';
@import './views/fellowships/shared';
28 changes: 17 additions & 11 deletions source/sass/type.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@ a {
line-height: 1.5;
}

@mixin yellow-underline-nav-link($active-class-name, $font-family: "Zilla Slab") {
font-family: $font-family;
color: #231f20;

@if $font-family == "Zilla Slab" {
letter-spacing: 0.25px;
}

&:hover,
&#{$active-class-name} {
color: inherit;
text-decoration: none;
border-bottom: 5px solid #ffed00;
}
}

.h1-white {
font-family: "Zilla Slab";
font-weight: 600;
Expand Down Expand Up @@ -272,16 +288,6 @@ a {
}

.opp-link {
font-family: "Zilla Slab";
color: #231f20;
letter-spacing: 0.25px;

&:hover,
&.opp-link-active {
color: inherit;
text-decoration: none;
border-bottom: 5px solid #ffed00;
}

@include yellow-underline-nav-link(".opp-link-active");
@include scaleText(18px, 20px);
}
19 changes: 19 additions & 0 deletions source/sass/views/fellowships/shared.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#fellowships-nav {
a {
@include yellow-underline-nav-link(".active", "Nunito Sans");
}
}

.fellowships-list {
list-style: outside;

&.two-column {
column-count: 2;
column-gap: 2rem;
}

li {
margin-left: 1.1rem;
padding-left: 1.5rem;
}
}

0 comments on commit 1b1dd55

Please sign in to comment.