Skip to content

Commit b22cd75

Browse files
tsalotsalo
committed
First commit.
1 parent 90d350a commit b22cd75

File tree

255 files changed

+1279
-66918
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+1279
-66918
lines changed

‎_config.yml

+28-30
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
1-
# This is the default format.
1+
# This is the default format.
22
# For more see: http://jekyllrb.com/docs/permalinks/
3-
# permalink: /:categories/:year/:month/:day/:title
4-
permalink: /:categories/:title
3+
# permalink: /:categories/:year/:month/:day/:title
4+
permalink: /:categories/:title
55

66
exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md", ".sublime-project", ".sublime-workspace"]
77
highlighter: rouge
88

99
markdown: kramdown
1010

11-
repository: drummondlab/drummondlab.github.io
11+
repository: NBCLab/nbclab.io
1212

13-
# Themes are encouraged to use these universal variables
13+
# Themes are encouraged to use these universal variables
1414
# so be sure to set them if your theme uses them.
1515
#
16-
title : Drummond Lab
17-
tagline: Evolution and regulation of protein production and quality control
16+
title : NBC Lab
17+
tagline: Neuroinformatics and brain connectivity
1818
institution:
19-
url: http://www.uchicago.edu
20-
name: The University of Chicago
19+
url: http://www.fiu.edu
20+
name: Florida International University
2121
department:
22-
url: http://bmb.uchospitals.edu
23-
name: Biochemistry & Molecular Biology
22+
url: http://www.cn.fiu.edu
23+
name: Cognitive Neuroscience
2424
author :
25-
name : D. Allan Drummond
26-
email : [email protected]
27-
github : dad
28-
twitter : dadrummond
25+
name : Taylor Salo
26+
email : [email protected]
27+
github : tsalo
2928
# feedburner : feedname
3029

3130
# The production_url is only used when full-domain names are needed
32-
# such as sitemap.txt
31+
# such as sitemap.txt
3332
# Most places will/should use BASE_PATH to make the urls
3433
#
3534
# If you have set a CNAME (pages.github.com) set your custom domain here.
3635
# Else if you are pushing to username.github.io, replace with your username.
3736
# Finally if you are pushing to a GitHub project page, include the project name at the end.
3837
#
39-
production_url : http://drummondlab.org
38+
production_url : http://www.nbclab.io
4039

4140
# All Jekyll-Bootstrap specific configurations are namespaced into this hash
4241
#
@@ -48,11 +47,11 @@ JB :
4847
# however this value will be dynamically changed depending on your deployment situation.
4948
#
5049
# CNAME (http://yourcustomdomain.com)
51-
# DO NOT SET BASE_PATH
50+
# DO NOT SET BASE_PATH
5251
# (urls will be prefixed with "/" and work relatively)
5352
#
5453
# GitHub Pages (http://username.github.io)
55-
# DO NOT SET BASE_PATH
54+
# DO NOT SET BASE_PATH
5655
# (urls will be prefixed with "/" and work relatively)
5756
#
5857
# GitHub Project Pages (http://username.github.io/project-name)
@@ -71,7 +70,7 @@ JB :
7170
# ex: [BASE_PATH]/assets/themes/[THEME-NAME]
7271
#
7372
# Override this by defining an absolute path to assets here.
74-
# ex:
73+
# ex:
7574
# http://s3.amazonaws.com/yoursite/themes/watermelon
7675
# /assets
7776
#
@@ -103,24 +102,24 @@ JB :
103102
num_posts: 5
104103
width: 580
105104
colorscheme: light
106-
105+
107106
# Settings for analytics helper
108107
# Set 'provider' to the analytics provider you want to use.
109108
# Set 'provider' to false to turn analytics off globally.
110109
#
111110
analytics :
112111
provider : google
113-
google :
112+
google :
114113
tracking_id : 'UA-62008526-1'
115114
getclicky :
116-
site_id :
115+
site_id :
117116
mixpanel :
118117
token : '_MIXPANEL_TOKEN_'
119118
piwik :
120119
baseURL : 'myserver.tld/piwik' # Piwik installation address (without protocol)
121120
idsite : '1' # the id of the site on Piwik
122121

123-
# Settings for sharing
122+
# Settings for sharing
124123
# Sharing is for things like tweet, plusone, hn upvotes, like, linkedin
125124
# Add a tweet button => provider : tweet
126125
# Add a like button => provider : like (you also need a facebook appid)
@@ -147,20 +146,19 @@ JB :
147146
width :
148147
annotation : bubble
149148
linkedin :
150-
counter : right
151-
152-
# Settings for all other include helpers can be defined by creating
149+
counter : right
150+
151+
# Settings for all other include helpers can be defined by creating
153152
# a hash with key named for the given helper. ex:
154153
#
155154
# pages_list :
156-
# provider : "custom"
155+
# provider : "custom"
157156
#
158157
# Setting any helper's provider to 'custom' will bypass the helper code
159158
# and include your custom code. Your custom file must be defined at:
160159
# ./_includes/custom/[HELPER]
161160
# where [HELPER] is the name of the helper you are overriding.
162-
161+
163162
# allow page redirection
164163
gems:
165164
- jekyll-redirect-from
166-

