Skip to content

Commit

Permalink
Last update on members
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveViss committed Mar 31, 2016
1 parent 45d8dfc commit db2cc76
Show file tree
Hide file tree
Showing 27 changed files with 7,884 additions and 332 deletions.
21 changes: 11 additions & 10 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
# Site settings
title: Theoretical Ecosystem Ecology lab
email: [email protected]
description: > # this means to ignore newlines until "baseurl:"
Write an awesome description for your new site here. You can edit this
line in _config.yml. It will appear in your document head meta (for
Google search results) and in your feed.xml site description.
title: Integrative ecology Lab
email: [email protected]
description: "Integrative Ecology Research laboratory leaded by Dominique Gravel at Sherbrooke University"
baseurl: "" # the subpath of your site, e.g. /blog/
url: "http://yourdomain.com" # the base hostname & protocol for your site
twitter_username: jekyllrb
github_username: jekyll
url: "http://ielab.recherche.usherbrooke.ca/" # the base hostname & protocol for your site
twitter_username: SVissault
github_username: SteveViss
keys: [Dominique Gravel,Integrative,computational,theoretical,ecology,modelisation,networks,forest,climate change,global warming]

# Build settings
markdown: kramdown

scholar:
style: ieee
style: assets/csl/ecology.csl
locale: en
repository: assets/pdf
sort_by: year
Expand All @@ -31,3 +29,6 @@ scholar:
bibliography_item_tag: p

query: "@*"

gems:
- jekyll-sitemap
210 changes: 142 additions & 68 deletions _data/members.yml

Large diffs are not rendered by default.

26 changes: 18 additions & 8 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<footer>

<div class="row" style="padding-top:10px;">
<div class="large-6 columns" style="font-weight:500;">
<h5 style='color:white;margin-bottom:0px;font-weight:600;'>Follow us on <a href="https://github.com/TheoreticalEcosystemEcology"><i class="step fi-social-github" style="font-size: 40px;"></i></a> </h5>
All codes/programs developed within the lab are publicly available on Github.
<div class="large-6 columns">
<h5 style='color:white;margin-bottom:0px;font-weight:500;'>Follow us on <a style="color:rgb(224, 188, 0);" href="https://github.com/TheoreticalEcosystemEcology"><i class="step fi-social-github" style="font-size: 40px;"></i></a> </h5>
All codes/softwares developed within the lab are publicly available on Github.
</div>
<div class="large-6 columns" style="font-weight:500;">
<h5 style='color:white;margin-bottom:5px;font-weight:600;'>Contact us</h5>
<b>Dominique Gravel</b> </br>
<div class="large-6 columns">
<h5 style='color:white;margin-bottom:5px;font-weight:500;'>Contact</h5>
Dominique Gravel</br>
Canada Research Chair on Integrative ecology </br>
Département de biologie, Faculté des Sciences</br>
Université de Sherbrooke</br>
2500 Boulevard Université</br>
Sherbrooke, Qc., J1K 2R1</br>
(819) 821-8000 #66589 </br>
<a href="mailto:[email protected]">[email protected]</a>
<a style="color:rgb(224, 188, 0);" href="mailto:[email protected]">[email protected]</a>
</div>

<div class="large-12 columns text-left" style="margin-top:20px;margin-bottom:20px;font-weight:500;">
Made with <a href="https://jekyllrb.com/">Jekyll</a> by [IE]
Made with <a style="color:rgb(224, 188, 0);" href="https://jekyllrb.com/">Jekyll</a> by [IE]
</div>
</div>
<script src="/js/vendor/jquery.js"></script>
Expand All @@ -43,4 +43,14 @@ <h5 style='color:white;margin-bottom:5px;font-weight:600;'>Contact us</h5>
}
});
</script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-75753704-1', 'auto');
ga('send', 'pageview');

