Skip to content

Massive website update #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 11, 2017
Merged

Massive website update #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
135d043
Starting to remove JupyterCon content.
ellisonbg Sep 27, 2017
07a7ca8
Remove scroll.js
ellisonbg Oct 8, 2017
9b1dacf
Basic white nav bar with light grey bottom border.
ellisonbg Oct 8, 2017
fcd1ef0
Full delete of scroll.js
ellisonbg Oct 8, 2017
93c6873
About -> About Us
ellisonbg Oct 8, 2017
0d2c0e3
Updates to Home page, Install and About Us.
ellisonbg Oct 8, 2017
fb57c85
More work on about/community/documentation pages.
ellisonbg Oct 8, 2017
10abc8a
Revised docs landing page.
ellisonbg Oct 9, 2017
1318a78
Period.
ellisonbg Oct 9, 2017
f13ee3e
Fix donation style, update numfocus logo.
ellisonbg Oct 9, 2017
ab2fc44
Add name to CODEOWNERS, remove Cameron's
ellisonbg Oct 9, 2017
77785bc
Review comments addressed.
ellisonbg Oct 10, 2017
f6a1161
Adding back general docs section.
ellisonbg Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# on this repo

# These owners will be the default owners for everything in the repo.
* @cameronoelsen @ruv7 @carreau
* @ruv7 @carreau @ellisonbg
3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ or `my_page/index.html` (will have url `https://jupyter.org/my_page/`), start wi
---
layout: default
title: My Page
navbar_gray: true
---

