Skip to content

Commit

Permalink
# This is a combination of 17 commits.
Browse files Browse the repository at this point in the history 
# This is the 1st commit message:

fixed rebase conflicts

# This is the commit message #2:

fixed rebase conflicts

# This is the commit message #3:

fixed rebase conflicts

# This is the commit message #4:

updated elements on the page based on the latest comps

# This is the commit message #5:

added the last 2 sections in

# This is the commit message #6:

removed redundant code

# This is the commit message #7:

fixed rebase conflicts

# This is the commit message #8:

fixed rebase conflicts

# This is the commit message #9:

to match the updated comps

# This is the commit message #10:

fixed broken links

# This is the commit message #11:

named URL patterns

# This is the commit message #12:

custom template tag 'active_nav'

# This is the commit message #13:

applied custom template tag

# This is the commit message #14:

fixed linting error

# This is the commit message #15:

fixed linting error

# This is the commit message #16:

Related to #951 - fellowship type template & science fellowships

# This is the commit message #17:

featured fellow
  • Loading branch information
@mmmavis
mmmavis committed Jan 24, 2018
1 parent 6b6bae0 commit 2e24e4f
Show file tree
Hide file tree
Showing 12 changed files with 466 additions and 38 deletions.
157 changes: 156 additions & 1 deletion network-api/networkapi/fellows/templates/fellows_home.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,160 @@
{% extends "foundation-base.html" %}

{% block hero_banner %}
<div class="row">
<div class="col-md-12 col-lg-6 py-5">
<div class="mb-4">
<h1 class="h1-white">Fellowships</h1>
</div>
<p class="lead-black">Our Fellowships empower bright minds in the fields of public policy, science and journalism.</p>
</div>
</div>
{% endblock %}

{% block body %}
Hello, fellowships!
<div class="row mb-5">
<div class="col-md-12 mb-5">
<hr class="hr-gradient mt-0">
<h4 class="h2-headings-white">What are Fellowships?</h4>
</div>
<div class="col-md-9">
<p>What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships What are Fellowships</p>
</div>
<div class="col-md-3">img</div>
<div class="col-md-12">
<div class="row">
<div class="col-md-6">
<h4 class="h4-light-black">Our Fellowships have 4 areas of focus:</h4>
</div>
</div>
</div>
<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="{% 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="{% 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>
<p>Brief description of the theme of the Fellowship and defining characteristics of it.</p>
<a href="" class="cta-link">Learn More</a>
</div>
<div class="col-md-6 mb-4">
<h3 class="h5-black my-2">Media</h3>
<p>Brief description of the theme of the Fellowship and defining characteristics of it.</p>
<a href="" class="cta-link">Learn More</a>
</div>
<div class="col-md-9">
<p>More description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description more description.</p>
</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">Meet Some of the Mozilla Fellows</h4>
</div>
<div class="featured-person col-6 col-sm-4 col-md-3 mb-4 mb-sm-0">
<img class="img-fluid d-block" src={item.image} alt="Headshot"/>
<h2 class="h5-black my-2">Firstname Lastname</h2>
<p class="small-gray">description description description description description description description description description</p>
<div class="person-social-links mt-3">
<a href="" class="twitter gray small mr-4"></a>
<a href="" class="linkedIn gray small mr-4"></a>
</div>
</div>
<div class="featured-person col-6 col-sm-4 col-md-3 mb-4 mb-sm-0">
<img class="img-fluid d-block" src={item.image} alt="Headshot"/>
<h2 class="h5-black my-2">Firstname Lastname</h2>
<p class="small-gray">description description description description description description description description description</p>
<div class="person-social-links mt-3">
<a href="" class="twitter gray small mr-4"></a>
<a href="" class="linkedIn gray small mr-4"></a>
</div>
</div>
<div class="featured-person col-6 col-sm-4 col-md-3 mb-4 mb-sm-0">
<img class="img-fluid d-block" src={item.image} alt="Headshot"/>
<h2 class="h5-black my-2">Firstname Lastname</h2>
<p class="small-gray">description description description description description description description description description</p>
<div class="person-social-links mt-3">
<a href="" class="twitter gray small mr-4"></a>
<a href="" class="linkedIn gray small mr-4"></a>
</div>
</div>
<div class="featured-person col-6 col-sm-4 col-md-3 mb-4 mb-sm-0">
<img class="img-fluid d-block" src={item.image} alt="Headshot"/>
<h2 class="h5-black my-2">Firstname Lastname</h2>
<p class="small-gray">description description description description description description description description description</p>
<div class="person-social-links mt-3">
<a href="" class="twitter gray small mr-4"></a>
<a href="" class="linkedIn gray small mr-4"></a>
</div>
</div>
<div class="col-md-12 text-center my-5">
<button class="btn btn-ghost">See Fellows Directory</button>
</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">Why Become a Fellow?</h4>
</div>
<div class="col-md-6">img</div>
<div class="col-md-6">
<p>Why Become a Fellow Why Become a Fellow Why Become a Fellow Why Become a Fellow</p>
<ul>
<li>Apple pie cotton candy lollipop lollipop lollipop topping.</li>
<li>Lemon drops. Tootsie roll dessert cake chocolate ice cream topping muffin.</li>
<li>Sugar plum caramels jelly.</li>
<li>Marshmallow jelly beans sesame snaps fruitcake jelly-o icing bear claw dessert.</li>
</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">Expectations</h4>
</div>
<div class="col-md-6">
<p>Expectations Expectations Expectations Expectations Expectations Expectations Expectations Expectations Expectations Expectations Expectations Expectations</p>
<ul>
<li>Apple pie cotton candy lollipop lollipop lollipop topping.</li>
<li>Lemon drops. Tootsie roll dessert cake chocolate ice cream topping muffin.</li>
<li>Sugar plum caramels jelly.</li>
<li>Marshmallow jelly beans sesame snaps fruitcake jelly-o icing bear claw dessert.</li>
</ul>
</div>
<div class="col-md-6">img</div>
</div>

<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 mb-5">
<div class="col-12">
<hr class="my-2">
<div class="opp-foot d-flex align-items-center"><img class="mr-3" src="/_images/green-20.svg" width="51" height="45">
<p class="body-black mb-0">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. <a href="">Find out how to support</a>.</p>
</div>
<hr class="my-2">
</div>
</div>
{% endblock %}
48 changes: 45 additions & 3 deletions network-api/networkapi/fellows/templates/fellows_science.html
View file
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
View file
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 %}
12 changes: 7 additions & 5 deletions network-api/networkapi/fellows/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
from networkapi.fellows import views