</script>
</footer>
8 changes: 4 additions & 4 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<title>{% if page.title %} IELab - {{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">

<meta name="author" content="IELab">
<meta name="keywords" content="{% if page.tags %}{{ page.tags | join: ', ' | escape }}{% else %}{{ site.keys | join: ', ' | escape }}{% endif %}">

<link rel="stylesheet" href="/css/foundation.css"/>
<link rel="stylesheet" href="/css/foundation-icons.css" />
<!-- This is how you would link your custom stylesheet -->
Expand All @@ -14,5 +15,4 @@

<script src="/js/vendor/modernizr.js"></script>

<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
</head>
10 changes: 5 additions & 5 deletions _includes/network.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h2>Current members</h2>
{id: 4, shape: 'circularImage', image: DIR + 'steve.png', label:"Steve Vissault"},
{id: 5, shape: 'circularImage', image: DIR + 'cazelle.png', label:"Kevin Cazelles"},
{id: 6, shape: 'circularImage', image: DIR + 'idaline.png', label:"Idaline Laigle"},
{id: 7, shape: 'circularImage', image: DIR + 'amael.png', label:"Amael Lesquin",title: 'My real name is Peregrin Took!'},
{id: 7, shape: 'circularImage', image: DIR + 'amael.png', label:"Amael Lesquin"},
{id: 8, shape: 'circularImage', image: DIR + 'kevin.png', label:"Kevin Solarik"},
{id: 9, shape: 'box',font:{size:18,color:'#fff'},label:"Modelisation"},
{id: 10, shape: 'box',font:{size:18,color:'#fff'},label:"Ecological networks"},
Expand Down Expand Up @@ -115,12 +115,12 @@ <h2>Current members</h2>
zoomView: false,
},
nodes: {
borderWidth:3,
size:40,
borderWidth:4,
size:50,
shadow:true,
scaling: {
min:40,
max:40,
min:50,
max:50,
},
font: {
size: 18,
Expand Down
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2 style="font-size:25px;color:rgb(255, 255, 255);font-weight: 300;color:rgb(22
<h2 style="font-family: 'Raleway', sans-serif;font-weight: 300;font-size:18px;color:rgb(255, 255, 255);padding-top:0px;margin-top:-10px;"> Laboratoire d'écologie intégrative </h2>
</div>
<div class="large-3 columns text-right">
<img src="/assets/img/UdeS_nouveau_blanc72dpi.png" alt="Logo" style="width:65%; height:90%;margin-top:90px;" />
<a href="https://www.usherbrooke.ca/"> <img src="/assets/img/UdeS_nouveau_blanc72dpi.png" alt="Logo" style="width:65%; height:90%;margin-top:90px;" /></a>
</div>
</div>

Expand Down
Binary file modified assets/.DS_Store
Binary file not shown.
188 changes: 188 additions & 0 deletions assets/csl/ecology.csl
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
<?xml version="1.0" encoding="utf-8"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="en-US" version="1.0" demote-non-dropping-particle="sort-only">
<info>
<title>Ecology</title>
<id>http://www.zotero.org/styles/ecology</id>
<link href="http://www.zotero.org/styles/ecology" rel="self"/>
<link href="http://esapubs.org/esapubs/AuthorInstructions.htm" rel="documentation"/>
<author>
<name>Rintze Zelle</name>
<uri>http://twitter.com/rintzezelle</uri>
</author>
<category citation-format="author-date"/>
<category field="biology"/>
<issn>0012-9658</issn>
<updated>2015-07-27T08:57:33+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<macro name="container-contributors">
<choose>
<if type="chapter paper-conference" match="any">
<text term="in" suffix=" " font-style="italic"/>
<names variable="editor translator" delimiter=", ">
<name and="text" initialize-with=". " delimiter=", "/>
<label form="long" prefix=", " suffix="."/>
</names>
</if>
</choose>
</macro>
<macro name="secondary-contributors">
<choose>
<if type="chapter paper-conference" match="none">
<names variable="editor translator" delimiter=", " prefix=" (" suffix=")">
<name and="text" initialize-with=". " delimiter=", "/>
<label form="short" prefix=", " text-case="capitalize-first"/>
</names>
</if>
</choose>
</macro>
<macro name="author">
<names variable="author">
<name name-as-sort-order="first" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
<label prefix=", "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<text variable="title"/>
</substitute>
</names>
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="text" delimiter=", " initialize-with=". "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<choose>
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
<text variable="title" form="short" font-style="italic"/>
</if>
<else>
<text variable="title" form="short" quotes="true"/>
</else>
</choose>
</substitute>
</names>
</macro>
<macro name="access">
<choose>
<if type="webpage">
<text variable="URL"/>
</if>
</choose>
</macro>
<macro name="publisher">
<group delimiter=", ">
<choose>
<if type="article-journal article-magazine" match="none">
<text variable="genre"/>
<text variable="publisher"/>
<text variable="publisher-place"/>
</if>
</choose>
</group>
</macro>
<macro name="issued">
<choose>
<if variable="issued">
<group prefix=" " suffix=".">
<date variable="issued">
<date-part name="year"/>
</date>
<choose>
<if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
<date variable="issued">
<date-part prefix=", " name="month"/>
<date-part prefix=" " name="day"/>
</date>
</if>
</choose>
</group>
</if>
<else>
<text prefix=" (" term="no date" suffix=")." form="short"/>
</else>
</choose>
</macro>
<macro name="issued-year">
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year"/>
</date>
</if>
<else>
<text term="no date" form="short"/>
</else>
</choose>
</macro>
<macro name="edition">
<choose>
<if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<choose>
<if is-numeric="edition">
<number variable="edition" form="long-ordinal" text-case="capitalize-first"/>
<text term="edition" form="long" prefix=" " suffix="."/>
</if>
<else>
<text variable="edition" suffix="."/>
</else>
</choose>
</if>
</choose>
</macro>
<macro name="locators">
<choose>
<if type="article-journal article-magazine article-newspaper" match="any">
<text variable="container-title" prefix=". "/>
<text variable="volume" prefix=" "/>
<text variable="page" prefix=":"/>
</if>
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group prefix=". " delimiter=" ">
<label variable="page" form="long" text-case="capitalize-first"/>
<text variable="page"/>
<text macro="container-contributors"/>
<text macro="secondary-contributors"/>
<text variable="container-title"/>
</group>
</else-if>
</choose>
</macro>
<macro name="citation-locator">
<group>
<label variable="locator" form="short"/>
<text variable="locator" prefix=" "/>
</group>
</macro>
<citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
<sort>
<key variable="issued"/>
<key macro="author"/>
</sort>
<layout prefix="(" suffix=")" delimiter=", ">
<group delimiter=" ">
<text macro="author-short"/>
<text macro="issued-year"/>
<text macro="citation-locator"/>
</group>
</layout>
</citation>
<bibliography hanging-indent="true" entry-spacing="0" line-spacing="2">
<sort>
<key macro="author"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
<text macro="author" suffix="."/>
<text macro="issued" suffix=" "/>
<text variable="title"/>
<text macro="locators"/>
<group delimiter=". " prefix=". ">
<text macro="edition"/>
<text macro="publisher"/>
<text macro="access"/>
</group>
</layout>
</bibliography>
</style>
Loading

0 comments on commit db2cc76

Please sign in to comment.