Skip to content

Commit ed93426

Browse files
authored
Merge pull request sfbrainhack#2 from sfbrainhack/gh-pages
gh-pages to master
2 parents a44e3d1 + a46e3e1 commit ed93426

File tree

2 files changed

+108
-18
lines changed

2 files changed

+108
-18
lines changed

data.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"background_img": "https://upload.wikimedia.org/wikipedia/commons/a/a4/Ggb_by_night.jpg",
77
"color_theme": {"background": "#3b2e26", "font": "#fff", "link_color": "#e24401"},
88
"global_brainhack_organizers": ["Cameron Craddock"],
9-
"registration_link":"http://www.humanbrainmapping.org/i4a/pages/index.cfm?pageID=3711",
9+
"registration_link":"https://www.eventbrite.com/e/brainhack-global-san-francisco-2017-tickets-31948017380",
1010
"slack_link":"https://brainhack-slack-invite.herokuapp.com/",
1111
"project_submit_link":"http://brainhack.org/submit-project/",
1212
"title_photo_link":"https://upload.wikimedia.org/wikipedia/commons/a/a4/Ggb_by_night.jpg",
@@ -33,14 +33,14 @@
3333
{"time": "6:30pm", "event": "Ice-Breaker"},
3434
{"time": "7:00-8:00PM", "event": "Dinner+Brainstorming"},
3535
{"time": "8:00pm", "event": "Project Pitches"},
36-
{"time": "9:00pm-", "event": "Socilaizing"},]},
36+
{"time": "9:00pm-", "event": "Socializing"}]},
3737
{"date": "Saturday, March 04",
3838
"times": [{"time": "9:30-10:30am", "event": "Breakfast + Project Planning"},
3939
{"time": "10:30-11:30am", "event": "Keynote: Fernando Chirigati"},
4040
{"time": "11:30-1pm", "event": "Open Hacking"},
4141
{"time": "1:00-2:00pm", "event": "Lunch"},
4242
{"time": "2:00-5:00pm", "event": "Open Hacking"},
43-
{"time": "5:00-6:30pm", "event": "Unconference Sessions"},]},
43+
{"time": "5:00-6:30pm", "event": "Unconference Sessions"}]},
4444
{"date": "Sunday, March 05",
4545
"times": [{"time": "9:30-11:30", "event": "Breakfast + Open Hacking"},
4646
{"time": "11:30-1:00pm", "event": "Ignite Talks"},

index.html

+105-15
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ <h2>March 03-05, 2017</h2>
7878
</div>
7979
</div>
8080
<br>
81-
<a href="http://www.humanbrainmapping.org/i4a/pages/index.cfm?pageID=3711" target="_blank" class="btn btn-dark btn-lg top5 left5">Register Now</a>
81+
<a href="https://www.eventbrite.com/e/brainhack-global-san-francisco-2017-tickets-31948017380" target="_blank" class="btn btn-dark btn-lg top5 left5">Register Now</a>
8282
<a href="https://brainhack-slack-invite.herokuapp.com/" target="_blank" class="btn btn-dark btn-lg top5 left5">Join Brainhack on Slack</a>
8383
<a href="http://brainhack.org/submit-project/" target="_blank" class="btn btn-dark btn-lg top5 left5">Submit a Project</a><br><br>
8484

@@ -179,14 +179,14 @@ <h4>
179179
<div class="container">
180180
<div class="row text-center">
181181
<div class="col-xl-8 col-xl-offset-2 col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 col-sm-10 col-sm-offset-1 col-xs-12 col-xs-offset-0">
182-
<p><h3><a href="http://www.humanbrainmapping.org/i4a/pages/index.cfm?pageID=3711" target="_blank">Registration for the San Francisco Brainhack 2017 is now open!</a></h3></p>
182+
<p><h3><a href="https://www.eventbrite.com/e/brainhack-global-san-francisco-2017-tickets-31948017380" target="_blank">Registration for the San Francisco Brainhack 2017 is now open!</a></h3></p>
183183
<p>The San Francisco Brainhack 2017 is an official satellite event of the <a href="http://events.brainhack.org/global2017/" target="_blank">International Global Brainhack 2017</a> that is organized by
184184

185185
Cameron Craddock
186186

187187
. The goal of the hackathon is to bring together researchers with disparate backgrounds to collaborate on open science projects in neuroimaging.</p>
188188
<h4>Dates: March 03-05, 2017</h4>
189-
<h4>Costs: $25 USD, includes some food, probably</h4>
189+
<h4>Costs: $35 USD for students/postdocs/RAs, 65$ for faculty, includes onsite breakfast, lunch, and refreshments</h4>
190190
<h4>Location: <a href="#map"> San Francisco, CA, USA</a></h4>
191191
<p>Participants are encouraged to post project ideas to <a href="http://www.brainhack.org" target="_blank">www.brainhack.org</a> and to submit a report describing their project to the <a href="http://www.brainhack.org/proceedings">2017 Brainhack Proceedings</a> that will be published by <a href="http://gigasciencejournal.com/">Gigascience</a> after the event.</p>
192192
<p>Please join <a href="https://brainhack-slack-invite.herokuapp.com/" target="_blank">the Brainhack Slack project</a> for updated information on the developing Hackathon content and to contribute your own ideas.</p>
@@ -214,19 +214,46 @@ <h4>Friday, March 03</h4>
214214

215215
<div class="row top5">
216216
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
217-
6:00-9:00pm
217+
6pm
218218
</div>
219219
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
220-
Have fun
220+
Welcome + Intro to Brainhack
221221
</div>
222222
</div>
223223

224224
<div class="row top5">
225225
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
226-
9:00pm-12:00am
226+
6:30pm
227227
</div>
228228
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
229-
Socialize
229+
Ice-Breaker
230+
</div>
231+
</div>
232+
233+
<div class="row top5">
234+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
235+
7:00-8:00PM
236+
</div>
237+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
238+
Dinner+Brainstorming
239+
</div>
240+
</div>
241+
242+
<div class="row top5">
243+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
244+
8:00pm
245+
</div>
246+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
247+
Project Pitches
248+
</div>
249+
</div>
250+
251+
<div class="row top5">
252+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
253+
9:00pm-
254+
</div>
255+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
256+
Socializing
230257
</div>
231258
</div>
232259

@@ -247,19 +274,55 @@ <h4>Saturday, March 04</h4>
247274

248275
<div class="row top5">
249276
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
250-
9:00-9:30
277+
9:30-10:30am
278+
</div>
279+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
280+
Breakfast + Project Planning
281+
</div>
282+
</div>
283+
284+
<div class="row top5">
285+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
286+
10:30-11:30am
287+
</div>
288+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
289+
Keynote: Fernando Chirigati
290+
</div>
291+
</div>
292+
293+
<div class="row top5">
294+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
295+
11:30-1pm
251296
</div>
252297
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
253-
Breakfast
298+
Open Hacking
254299
</div>
255300
</div>
256301

257302
<div class="row top5">
258303
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
259-
9:30-5:30pm
304+
1:00-2:00pm
260305
</div>
261306
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
262-
Hacking
307+
Lunch
308+
</div>
309+
</div>
310+
311+
<div class="row top5">
312+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
313+
2:00-5:00pm
314+
</div>
315+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
316+
Open Hacking
317+
</div>
318+
</div>
319+
320+
<div class="row top5">
321+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
322+
5:00-6:30pm
323+
</div>
324+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
325+
Unconference Sessions
263326
</div>
264327
</div>
265328

@@ -280,19 +343,46 @@ <h4>Sunday, March 05</h4>
280343

281344
<div class="row top5">
282345
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
283-
9:00-9:30
346+
9:30-11:30
347+
</div>
348+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
349+
Breakfast + Open Hacking
350+
</div>
351+
</div>
352+
353+
<div class="row top5">
354+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
355+
11:30-1:00pm
356+
</div>
357+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
358+
Ignite Talks
359+
</div>
360+
</div>
361+
362+
<div class="row top5">
363+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
364+
1:00-2:00pm
365+
</div>
366+
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
367+
Lunch
368+
</div>
369+
</div>
370+
371+
<div class="row top5">
372+
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
373+
2:00-5:30pm
284374
</div>
285375
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
286-
Breakfast
376+
Open Hacking
287377
</div>
288378
</div>
289379

290380
<div class="row top5">
291381
<div class="col-md-4 col-md-offset-1 col-lg-4 col-lg-offset-1 col-sm-5 col-sm-offset-0 col-xs-5 text-dark">
292-
9:30-5:30pm
382+
5:30-7:00pm
293383
</div>
294384
<div class="col-sm-7 col-sm-offset-0 col-md-6 col-md-offset-1 col-lg-6 col-lg-offset-1 col-xs-7 text-dark">
295-
Hacking
385+
Project Presentations + Socialize
296386
</div>
297387
</div>
298388

0 commit comments

Comments
 (0)