urlpatterns = [
url(r'^$', views.fellows_home),
url(r'^directory/$', views.fellows_directory),
url(r'^support/$', views.fellows_support),
url(r'^science/$', views.fellows_science),
url(r'^open-web/$', views.fellows_openweb),
url(r'^$', views.fellows_home, name='fellowships-home'),
url(r'^directory/$',
views.fellows_directory,
name='fellowships-directory'),
url(r'^support/$', views.fellows_support, name='fellowships-support'),
url(r'^science/$', views.fellows_science, name='fellowships-science'),
url(r'^open-web/$', views.fellows_openweb, name='fellowships-open-web'),
]
20 changes: 18 additions & 2 deletions network-api/networkapi/templates/foundation-base.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- This is a copy/paste of landing-page.html, modified to be useful for fellowships to start. Ideally the entire site will extend this template eventually -->
<!DOCTYPE html>
<html>{% load settings_value %}
<html>{% load settings_value %}{% load active_nav %}

<head>
<meta charset="utf-8">
Expand Down Expand Up @@ -62,6 +62,8 @@
<div class="wrapper-2">
<div id="hero">
<div class="container">
{% block hero_banner %}
{% endblock %}
</div>
</div>
</div>
Expand All @@ -72,6 +74,20 @@
</div>
</div>
</div>
<div id="fellowships-nav" class="my-4">
<div class="container">
<div class="row">
<div class="col">
<div class="d-flex flex-row align-items-center">
<a href="{% url 'fellowships-home' %}" class="{% active_nav request 'fellowships-home' %} mr-4">Fellowships</a>
<a href="{% url 'fellowships-directory' %}" class="{% active_nav request 'fellowships-directory' %} mr-4">Directory</a>
<a href="{% url 'fellowships-support' %}" class="{% active_nav request 'fellowships-support' %} mr-4">Support the Program</a>
<a href="" class="mr-4">Apply to be a Fellow</a>
</div>
</div>
</div>
</div>
</div>
<div class="container">
{% block body %}
{% endblock %}
Expand Down Expand Up @@ -118,4 +134,4 @@
</body>

</html>
<script src="/_js/main.compiled.js"></script>
<script src="/_js/main.compiled.js"></script>
16 changes: 16 additions & 0 deletions network-api/networkapi/utility/templatetags/active_nav.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
from django import template

register = template.Library()


@register.simple_tag(name='active_nav')
def active_nav(request, view_name):

from django.core.urlresolvers import resolve, Resolver404
path = resolve(request.path_info)
if not request:
return ""
try:
return "active" if path.url_name == view_name else ""
except Resolver404:
return ""
Loading

0 comments on commit 2e24e4f

Please sign in to comment.