Skip to content

Commit df904a4

Browse files
cameronoelsencameronoelsen
committed
Merge branch 'master' into website-changes
2 parents ea3d063 + 1d8be23 commit df904a4

27 files changed

+8942
-60
lines changed

‎about.html

+182-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,25 @@
3939

4040
</script>
4141
</head>
42+
<style>
43+
/*Styling for the community section */
44+
/* Style for inter-repo links */
45+
.link1 {
46+
stroke: white;
47+
stroke-width: 1;
48+
}
4249

50+
/* Style for repo-contributor links */
51+
.link2 {
52+
stroke: #e6e6e6;
53+
stroke-width: 2;
54+
}
55+
56+
.node text {
57+
pointer-events: none;
58+
font: 0px sans-serif;
59+
}
60+
</style>
4361
<body id="about-body">
4462

4563
<!-- Navigation -->
@@ -98,6 +116,169 @@ <h1>About Project Jupyter</h1>
98116
</div>
99117
</div>
100118
</section>
119+
<section>
120+
<div class="about-block">
121+
<div class="container">
122+
<img src="assets/community.svg" class="img-responsive">
123+
<h2>Community</h2>
124+
<p class="supportparagraph" style="display:inline;">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.</p>
125+
<p class="supportparagraph hidden-xs hidden-sm" style="display:inline;">Here is a dynamic visualization of our most recent contributors:</p>
126+
<!--<img class="img-responsive col-md-12" src="assets/spiderweb.png"> -->
127+
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
128+
<div id="visualization" class="hidden-xs hidden-sm">
129+
</div>
130+
<div id="visualization" class="hidden-md hidden-lg">
131+
<img src="assets/community-replace.png" class="img-responsive">
132+
<script>
133+
134+
//basic tuning parameters
135+
var width = 600,
136+
height = 500,
137+
radius = 15,
138+
distance = 70,
139+
gravity = .09,
140+
charge = -550;
141+
142+
//scale for icon classes
143+
var scale = new Array();
144+
scale["contributor"] = 1;
145+
scale["repo"] = 1.4;
146+
scale["center"] = 4.5;
147+
148+
//Whether to show label
149+
var showLabel = new Array();
150+
showLabel["contributor"] = true;
151+
showLabel["repo"] = true;
152+
showLabel["center"] = false;
153+
154+
var svg = d3.select("#visualization").append("svg")
155+
.attr("width", width)
156+
.attr("height", height);
157+
158+
var force = d3.layout.force()
159+
.gravity(gravity)
160+
.distance(function (d) {return d.value * distance})
161+
.charge(charge)
162+
.size([width, height]);
163+
164+
d3.json("graphData.json", function(error, json) {
165+
if (error) throw error;
166+
167+
force
168+
.nodes(json.nodes)
169+
.links(json.links)
170+
.start();
171+
172+
var link = svg.selectAll(".link")
173+
.data(json.links)
174+
.enter().append("line")
175+
.attr("class", function(d) {return "link" + d.value});
176+
177+
var node = svg.selectAll(".node")
178+
.data(json.nodes)
179+
.enter().append("g")
180+
.attr("class", "node")
181+
.call(force.drag);
182+
183+
svg.append("clipPath")
184+
.attr("id", "clipCircle-contributor")
185+
.append("circle")
186+
.attr("r", radius * scale["contributor"]);
187+
188+
//uncomment to enable circle clipping for repo icons
189+
/*
190+
svg.append("clipPath")
191+
.attr("id", "clipCircle-repo")
192+
.append("circle")
193+
.attr("r", radius * scale["repo"]);
194+
195+
svg.append("clipPath")
196+
.attr("id", "clipCircle-center")
197+
.append("circle")
198+
.attr("r", radius * scale["center"]);
199+
*/
200+
201+
node.append("svg:image")
202+
.attr("xlink:href", function(d) {return d.image;})
203+
.attr("x", function(d) {return -radius * scale[d.type]})
204+
.attr("y", function(d) {return -radius * scale[d.type]})
205+
.attr("width", function(d) {return radius * 2 * scale[d.type]})
206+
.attr("height", function(d) {return radius * 2 * scale[d.type]})
207+
.attr("clip-path", function(d) {return "url(#clipCircle-" + d.type + ")" });
208+
209+
node.append("text")
210+
.attr("dx", 20)
211+
.attr("dy", ".35em")
212+
.text(function(d) { return (showLabel[d.type]) ? d.name : ""});
213+
214+
force.on("tick", function() {
215+
node.attr("cx", function(d) { return d.x = Math.max(radius, Math.min(width - radius, d.x)); })
216+
.attr("cy", function(d) { return d.y = Math.max(radius, Math.min(height - radius, d.y)); });
217+
218+
link.attr("x1", function(d) { return d.source.x; })
219+
.attr("y1", function(d) { return d.source.y; })
220+
.attr("x2", function(d) { return d.target.x; })
221+
.attr("y2", function(d) { return d.target.y; });
222+
223+
node.attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")"; });
224+
});
225+
});
226+
227+
</script>
228+
</div>
229+
</div>
230+
</section>
231+
<section>
232+
<div class="about-block steering-council gray">
233+
<div class="container">
234+
<img src="assets/steering.svg" class="img-responsive">
235+
<h2>Steering Council</h2>
236+
<p class="supportparagraph">Our team is primarily lead by 10 steering committee members who ultimately make the final decisions.</p>
237+
<div class="col-md-12">
238+
<div class="col-md-4 material material-1">
239+
<p class="council-name">Brian Granger<p>
240+
<p class="council-info">Cal Poly, San Luis Obispo<br><a href="https://github.com/ellisonbg" target="_blank"><em>@ellisonbg</em></a> on GitHub</p>
241+
</div>
242+
<div class="col-md-4 material material-1">
243+
<p class="council-name">Damian Avila<p>
244+
<p class="council-info">Continuum Analytics<br><a href="https://github.com/damianavila" target="_blank"><em>@damianavila</em></a> on GitHub</p>
245+
</div></a>
246+
<div class="col-md-4 material material-1">
247+
<p class="council-name">Fernando Perez<p>
248+
<p class="council-info">UC Berkeley<br><a href="https://github.com/fperez" target="_blank"><em>@fperez</em></a> on GitHub</p>
249+
</div>
250+
<div class="col-md-4 material material-1">
251+
<p class="council-name">Jason Grout<p>
252+
<p class="council-info">Bloomberg<br><a href="https://github.com/jasongrout" target="_blank"><em>@jasongrout</em></a> on GitHub</p>
253+
</div>
254+
<div class="col-md-4 material material-1">
255+
<p class="council-name">Jessica Hamrick<p>
256+
<p class="council-info">UC Berkeley<br><a href="https://github.com/jhamrick" target="_blank"><em>@jhamrick</em></a> on GitHub</p>
257+
</div>
258+
<div class="col-md-4 material material-1">
259+
<p class="council-name">Jonathan Frederic<p>
260+
<p class="council-info">Cal Poly, San Luis Obispo<br><a href="https://github.com/jdfreder" target="_blank"><em>@jdfreder</em></a> on GitHub</p>
261+
</div>
262+
<div class="col-md-4 material material-1">
263+
<p class="council-name">Kyle Kelley<p>
264+
<p class="council-info">Rackspace<br><a href="https://github.com/rgbkrk" target="_blank"><em>@rgbkrk</em></a> on GitHub</p>
265+
</div>
266+
<div class="col-md-4 material material-1">
267+
<p class="council-name">Mattias Bussionnier<p>
268+
<p class="council-info">UC Berkeley<br><a href="https://github.com/carreau" target="_blank"><em>@carreau</em></a> on GitHub</p>
269+
</div>
270+
<div class="col-md-4 material material-1">
271+
<p class="council-name">Min Ragan-Kelley<p>
272+
<p class="council-info">UC Berkeley<br><a href="https://github.com/minrk" target="_blank"><em>@minrk</em></a> on GitHub</p>
273+
</div>
274+
<div class="col-md-4 material material-1">
275+
<p class="council-name">Thomas Kluyver<p>
276+
<p class="council-info">UC Berkeley<br><a href="https://github.com/takluyver" target="_blank"><em>@takluyver</em></a> on GitHub</p>
277+
</div>
278+
</div>
279+
</div>
280+
</div>
281+
</section>
101282
<section>
102283
<div class="about-block">
103284
<div class="container">
@@ -115,7 +296,7 @@ <h2>Sponsors</h2>
115296
</div>
116297
</section>
117298
<section>
118-
<div class="about-block institutional" id="institutional">
299+
<div class="about-block gray" id="institutional">
119300
<div class="container">
120301
<img src="assets/institutional_partners2.svg" class="img-responsive">
121302
<h2>Institutional Partners</h2>

‎assets/community-replace.png

127 KB
Loading

‎assets/community.svg

+49
Loading

‎assets/donations-icon2.svg

+17-10
Loading

0 commit comments

Comments
 (0)