‎_includes/themes/lab/default.html

+9-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap-theme.min.css" rel="stylesheet"/>
1818
<!-- Sticky Footer -->
1919
<link href="{{ ASSET_PATH }}/bootstrap/css/bs-sticky-footer.css" rel="stylesheet"/>
20-
20+
2121
<!-- Custom styles -->
2222
<link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all"/>
2323

@@ -71,7 +71,7 @@
7171
<span class="icon-bar"></span>
7272
</button>
7373
<a href="/">
74-
<img class="pull-left logo" src="{{ ASSET_PATH }}/images/logo/lab-logo.svg" type="image/svg+xml">
74+
<img class="pull-left logo" src="{{ ASSET_PATH }}/images/logo/lab-logo.png">
7575
</a>
7676
</div>
7777

@@ -86,14 +86,15 @@
8686
{% endif %}
8787
{% endfor %}
8888
{% if make_title == true %}
89+
<!-- <img class="pull-left logo" src="{{ ASSET_PATH }}/images/banner/lab-banner.png"> -->
8990
<a class="navbar-brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
9091
{% endif %}
9192
</ul>
9293
<ul class="nav navbar-nav navbar-right pull-right">
9394
{% assign pages_list = (site.pages | sort: 'navorder') %}
9495
{% assign group = 'navigation' %}
9596
{% include JB/pages_list %}
96-
<li class="dropdown nav navbar-nav">
97+
<!-- <li class="dropdown nav navbar-nav">
9798
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
9899
More <span class="caret"></span>
99100
</a>
@@ -103,7 +104,7 @@
103104
{% assign group = 'subnavigation' %}
104105
{% include JB/pages_list %}
105106
</ul>
106-
</li>
107+
</li> -->
107108
</ul>
108109
</div><!-- /.navbar-collapse -->
109110
</nav>
@@ -132,14 +133,14 @@
132133
<li><a href={{ site.institution.url }}>{{ site.institution.name }}</a></li>
133134
</ul>
134135
<ul class="nav navbar-nav navbar-right navbar-small">
135-
<li><a href='/about.html#purpose'>About</a></li>
136-
<li><a href='/about.html#join'>Join</a></li>
137-
<li><a href='/about.html#contact'>Contact</a></li>
136+
<li><a href='/about.html#about-the-site'>About the Site</a></li>
137+
<li><a href='/contact.html#join'>Join</a></li>
138+
<li><a href='/contact.html#contact'>Contact</a></li>
138139
</ul>
139140
</div><!-- /.navbar-collapse -->
140141
</div>
141142
</nav>
142-
143+
143144

144145

145146
{% include JB/analytics %}

‎_includes/themes/lab/member.html

+83-46
Original file line numberDiff line numberDiff line change
@@ -16,80 +16,93 @@
1616
<div class="title media-heading">
1717
{{ member.title }}
1818
</div>
19-
<br/>
2019
<div class="smallhead">
2120
{{ member.position }}
2221
</div>
22+
<div class="smallhead">
23+
{{ member.department }}
24+
</div>
25+
<div class="bigspacer"></div>
26+
<div class="post">
27+
{{ content }}
28+
</div>
2329
</div>
24-
</div>
30+
</div>
2531
</div>
2632

2733
<div class="bigspacer"></div>
2834

