Skip to content

Commit 16dfcab

Browse files
tarellitarelli
committed
Merge branch 'pjax-jq' of git://github.com/notsambeck/org.openworm.website
2 parents 43b42d8 + c7dd9d0 commit 16dfcab

File tree

4 files changed

+333
-46
lines changed

4 files changed

+333
-46
lines changed

‎war/getting_started.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ <h1>Our goal</h1>
101101

102102
<div class="well">
103103
<div class="centered">
104-
<iframe width="420" height="315" src="http://www.youtube.com/embed/zjqLwPgLnV0" frameborder="0" allowfullscreen></iframe>
104+
<iframe width="420" height="315" src="https://www.youtube.com/embed/zjqLwPgLnV0" frameborder="0" allowfullscreen></iframe>
105105
</div>
106106
<div class="padding-top">
107107
<h4>A brief introduction to <em>C. elegans</em></h4>
@@ -122,7 +122,7 @@ <h4>A brief introduction to <em>C. elegans</em></h4>
122122

123123
<div class="well">
124124
<div class="centered">
125-
<iframe width="420" height="315" src="http://www.youtube.com/embed/r2OBznK6HkI" frameborder="0" allowfullscreen></iframe>
125+
<iframe width="420" height="315" src="https://www.youtube.com/embed/r2OBznK6HkI" frameborder="0" allowfullscreen></iframe>
126126
</div>
127127
<div class="padding-top">
128128
<h4>This video shows recent progress from the project to build the simulated body of the worm.</h4>
@@ -243,7 +243,7 @@ <h1>Contribute</h1>
243243
<!-- load other resources asynchronously: -->
244244
<script src="js/bootstrap.js" async></script>
245245
<script src="js/jquery.parss.uncompressed.js" async></script>
246-
<script src="http://platform.twitter.com/widgets.js" async></script>
246+
<script src="https://platform.twitter.com/widgets.js" async></script>
247247

248248
<!-- execute main (initialize resources above + carousel/donate controls -->
249249
<script src="js/jquery.pjax.js"></script>

‎war/index.html

Lines changed: 72 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<meta charset="utf-8">
55
<title>OpenWorm</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<meta name="description"
8-
content="OpenWorm is an open source project dedicated to creating a virtual C. elegans nematode in a computer.">
7+
<meta name="description" content="OpenWorm is an open source project dedicated to creating a virtual C. elegans nematode in a computer.">
98

109
<!-- REPLICATE THIS IN ALL PAGES -->
1110

@@ -18,7 +17,7 @@
1817

1918
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
2019
<!--[if lt IE 9]>
21-
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
20+
<script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
2221
<![endif]-->
2322

2423
<!-- Fav and touch icons - this code is outdated -->
@@ -27,7 +26,7 @@
2726
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
2827
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
2928
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
30-
29+
3130
<div class="navbar navbar-inverse navbar-fixed-top">
3231
<div class="navbar-inner" id="head-nav">
3332
</div>
@@ -43,13 +42,13 @@
4342
})
4443
</script>
4544
</head>
46-
45+
4746
<body>
4847
<div id="pjax-content">
4948
<!-- END REPEAT-->
5049

5150
<!-- sb: this allows FB to reload when user returns to home page
52-
it is very slow though...i think there is a better way but requires app id -->
51+
it is very slow though...i think there is a better way but requires app id -->
5352
<div id="fb-root"></div>
5453

5554
<div id="myCarousel" class="carousel slide">
@@ -221,7 +220,7 @@ <h1>Aiming for the best.</h1>
221220
<ul class="bs-docs-social-buttons">
222221
<li>
223222
<iframe class="github-btn"
224-
src="http://ghbtns.com/github-btn.html?user=openworm&repo=openworm&type=watch&count=true"
223+
src="https://ghbtns.com/github-btn.html?user=openworm&repo=openworm&type=watch&count=true"
225224
allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
226225
</li>
227226
<li>
@@ -245,37 +244,65 @@ <h1>Aiming for the best.</h1>
245244
</div>
246245
</div>
247246

248-
249247

250-
<!-- ======== main body ========== -->
251-
<div>
252-
<div class="container">
253-
<div class="marketing">
254-
<h1>Enter the worm.</h1>
248+
249+
<!-- ====================== main body ==================== -->
250+
<div class="container marketing">
251+
<div>
252+
<h1>Enter the worm. </h1>
253+
</div>
254+
<div class="short-spacer"></div>
255+
<div id="openworm_logo"></div>
256+
<div class="short-spacer"></div>
257+
<h2>
258+
<strong>OpenWorm</strong> is an open source project dedicated to creating the first virtual organism in a computer.
259+
</h2>
260+
</div>
261+
262+
<div class="large-spacer"></div>
263+
<div class="large-spacer"></div>
264+
<div class="line"></div>
265+
266+
<div class="container marketing">
267+
<div class="row-fluid">
268+
<div class="span6">
269+
<h3>Why?</h3>
255270
<p class="marketing-byline">
256-
OpenWorm is an open source project dedicated to creating a virtual C. elegans nematode in a computer.
271+
Because modeling a simple nervous system is a first step toward fully understanding complex systems like the human brain.
257272
</p>
258-
<div id="openworm_logo"></div>
259-
<div class="row-fluid">
260-
<div class="span6">
261-
<h2>Latest news</h2>
262-
<ul id="news-feed">
273+
</div>
274+
<div class="span6">
275+
<h3>How?</h3>
276+
<p class="marketing-byline">
277+
By rejecting red tape and building a community of engineers, scientists, and other motivated volunteers from around the world.
278+
</p>
279+
</div>
280+
</div>
281+
</div>
263282

