Merge pull request #188 from openworm/development

Multiple fixes & updates to main pages

Author: pgleeson

contacts.html

@@ -74,7 +74,7 @@ <h1 style="float: left;">Interact with us on social media!</h1><i class="fa fa-t
 		  	<div class="clearer"></div>
 		    </div>
 		    <p class="lead">
-		  	For ongoing information about OpenWorm, please follow our <a href="http://blog.openworm.org/" target="_blank">blog</a> on tumblr.
+		  	For ongoing information about OpenWorm, please follow our <a href="https://openworm.tumblr.com/" target="_blank">blog</a> on tumblr.
 			You can also follow us and interact on <a href="https://twitter.com/OpenWorm" target="_blank">Twitter</a> and <a href="https://www.facebook.com/OpenWorm" target="_blank">Facebook</a> for more frequent updates.
 		    </p>
 		    <div class="large-spacer"></div>

footer-content.html

@@ -2,7 +2,7 @@
     <div class="container">
 	<ul class="footer-links">
 	    <li>
-		<a href="http://blog.openworm.org">Blog</a>
+		<a href="https://openworm.tumblr.com/">Blog</a>
 	    </li>
 	    <li class="muted">
 		&middot;

get_involved.html

@@ -99,7 +99,7 @@ <h1>Coder</h1>
 				<br/><br/>
 
 				We have provided an extensive guide to getting started with the project in
-				<a href="http://docs.openworm.org/#contributing-to-openworm" target="_blank">our documentation</a>.
+				<a href="http://docs.openworm.org/#contributing-to-openworm" target="_blank">our documentation</a>. Also, have a look at the overview of <a href="https://github.com/openworm/.github/blob/main/testsheet/README.md" target="_blank">currently active projects</a>.
 				Please start there and if you have any questions do not hesitate to <a href="./contacts.html">contact us</a>.
 
 			    </p>

getting_started.html

@@ -109,8 +109,9 @@ <h4>A brief introduction to <em>C. elegans</em></h4>
 			    <p class="lead">
 				We are using a <strong>bottom-up</strong> approach, aimed at observing the worm behaviour <strong>emerge</strong> from a simulation of data derived from scientific experiments carried out over the past decade.
 				To do so we are incorporating the data available in the scientific community into software models.
-				We have developed <strong>Geppetto</strong> and <strong>Sibernetic</strong>, open-source simulation platforms,
-				to be able to run these different models in concert.
+				We have developed tools such as <strong>Sibernetic</strong> and <strong>c302</strong>, open-source simulation platforms,
+				to be able to run these different models in concert, and created a unified <strong><a href="downloads.html#docker">Docker simulation stack</a></strong> to bring all these parts together.
+					
 				We are also forging new collaborations with universities and research institutes to collect data that fill in the gaps.
 			    </p>
 			    <br/>

index.html

@@ -210,11 +210,7 @@ <h1>Open source visualization and simulation platform.</h1>
 			<li>
 			    <iframe class="github-btn"
 				    src="https://ghbtns.com/github-btn.html?user=openworm&repo=openworm&type=watch&count=true"
-				    allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
-			</li>
-			<li>
-			    <div class="fb-like" data-href="http://www.facebook.com/OpenWorm" data-send="false"
-				 data-layout="button_count" data-width="75" data-show-faces="false"></div>
+				    allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
 			</li>
 			<li class="follow-btn">
 			    <a href="https://twitter.com/openworm" class="twitter-follow-button" data-link-color="#0069D6"
@@ -272,26 +268,6 @@ <h3>How?</h3>
 	    <div class="large-spacer"></div>
 	    <div class="large-spacer"></div>
 
-	    <div class="container marketing">
-		<div class="row-fluid">
-		    <div class="span6" style="color: #292929;">
-			<h2>Latest news</h2>
-
-      <p class="marketing-byline clear">
-    See the most recent OpenWorm newsletter <a href="./news.html">here</a>.
-      </p>
-
-			<ul id="news-feed">
-
-			</ul>
-    </div>
-		    <div class="span6">
-			<div id="tweeter">
-			    <a class="twitter-timeline" href="https://twitter.com/OpenWorm" data-widget-id="293717776768569344">Tweets by @OpenWorm</a>
-			</div>
-		    </div>
-		</div>
-	    </div>
 
 	    <div class="container">
 		<div class="marketing">
@@ -423,6 +399,31 @@ <h2>Calendar</h2>
 		</div>
 	    </div>
 
+	    <div class="large-spacer"></div>
+	    <div class="large-spacer"></div>
+
+		<div class="container marketing">
+			<div class="row-fluid">
+				<div class="span6" style="color: #292929;">
+				<h2>Latest news</h2>
+	
+		  <p class="marketing-byline clear">
+		See the most recent OpenWorm newsletter <a href="./news.html">here</a>.
+		  </p>
+		  <p>Older news:</p>
+	
+				<ul id="news-feed">
+	
+				</ul>
+		</div>
+				<div class="span6">
+				<div id="tweeter">
+					<a class="twitter-timeline" href="https://twitter.com/OpenWorm" data-widget-id="293717776768569344">Tweets by @OpenWorm</a>
+				</div>
+				</div>
+			</div>
+			</div>
+
 	    <!-- FOOT: DUPLICATE THE FOLLOWING IN ALL PAGES -->
 	</div><!-- end pjax content -->
 

repositories.html

@@ -124,7 +124,7 @@ <h1>Repositories</h1>
 			<div class="container">
 				<ul class="footer-links">
 					<li>
-						<a href="http://blog.openworm.org">Blog</a>
+						<a href="https://openworm.tumblr.com">Blog</a>
 					</li>
 					<li class="muted">
 						&middot;

supporters.html

@@ -97,9 +97,12 @@ <h1>Academic Support</h1>
 			We would like to thank the following organizations that support OpenWorm contributors, which enables them to donate their time.
 		    </p>
 		    <div class="row-fluid">
-			<div>
-			    <p><b><a href="http://www.wellcome.ac.uk/" target="_blank">Wellcome Trust</a></b> via Padraig Gleeson / Matteo Cantarelli and the <b><a href="https://www.opensourcebrain.org" target="_blank">Open Source Brain</a> project (Silver Lab, University College London)</p>
-			</div>
+				<div>
+					<p><b><a href="https://www.ukri.org/councils/epsrc/" target="_blank">EPSRC</a></b> supporting the <b><a href="https://www.openneuroai.org" target="_blank">Gleeson Lab of Open Neuroscience & AI</a> at University College London</p>
+				</div>
+				<div>
+					<p><b><a href="http://www.wellcome.ac.uk/" target="_blank">Wellcome Trust</a></b> via Padraig Gleeson / Matteo Cantarelli and the <b><a href="https://www.opensourcebrain.org" target="_blank">Open Source Brain</a> project (Silver Lab, University College London)</p>
+				</div>
 			<div>
 			    <p><b><a href="http://www.mrc.ac.uk/" target="_blank">Medical Research Council</a></b> Centenary Award via Mike Vella (Department of Physiology, Development and Neuroscience, University of Cambridge)</p>
 			</div>