2935
<div class="row">
30-
<div class="col-md-3">
31-
{% if member.cv %}
36+
<div class="col-md-3">
37+
{% if member.site %}
38+
<div class="smallhead">
39+
Personal Site
40+
</div>
41+
<div class="pad-left note">
42+
<div class="smallspacer"></div>
43+
<i class="fa fa-user fa-fw"></i>
44+
<a class="off" href="{{ member.site }}">{{ member.site }}</a>
45+
</div>
46+
<div class="bigspacer"></div>
47+
{% endif %}
48+
{% if member.cv %}
3249
<div class="smallhead">
3350
CV
34-
</div>
51+
</div>
3552
<div class="pad-left note">
3653
<div class="smallspacer"></div>
37-
<i class="fa fa-file-text-o fa-fw"></i>
54+
<i class="fa fa-file-text-o fa-fw"></i>
3855
<a class="off" href="{{ member.cv }}">{{ member.cv | split: '/' | last }}</a>
39-
</div>
40-
<div class="bigspacer"></div>
41-
{% endif %}
42-
{% if member.twitter %}
56+
</div>
57+
<div class="bigspacer"></div>
58+
{% endif %}
59+
{% if member.twitter %}
4360
<div class="smallhead">
4461
Twitter
45-
</div>
62+
</div>
4663
<div class="pad-left note">
4764
<div class="smallspacer"></div>
4865
<i class="fa fa-twitter fa-fw"></i>
4966
<a class="off" href="https://twitter.com/{{ member.twitter }}">{{ member.twitter }}</a>
50-
</div>
51-
<div class="bigspacer"></div>
52-
{% endif %}
67+
</div>
68+
<div class="bigspacer"></div>
69+
{% endif %}
5370
{% if member.github %}
5471
<div class="smallhead">
5572
GitHub
56-
</div>
73+
</div>
5774
<div class="pad-left note">
5875
<div class="smallspacer"></div>
5976
<i class="fa fa-github-alt fa-fw"></i>
6077
<a class="off" href="https://github.com/{{ member.github }}">{{ member.github }}</a>
61-
</div>
62-
<div class="bigspacer"></div>
63-
{% endif %}
78+
</div>
79+
<div class="bigspacer"></div>
80+
{% endif %}
6481
{% if member.scholar %}
6582
<div class="smallhead">
6683
Google Scholar
67-
</div>
84+
</div>
6885
<div class="pad-left note">
6986
<div class="smallspacer"></div>
7087
<i class="fa fa-book fa-fw"></i>
7188
<a class="off" href="http://scholar.google.com/citations?user={{ member.scholar }}">{{ member.title }}</a>
72-
</div>
73-
<div class="bigspacer"></div>
74-
{% endif %}
89+
</div>
90+
<div class="bigspacer"></div>
91+
{% endif %}
7592
{% if member.email %}
7693
{% assign emailarray = member.email | split: '@' %}
7794
<div class="smallhead">
7895
Email
79-
</div>
96+
</div>
8097
<div class="pad-left note">
8198
<div class="smallspacer"></div>
8299
<i class="fa fa-inbox fa-fw"></i>
83100
{{ emailarray.first }}<span style="display:none">obfuscate</span>@{{ emailarray.last }}
84-
</div>
85-
<div class="bigspacer"></div>
86-
{% endif %}
87-
</div>
88-
<div class="col-md-8">
89-
<div class="post">
90-
{{ content }}
91101
</div>
92-
102+
<div class="bigspacer"></div>
103+
{% endif %}
104+
</div>
105+
<div class="col-md-8">
93106
{% assign lastname = member.title | split: ' ' | last %}
94107
{% for paper in site.categories.papers %}
95108
{% if paper.authors contains lastname %}
@@ -110,25 +123,49 @@
110123
{% endif %}
111124
{% endif %}
112125
{% endfor %}
113-
{% endif %}
114-
115-
{% for post in site.categories.blog %}
116-
{% if member.handle == post.author_handle %}
117-
{% assign postsq = true %}
126+
{% endif %}
127+
128+
<!-- Only show presentations on first author's page -->
129+
{% for pres in site.categories.presentations %}
130+
{% assign split_authors = pres.authors | split: ", " %}
131+
{% if split_authors[0] contains lastname %}
132+
{% assign presentationsq = true %}
133+
{% endif %}
134+
{% endfor %}
135+
136+
{% if presentationsq == true %}
137+
<div class="bigspacer"></div>
138+
<div class="head">Presentations</div>
139+
<div class="spacer"></div>
140+
{% for pres in site.categories.presentations %}
141+
{% assign split_authors = pres.authors | split: ", " %}
142+
{% if split_authors[0] contains lastname %}
143+
<p><a href="{{ pres.url }}" class="off">{{ pres.title }}</a>
144+
{% endif %}
145+
{% endfor %}
146+
{% endif %}
147+
148+
<!-- Only show posters on first author's page -->
149+
{% for poster in site.categories.posters %}
150+
{% assign split_authors = poster.authors | split: ", " %}
151+
{% if split_authors[0] contains lastname %}
152+
{% assign postersq = true %}
118153
{% endif %}
119154
{% endfor %}
120-
121-
{% if postsq == true %}
155+
156+
{% if postersq == true %}
122157
<div class="bigspacer"></div>
123-
<div class="head">Posts</div>
158+
<div class="head">Posters</div>
124159
<div class="spacer"></div>
125-
{% for post in site.categories.blog %}
126-
{% if member.handle == post.author_handle %}
127-
<p><a href="{{ post.url }}" class="off">{{ post.title }}</a>
160+
{% for poster in site.categories.posters %}
161+
{% assign split_authors = poster.authors | split: ", " %}
162+
{% if split_authors[0] contains lastname %}
163+
<p><a href="{{ poster.url }}" class="off">{{ poster.title }}</a>
128164
{% endif %}
129165
{% endfor %}
130-
{% endif %}
131-
132-
</div>
166+
{% endif %}
167+
168+
169+
</div>
133170
<div class="col-md-1"></div>
134-
</div>
171+
</div>

0 commit comments

Comments
 (0)