Skip to content

Commit fae454d

Browse files
CarreauCarreau
authored
Merge pull request #233 from ellisonbg/remove-jupytercon
Massive website update
2 parents 88c94e6 + f6a1161 commit fae454d

21 files changed

+388
-726
lines changed

‎CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# on this repo
33

44
# These owners will be the default owners for everything in the repo.
5-
* @cameronoelsen @ruv7 @carreau
5+
* @ruv7 @carreau @ellisonbg

‎README.md

-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ or `my_page/index.html` (will have url `https://jupyter.org/my_page/`), start wi
6969
---
7070
layout: default
7171
title: My Page
72-
navbar_gray: true
7372
---
7473
7574
write some html here (consider you are already inside `<body></body>`
@@ -79,8 +78,6 @@ You can not do it yet with .md file, but you will be able soon.
7978

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

82-
`navbar_gray: true` start the navbar with a grey background if you need it.
83-
8481
# Continuous Integration Testing on Travis
8582

8683
Travis will run and test:

‎_data/nav.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
head:
22
- Install
3-
- About
3+
- About Us
44
- Community
55
- Documentation
66
- title: NBViewer
77
url: https://nbviewer.jupyter.org
88
- Widgets
99
- title: Blog
1010
url: https://blog.jupyter.org
11-
- Donate
11+

‎_includes/footer.html

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<script src="{{site.baseurl}}/js/bootstrap.min.js"></script>
3535
<!-- Place this tag right after the last button or just before your close body tag. -->
3636
<script async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
37-
<script src="{{site.baseurl}}/js/scroll.js"></script>
3837
<script src="{{site.baseurl}}/js/architecture.js"></script>
3938
<script src="{{site.baseurl}}/js/simon.js"></script>
4039
<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>

‎_includes/header.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<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" >
1+
<nav class="navbar navbar-fixed-top" role="navigation" id="navbar" >
22
<div class="navbar-inner">
33
<div class="container">
44
<!-- Brand and toggle get grouped for better mobile display -->
@@ -16,13 +16,13 @@
1616
{% endif %}
1717
</button>
1818
<a class="navbar-brand" href="{{site.baseurl}}/index.html">
19-
<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">
19+
<img id="jupyter-nav-logo" class="navbar-logo" src="{{site.baseurl}}/assets/nav_logo.svg" alt="Jupyter logo">
2020
</a>
2121
</div>
2222
<div class="blur"></div>
2323
<!-- Collect the nav links, forms, and other content for toggling -->
2424
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
25-
<ul class="nav navbar-nav navbar-right {% if page.url == '/' | page.url == '/index.html' %}jupytercon-nav{% endif %}">
25+
<ul class="nav navbar-nav navbar-right">
2626
{% for nav in site.data.nav.head %}
2727
{% if nav.url %}
2828
<li>

‎about.html

+50-125
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
layout: default
3-
title: About
4-
navbar_gray: true
3+
title: "About Us"
54
---
65

76

@@ -32,119 +31,38 @@
3231
<div class="row">
3332
<div class="col-xs-12">
3433
<h2>About Project Jupyter</h2>
35-
<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>
34+
<p>
35+
Project Jupyter is a non-profit, open-source project, born out of the <a href="https://ipython.org">IPython Project</a> in 2014 as
36+
it evolved to support interactive data science and scientific computing across all programming languages. Jupyter will
37+
always be 100% open-source software, free for all to use and released under the liberal terms of the
38+
<a href="https://opensource.org/licenses/BSD-3-Clause">modified BSD license</a>.
39+
</p>
40+
<p>
41+
Jupyter is developed in the open on GitHub, through the consensus of the Jupyter community. For more information on our
42+
governance approach, please see our <a href="https://github.com/jupyter/governance/blob/master/governance.md">Governance Document</a>.
43+
</p>
44+
<p>
45+
All online and in-person interactions and communications directly related to the project are covered by the
46+
<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
47+
user and contributors to participate in the project with respect and safety.
48+
</p>
3649
</div>
3750
</div>
3851
</div>
3952
</div>
4053
</section>
41-
<section id="community">
42-
<div class="section-white top-section-border">
43-
<div class="container">
44-
<div class="row">
45-
<img src="assets/community.svg" class="section-icon img-responsive" alt="community graphic with orange circle and network">
46-
<h3 class="col-sm-12 section-header">Community</h3>
47-
<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>
48-
<!--<img class="img-responsive col-md-12" src="assets/spiderweb.png"> -->
49-
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
50-
<div id="visualization" class="hidden-xs hidden-sm">
51-
</div>
52-
<div class="hidden-md hidden-lg">
53-
<img src="assets/community-replace.png" class="img-responsive" alt="community graphic">
54-
<script>
55-
56-
//basic tuning parameters
57-
var width = 600,
58-
height = 500,
59-
radius = 15,
60-
distance = 70,
61-
gravity = .09,
62-
charge = -550;
63-
64-
//scale for icon classes
65-
var scale = new Array();
66-
scale["contributor"] = 1;
67-
scale["repo"] = 1.4;
68-
scale["center"] = 4.5;
69-
70-
//Whether to show label
71-
var showLabel = new Array();
72-
showLabel["contributor"] = true;
73-
showLabel["repo"] = true;
74-
showLabel["center"] = false;
75-
76-
var svg = d3.select("#visualization").append("svg")
77-
.attr("width", width)
78-
.attr("height", height);
79-
80-
var force = d3.layout.force()
81-
.gravity(gravity)
82-
.distance(function (d) {return d.value * distance})
83-
.charge(charge)
84-
.size([width, height]);
85-
86-
d3.json("graphData.json", function(error, json) {
87-
if (error) throw error;
88-
89-
force
90-
.nodes(json.nodes)
91-
.links(json.links)
92-
.start();
93-
94-
var link = svg.selectAll(".link")
95-
.data(json.links)
96-
.enter().append("line")
97-
.attr("class", function(d) {return "link" + d.value});
98-
99-
var node = svg.selectAll(".node")
100-
.data(json.nodes)
101-
.enter().append("g")
102-
.attr("class", "node")
103-
.call(force.drag);
104-
105-
svg.append("clipPath")
106-
.attr("id", "clipCircle-contributor")
107-
.append("circle")
108-
.attr("r", radius * scale["contributor"]);
109-
110-
node.append("svg:image")
111-
.attr("xlink:href", function(d) {return d.image;})
112-
.attr("x", function(d) {return -radius * scale[d.type]})
113-
.attr("y", function(d) {return -radius * scale[d.type]})
114-
.attr("width", function(d) {return radius * 2 * scale[d.type]})
115-
.attr("height", function(d) {return radius * 2 * scale[d.type]})
116-
.attr("clip-path", function(d) {return "url(#clipCircle-" + d.type + ")" });
117-
118-
node.append("text")
119-
.attr("dx", 20)
120-
.attr("dy", ".35em")
121-
.text(function(d) { return (showLabel[d.type]) ? d.name : ""});
122-
123-
force.on("tick", function() {
124-
node.attr("cx", function(d) { return d.x = Math.max(radius, Math.min(width - radius, d.x)); })
125-
.attr("cy", function(d) { return d.y = Math.max(radius, Math.min(height - radius, d.y)); });
12654

127-
link.attr("x1", function(d) { return d.source.x; })
128-
.attr("y1", function(d) { return d.source.y; })
129-
.attr("x2", function(d) { return d.target.x; })
130-
.attr("y2", function(d) { return d.target.y; });
131-
132-
node.attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")"; });
133-
});
134-
});
135-
</script>
136-
</div>
137-
</div>
138-
</div>
139-
</div>
140-
</section>
14155
<section id="steering-council">
142-
<div class="section-grey">
56+
<div class="section-white top-section-border">
14357
<div class="container">
14458
<div class="row">
14559
<img src="assets/steering.svg" class="section-icon img-responsive" alt="steering committee icon">
14660
<h3 class="col-sm-12 section-header">Steering Council</h3>
147-
<p class="col-sm-12 support-paragraph">Our team is primarily led by 15 steering committee members who ultimately make the final decisions.</p>
61+
<p class="col-sm-12 support-paragraph">
62+
The role of the Jupyter Steering Council is to ensure, through working with and serving the broader Juputer community,
63+
the long-term well-being of the project, both technically and as a community. The Jupyter Steering Council currently consists
64+
of the following members (in alphabetical order).
65+
</p>
14866
<div class="col-md-12 section-content section-center">
14967
<div class="col-md-4 material">
15068
<img class="council-member-photo" alt="Damian Avila's avatar picture" src='https://avatars3.githubusercontent.com/u/1640669?v=3&s=170' />
@@ -227,7 +145,7 @@ <h3 class="col-sm-12 section-header">Steering Council</h3>
227145
</div>
228146
</section>
229147
<section id="sponsors">
230-
<div class="section-white">
148+
<div class="section-grey">
231149
<div class="container">
232150
<div class="row">
233151
<img src="assets/sponsors2.svg" class="section-icon img-responsive" alt="sponsors">
@@ -281,13 +199,15 @@ <h3 class="col-sm-12 section-header">Sponsors</h3>
281199
</div>
282200
</section>
283201
<section id="partners">
284-
<div class="section-grey">
202+
<div class="section-white">
285203
<div class="container">
286204
<div class="row">
287205
<img src="assets/institutional_partners2.svg" class="section-icon img-responsive" alt="institutional partners">
288206
<h3 class="col-sm-12 section-header">Institutional Partners</h3>
289-
<p class="col-sm-12 support-paragraph">Institutional Partners are companies and universities that support the project by employing Steering Council members.
290-
Current Institutional Partners include:</p>
207+
<p class="col-sm-12 support-paragraph">
208+
Institutional Partners are organizations that support the project by employing Jupyter Steering Council members.
209+
Current Institutional Partners include:
210+
</p>
291211
<div class="col-xs-12 section-center">
292212
<div class="col-sm-3 col-xs-6 sponsor">
293213
<a href="http://continuum.io/">
@@ -324,24 +244,29 @@ <h3 class="col-sm-12 section-header">Institutional Partners</h3>
324244
</div>
325245
</div>
326246
</section>
327-
<section id="governance">
328-
<div class="section-white governance">
247+
<section>
248+
<div class="section-grey top-section-border">
329249
<div class="container">
330-
<div class="row">
331-
<img src="assets/governance-icon2.svg" class="section-icon img-responsive" id="governance" alt="governance icon">
332-
<h3 class="col-sm-12 section-header">Governance</h3>
333-
<p class="col-sm-12 support-paragraph">Robust, community driven development with institutional backing.</p>
334-
<div class="col-md-12 section-center">
335-
<h4 class="button1 clickable">NumFocus</h4>
336-
<h4 class="button2 clickable">Copyright/License</h4>
337-
<h4 class="button3 clickable">Decisions</h4>
338-
<h4 class="button4 clickable">Steering Council</h4>
339-
<div class="governance-desc">
340-
<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>
341-
<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>
342-
<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>
343-
<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>
344-
</div>
250+
<div class="architecturedescription col-md-12">
251+
<img src="assets/donations-icon2.svg" class="section-icon" alt="donations icon">
252+
<h3 class="section-header">Donations</h3>
253+
<p id="support-paragraph">Jupyter will always be 100% open source software, free for all to use and
254+
released under the liberal terms of the <a href="https://opensource.org/licenses/BSD-3-Clause">modified BSD license</a>.
255+
If you have found Project Jupyter to be useful in your work, research or company, please consider making a donation to the project
256+
commensurate with your resources.</p>
257+
<p>
258+
All donations will be used strictly to fund the development of Project Jupyter's open source software, documentation
259+
and community. Our donations are managed by the <a href="http://numfocus.org">NumFOCUS Foundation</a>, which is the
260+
legal and fiscal umbrella for the project.
261+
NumFOCUS is a 501(c)3 non-profit foundation; if you are subject to US Tax law, your contributions will be tax-deductible.
262+
</p>
263+
</div>
264+
<div class="col-md-12 donate-box">
265+
<a href="http://numfocus.org"><img id="numfocus-logo" src="assets/numfocus_logo.png" class="img-responsive center-block" alt="numfocus logo"></a>
266+
<div id="donate-formatting">
267+
<a href="https://www.flipcause.com/widget/MjI1OQ==" class="orange-button" id="donate-link">
268+
Support Project Jupyter
269+
</a>
345270
</div>
346271
</div>
347272
</div>

0 commit comments

Comments
 (0)