write some html here (consider you are already inside `<body></body>`
Expand All @@ -79,8 +78,6 @@ You can not do it yet with .md file, but you will be able soon.

Add commit (and don't forget to add to `_data/nav.yml`

`navbar_gray: true` start the navbar with a grey background if you need it.

# Continuous Integration Testing on Travis

Travis will run and test:
Expand Down
4 changes: 2 additions & 2 deletions _data/nav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
head:
- Install
- About
- About Us
- Community
- Documentation
- title: NBViewer
url: https://nbviewer.jupyter.org
- Widgets
- title: Blog
url: https://blog.jupyter.org
- Donate

1 change: 0 additions & 1 deletion _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<script src="{{site.baseurl}}/js/bootstrap.min.js"></script>
<!-- Place this tag right after the last button or just before your close body tag. -->
<script async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
<script src="{{site.baseurl}}/js/scroll.js"></script>
<script src="{{site.baseurl}}/js/architecture.js"></script>
<script src="{{site.baseurl}}/js/simon.js"></script>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
6 changes: 3 additions & 3 deletions _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<nav class="navbar navbar-fixed-top {% if page.navbar_gray %}navbar-gray{%endif%} {% if page.navbar_white %}navbar-white{%endif%} {% if page.navbar_jupytercon %}jupytercon-navbar{% endif %}" role="navigation" id="navbar" >
<nav class="navbar navbar-fixed-top" role="navigation" id="navbar" >
<div class="navbar-inner">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
Expand All @@ -16,13 +16,13 @@
{% endif %}
</button>
<a class="navbar-brand" href="{{site.baseurl}}/index.html">
<img id="jupyter-nav-logo" class="navbar-logo" src="{% if page.url == '/' or page.url == '/index.html' %}{{site.baseurl}}/assets/white_nav_logo.svg{% else %}{{site.baseurl}}/assets/nav_logo.svg{%endif%}" alt="Jupyter logo">
<img id="jupyter-nav-logo" class="navbar-logo" src="{{site.baseurl}}/assets/nav_logo.svg" alt="Jupyter logo">
</a>
</div>
<div class="blur"></div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right {% if page.url == '/' | page.url == '/index.html' %}jupytercon-nav{% endif %}">
<ul class="nav navbar-nav navbar-right">
{% for nav in site.data.nav.head %}
{% if nav.url %}
<li>
Expand Down
175 changes: 50 additions & 125 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
layout: default
title: About
navbar_gray: true
title: "About Us"
---


Expand Down Expand Up @@ -32,119 +31,38 @@
<div class="row">
<div class="col-xs-12">
<h2>About Project Jupyter</h2>
<p>Project Jupyter is an open source project was born out of the <a href="https://ipython.org">IPython Project</a> in 2014 as it evolved to support interactive data science and scientific computing across all programming languages. Jupyter will always be 100% open source software, free for all to use and released under the liberal terms of the <a href="https://opensource.org/licenses/BSD-3-Clause">modified BSD license</a></p>
<p>
Project Jupyter is a non-profit, open-source project, born out of the <a href="https://ipython.org">IPython Project</a> in 2014 as
it evolved to support interactive data science and scientific computing across all programming languages. Jupyter will
always be 100% open-source software, free for all to use and released under the liberal terms of the
<a href="https://opensource.org/licenses/BSD-3-Clause">modified BSD license</a>.
</p>
<p>
Jupyter is developed in the open on GitHub, through the consensus of the Jupyter community. For more information on our
governance approach, please see our <a href="https://github.com/jupyter/governance/blob/master/governance.md">Governance Document</a>.
</p>
<p>
All online and in-person interactions and communications directly related to the project are covered by the
<a href="https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md">Jupyter Code of Conduct</a>. This Code of Conduct sets expectations to enable a diverse community of
user and contributors to participate in the project with respect and safety.
</p>
</div>
</div>
</div>
</div>
</section>
<section id="community">
<div class="section-white top-section-border">
<div class="container">
<div class="row">
<img src="assets/community.svg" class="section-icon img-responsive" alt="community graphic with orange circle and network">
<h3 class="col-sm-12 section-header">Community</h3>
<p class="col-sm-12 support-paragraph">Our vibrant community empowers us to create an amazing platform. Dynamic developers, cutting edge scientists as well as everyday users work together to further Jupyter's best-in-class tools.<span class="hidden-xs hidden-sm"> Here is a dynamic visualization of our most recent contributors:</span></p>
<!--<img class="img-responsive col-md-12" src="assets/spiderweb.png"> -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
<div id="visualization" class="hidden-xs hidden-sm">
</div>
<div class="hidden-md hidden-lg">
<img src="assets/community-replace.png" class="img-responsive" alt="community graphic">
<script>

//basic tuning parameters
var width = 600,
height = 500,
radius = 15,
distance = 70,
gravity = .09,
charge = -550;

//scale for icon classes
var scale = new Array();
scale["contributor"] = 1;
scale["repo"] = 1.4;
scale["center"] = 4.5;

//Whether to show label
var showLabel = new Array();
showLabel["contributor"] = true;
showLabel["repo"] = true;
showLabel["center"] = false;

var svg = d3.select("#visualization").append("svg")
.attr("width", width)
.attr("height", height);

var force = d3.layout.force()
.gravity(gravity)
.distance(function (d) {return d.value * distance})
.charge(charge)
.size([width, height]);

d3.json("graphData.json", function(error, json) {
if (error) throw error;

force
.nodes(json.nodes)
.links(json.links)
.start();

var link = svg.selectAll(".link")
.data(json.links)
.enter().append("line")
.attr("class", function(d) {return "link" + d.value});

var node = svg.selectAll(".node")
.data(json.nodes)
.enter().append("g")
.attr("class", "node")
.call(force.drag);

svg.append("clipPath")
.attr("id", "clipCircle-contributor")
.append("circle")
.attr("r", radius * scale["contributor"]);

node.append("svg:image")
.attr("xlink:href", function(d) {return d.image;})
.attr("x", function(d) {return -radius * scale[d.type]})
.attr("y", function(d) {return -radius * scale[d.type]})
.attr("width", function(d) {return radius * 2 * scale[d.type]})
.attr("height", function(d) {return radius * 2 * scale[d.type]})
.attr("clip-path", function(d) {return "url(#clipCircle-" + d.type + ")" });

node.append("text")
.attr("dx", 20)
.attr("dy", ".35em")
.text(function(d) { return (showLabel[d.type]) ? d.name : ""});

force.on("tick", function() {
node.attr("cx", function(d) { return d.x = Math.max(radius, Math.min(width - radius, d.x)); })
.attr("cy", function(d) { return d.y = Math.max(radius, Math.min(height - radius, d.y)); });

link.attr("x1", function(d) { return d.source.x; })
.attr("y1", function(d) { return d.source.y; })
.attr("x2", function(d) { return d.target.x; })
.attr("y2", function(d) { return d.target.y; });

node.attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")"; });
});
});
</script>
</div>
</div>
</div>
</div>
</section>
<section id="steering-council">
<div class="section-grey">
<div class="section-white top-section-border">
<div class="container">
<div class="row">
<img src="assets/steering.svg" class="section-icon img-responsive" alt="steering committee icon">
<h3 class="col-sm-12 section-header">Steering Council</h3>
<p class="col-sm-12 support-paragraph">Our team is primarily led by 15 steering committee members who ultimately make the final decisions.</p>
<p class="col-sm-12 support-paragraph">
The role of the Jupyter Steering Council is to ensure, through working with and serving the broader Juputer community,
the long-term well-being of the project, both technically and as a community. The Jupyter Steering Council currently consists
of the following members (in alphabetical order).
</p>
<div class="col-md-12 section-content section-center">
<div class="col-md-4 material">
<img class="council-member-photo" alt="Damian Avila's avatar picture" src='https://avatars3.githubusercontent.com/u/1640669?v=3&s=170' />
Expand Down Expand Up @@ -227,7 +145,7 @@ <h3 class="col-sm-12 section-header">Steering Council</h3>
</div>
</section>
<section id="sponsors">
<div class="section-white">
<div class="section-grey">
<div class="container">
<div class="row">
<img src="assets/sponsors2.svg" class="section-icon img-responsive" alt="sponsors">
Expand Down Expand Up @@ -281,13 +199,15 @@ <h3 class="col-sm-12 section-header">Sponsors</h3>
</div>
</section>
<section id="partners">
<div class="section-grey">
<div class="section-white">
<div class="container">
<div class="row">
<img src="assets/institutional_partners2.svg" class="section-icon img-responsive" alt="institutional partners">
<h3 class="col-sm-12 section-header">Institutional Partners</h3>
<p class="col-sm-12 support-paragraph">Institutional Partners are companies and universities that support the project by employing Steering Council members.
Current Institutional Partners include:</p>
<p class="col-sm-12 support-paragraph">
Institutional Partners are organizations that support the project by employing Jupyter Steering Council members.
Current Institutional Partners include:
</p>
<div class="col-xs-12 section-center">
<div class="col-sm-3 col-xs-6 sponsor">
<a href="http://continuum.io/">
Expand Down Expand Up @@ -324,24 +244,29 @@ <h3 class="col-sm-12 section-header">Institutional Partners</h3>
</div>
</div>
</section>
<section id="governance">
<div class="section-white governance">
<section>
<div class="section-grey top-section-border">
<div class="container">
<div class="row">
<img src="assets/governance-icon2.svg" class="section-icon img-responsive" id="governance" alt="governance icon">
<h3 class="col-sm-12 section-header">Governance</h3>
<p class="col-sm-12 support-paragraph">Robust, community driven development with institutional backing.</p>
<div class="col-md-12 section-center">
<h4 class="button1 clickable">NumFocus</h4>
<h4 class="button2 clickable">Copyright/License</h4>
<h4 class="button3 clickable">Decisions</h4>
<h4 class="button4 clickable">Steering Council</h4>
<div class="governance-desc">
<div class="div1">Project Jupyter is part of the non-profit NumFOCUS Foundation, which provides fiscal sponsorship, governance and a legal umbrella for the project.</div>
<div class="div2" style='display:none'>We use a shared copyright model that enables all contributors to maintain the copyright on their contributions. All code is licensed under the terms of the revised BSD license.</div>
<div class="div3" style='display:none'>Technical decisions are made through open community discussion and consensus, with a Steering Council and BDFL (Fernando Perez) stepping in when consensus cannot be reached.</div>
<div class="div4" style='display:none'>The overall leadership, strategy and direction for the project is provided by the Jupyter Steering Council, a group of the most active project contributors that are nominated for leadership.</div>
</div>
<div class="architecturedescription col-md-12">
<img src="assets/donations-icon2.svg" class="section-icon" alt="donations icon">
<h3 class="section-header">Donations</h3>
<p id="support-paragraph">Jupyter will always be 100% open source software, free for all to use and
released under the liberal terms of the <a href="https://opensource.org/licenses/BSD-3-Clause">modified BSD license</a>.
If you have found Project Jupyter to be useful in your work, research or company, please consider making a donation to the project
commensurate with your resources.</p>
<p>
All donations will be used strictly to fund the development of Project Jupyter's open source software, documentation
and community. Our donations are managed by the <a href="http://numfocus.org">NumFOCUS Foundation</a>, which is the
legal and fiscal umbrella for the project.
NumFOCUS is a 501(c)3 non-profit foundation; if you are subject to US Tax law, your contributions will be tax-deductible.
</p>
</div>
<div class="col-md-12 donate-box">
<a href="http://numfocus.org"><img id="numfocus-logo" src="assets/numfocus_logo.png" class="img-responsive center-block" alt="numfocus logo"></a>
<div id="donate-formatting">
<a href="https://www.flipcause.com/widget/MjI1OQ==" class="orange-button" id="donate-link">
Support Project Jupyter
</a>
</div>
</div>
</div>
Expand Down
Loading