264-
</ul>
265-
</div>
266-
<div class="span6">
267-
<h2>Social stream</h2>
268-
<div id="tweeter">
269-
<a class="twitter-timeline" href="https://twitter.com/OpenWorm" data-widget-id="293717776768569344">Tweets by @OpenWorm</a>
270-
</div>
271-
</div>
283+
<div class="large-spacer"></div>
284+
<div class="large-spacer"></div>
285+
286+
<div class="container marketing">
287+
<div class="row-fluid">
288+
<div class="span6" style="color: #292929;">
289+
<h2>Latest news</h2>
290+
<ul id="news-feed">
291+
292+
</ul>
293+
</div>
294+
<div class="span6">
295+
<div id="tweeter">
296+
<a class="twitter-timeline" href="https://twitter.com/OpenWorm" data-widget-id="293717776768569344">Tweets by @OpenWorm</a>
272297
</div>
273298
</div>
274299
</div>
275300
</div>
301+
276302
<div class="container">
277303
<div class="marketing">
278304

305+
279306
<h1>See OpenWorm</h1>
280307
<h2>
281308
at
@@ -349,29 +376,33 @@ <h1>Open Science at its best.</h1>
349376
<i class="fa fa-github fa-xl"></i>
350377
<h2>Source code</h2>
351378
<p>
352-
All the code produced as part of the OpenWorm project is on <a
353-
href="http://docs.openworm.org/en/latest/Community/github.html#github"
354-
target="_blank">GitHub</a>
355-
under <a href="http://opensource.org/licenses/MIT" target="_blank">MIT</a> licence. Different <a
356-
href="http://docs.openworm.org/en/latest/projects.html" target="_blank">sub-projects</a> are
357-
hosted in different repositories.
379+
All the code produced as part of the OpenWorm project is on
380+
<a href="http://docs.openworm.org/en/latest/Community/github.html#github"
381+
target="_blank">GitHub</a>
382+
under
383+
<a href="http://opensource.org/licenses/MIT" target="_blank">MIT</a>
384+
licence. Different <a href="http://docs.openworm.org/en/latest/projects.html"
385+
target="_blank">sub-projects</a>
386+
are hosted in different repositories.
358387
</p>
359388
</div>
360389
<div class="span4">
361390
<i class="fa fa-tasks fa-xl"></i>
362391
<h2>Current progress</h2>
363392
<p>
364-
The tasks we are currently working on are tracked on GitHub under different <a
365-
href="https://github.com/openworm/OpenWorm/milestones" target="_blank">Milestones</a>.
393+
The tasks we are currently working on are tracked on GitHub under different
394+
<a href="https://github.com/openworm/OpenWorm/milestones"
395+
target="_blank">Milestones</a>.
366396
</p>
367397
</div>
368398
<div class="span4">
369399
<i class="fa fa-calendar fa-xl"></i>
370400
<h2>Calendar</h2>
371401
<p>
372-
When is the next OpenWorm hangout or event? Checkout our <a
373-
href="https://www.google.com/calendar/embed?src=bqvlrm642m3irjehbethokkcdg%40group.calendar.google.com"
374-
target="_blank">public calendar</a> to find out!
402+
When is the next OpenWorm hangout or event? Checkout our
403+
<a href="https://www.google.com/calendar/embed?src=bqvlrm642m3irjehbethokkcdg%40group.calendar.google.com"
404+
target="_blank">public calendar</a>
405+
to find out!
375406
</p>
376407
</div>
377408
</div>
@@ -397,8 +428,8 @@ <h1>Meet with us</h1> <br>
397428
</p>
398429
</div>
399430
</div>
400-
401-
<!-- FOOT: DUPLICATE THE FOLLOWING IN ALL PAGES -->
431+
432+
<!-- FOOT: DUPLICATE THE FOLLOWING IN ALL PAGES -->
402433
</div><!-- end pjax content -->
403434

404435

@@ -415,7 +446,7 @@ <h1>Meet with us</h1> <br>
415446
<!-- load other resources asynchronously: -->
416447
<script src="js/bootstrap.js" async></script>
417448
<script src="js/jquery.parss.uncompressed.js" async></script>
418-
<script src="http://platform.twitter.com/widgets.js" async></script>
449+
<script src="https://platform.twitter.com/widgets.js" async></script>
419450

420451
<!-- execute main (initialize resources above + carousel/donate controls -->
421452
<script src="js/jquery.pjax.js"></script>

‎war/js/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function setNavigation() {
117117

118118

119119
function refreshNews() {
120-
$("#news-feed").PaRSS("http://openworm.tumblr.com/rss", // url to the feed
120+
$("#news-feed").PaRSS("https://openworm.tumblr.com/rss", // url to the feed
121121
6, // number of items to retrieve
122122
"M jS Y, g:i a", // date format
123123
false, // include descriptions
@@ -203,7 +203,7 @@ function reloadSocial() {
203203
if (typeof (FB) != 'undefined') {
204204
delete FB;
205205
$('#facebook-jssdk').remove();
206-
$.getScript("http://connect.facebook.net/en_US/all.js#xfbml=1", function () {
206+
$.getScript("https://connect.facebook.net/en_US/all.js#xfbml=1", function () {
207207
FB.init({ status: true, cookie: true, xfbml: true });
208208
})
209209
} else {

0 commit comments

Comments
 (0)