Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
742f638
Merge pull request #214 from PatoViera/master
tsalo Jan 27, 2020
224fcd1
Fix CV URL.
tsalo Jan 27, 2020
df084ec
Add files via upload
kcrooks1006 Jan 29, 2020
cde86ab
Add files via upload
kcrooks1006 Jan 29, 2020
662d904
Rename 2020-01-29-crooks-katharine.md to 2017-04-08-crooks-katharine.md
kcrooks1006 Jan 29, 2020
a439fe2
Merge pull request #215 from kcrooks1006/master
kcrooks1006 Jan 29, 2020
902df02
Update 2017-09-20-electronic-nicotine-youth.md
kcrooks1006 Jan 29, 2020
424a9b4
Update 2016-05-01-hiv-cannabis.md
kcrooks1006 Jan 29, 2020
8ca4310
Merge branch 'master' into master
PatoViera Jan 29, 2020
d3b3907
Add articles and merge papers with preprints.
tsalo Jan 31, 2020
6c41f66
Merge pull request #216 from tsalo/master
tsalo Jan 31, 2020
0f6f1b6
Update links in DIVA page.
tsalo Feb 4, 2020
a4ae090
Merge pull request #217 from tsalo/master
tsalo Feb 4, 2020
49dea55
Add new article.
tsalo Feb 18, 2020
4f13da3
Whoops save the thing.
tsalo Feb 18, 2020
3ef92f9
Merge pull request #218 from tsalo/master
tsalo Feb 18, 2020
e64028a
Add new articles.
tsalo Feb 27, 2020
3401f8e
Merge pull request #219 from tsalo/master
tsalo Feb 27, 2020
1dd28ca
Add new journal covers.
tsalo Feb 27, 2020
8a9276a
Merge pull request #220 from tsalo/master
tsalo Feb 27, 2020
30b1ffd
Add article.
tsalo Mar 18, 2020
61046de
Merge pull request #221 from tsalo/master
tsalo Mar 18, 2020
4af524f
Add NARPS paper.
tsalo Jun 9, 2020
49d9cb7
Merge pull request #222 from tsalo/master
tsalo Jun 9, 2020
c19c9e2
Change Mike to alumnus.
tsalo Jun 11, 2020
ac170e0
Merge pull request #223 from tsalo/master
tsalo Jun 11, 2020
f1343d9
Allow placeholders for alumni.
tsalo Jun 11, 2020
a2588ac
Merge pull request #225 from tsalo/master
tsalo Jun 11, 2020
b0de5be
FIX.
tsalo Jun 11, 2020
20ba5ea
Merge pull request #226 from tsalo/master
tsalo Jun 11, 2020
5bae841
added flannery cpdd talk (#227)
Jun 16, 2020
90bbeb6
Add ACE paper and drop abandoned software projects (#228)
tsalo Jul 7, 2020
9489d74
Add talks. (#229)
tsalo Jul 8, 2020
a1983fe
Add slides to Angie's talk. (#230)
tsalo Jul 13, 2020
85c2a2d
Add new paper. (#231)
tsalo Jul 22, 2020
d6c7198
Add IBMA preprint (#232)
tsalo Jul 26, 2020
2673210
Add preprint from February. (#233)
tsalo Jul 26, 2020
7649df7
Add Katie and Cody's OHBM posters. (#234)
tsalo Jul 26, 2020
646dd7f
Add NHA talk (#235)
tsalo Jul 29, 2020
2d2cbf3
update news post (#236)
Jul 30, 2020
959bb3f
Add .circleci/config.yml (#237)
tsalo Jul 30, 2020
070487a
Update config.yml (#238)
tsalo Jul 30, 2020
4fdec34
Fix config. (#239)
tsalo Jul 30, 2020
993679f
Delete Flannery_cpdd_2020.png (#240)
tsalo Jul 30, 2020
96b4aeb
update julio profile (#247)
JulioAPeraza Aug 24, 2020
e31972e
Split current and completed projects. (#248)
tsalo Aug 28, 2020
be8e5dd
Add new Hawes paper. (#249)
tsalo Aug 28, 2020
7dc7a73
[TST] Add test for team photo sizes (#251)
tsalo Aug 28, 2020
b594f44
Resize team photos and improve spacing (#252)
tsalo Aug 28, 2020
8fa6a8f
Update stuff (#253)
tsalo Aug 29, 2020
34aba73
Add Anthony's new preprint. (#254)
tsalo Sep 2, 2020
b48a2ee
Update 2017-04-09-sutherland-benjelene.md (#255)
Benjelene Sep 11, 2020
a6fbdae
Add new article. (#256)
tsalo Sep 22, 2020
5bc89e9
Update Rosario's profile (#257)
rpintosl Sep 28, 2020
261b935
Improve documentation, remove LESS, and remove extra theme (#258)
tsalo Oct 11, 2020
48ad529
Add Ebrahimi Kalan et al. (2020) (#260)
tsalo Oct 26, 2020
8240665
Reorganize files and update content (#262)
tsalo Oct 27, 2020
1b56189
Clean up banner (#263)
tsalo Oct 27, 2020
b4f33f2
Update personal bio & DIVA information (#266)
Oct 30, 2020
a6087db
Reorganize metadata a bit. (#268)
tsalo Oct 30, 2020
f1ab328
Remove poster. (#269)
tsalo Oct 30, 2020
bb61885
Add Salo Oldenburg talk (#270)
tsalo Nov 2, 2020
7f19167
Reorganize projects (#271)
tsalo Nov 2, 2020
f0fe6db
Standardize project image sizes (#272)
tsalo Nov 2, 2020
71d8ed6
Reorder projects from oldest to newest (#273)
tsalo Nov 2, 2020
fa1f2b2
Update logos. (#274)
tsalo Nov 2, 2020
0517e86
Update 2019-05-02-hill-sans-poster.md
angielaird Nov 3, 2020
ef1264a
Update 2019-05-02-hill-sans-poster.md
angielaird Nov 3, 2020
44baeff
Update 2019-05-02-hill-sans-poster.md
angielaird Nov 3, 2020
ca83cd3
Update 2019-06-12-bowen-nicotine-ohbm.md
angielaird Nov 3, 2020
01e07d8
Update 2019-05-02-poudel-sans-poster.md
angielaird Nov 3, 2020
e4dc04a
Update 2019-05-02-flannery-sans-poster.md
angielaird Nov 3, 2020
2854a9a
Update 2018-12-13-sutherland-acnp-poster.md
angielaird Nov 3, 2020
3deb410
Update 2018-11-05-poudel-sfn-poster.md
angielaird Nov 3, 2020
b8710f9
Update 2017-11-15-flannery-sfn-poster.md
angielaird Nov 3, 2020
9748c11
Update 2017-06-28-boeving-rdoc-poster.md
angielaird Nov 3, 2020
10b1494
Update 2017-06-26-flannery-reward-processing-poster.md
angielaird Nov 3, 2020
b8a6435
Update 2017-06-26-bottenhorn-habenula-poster.md
angielaird Nov 3, 2020
3e6b86f
Update 2016-06-27-riedel-insula-poster.md
angielaird Nov 3, 2020
182355e
Update 2016-06-27-flannery-habenula-poster.md
angielaird Nov 3, 2020
fd85f1c
Update 2016-06-27-falcone-mindfulness-poster.md
angielaird Nov 3, 2020
9c929f8
Update 2020-08-29-samartsidis-estimating-the-prevalence.md
angielaird Nov 3, 2020
29835c2
Update 2020-08-29-samartsidis-estimating-the-prevalence.md
angielaird Nov 3, 2020
a404350
Update 2020-07-11-morawetz-multiple-largescale-neural.md
angielaird Nov 3, 2020
f0057c4
Update 2020-02-04-poudel-common-and-distinct.md
angielaird Nov 3, 2020
5c7acc0
Update 2020-01-22-waller-disruptive-behavior-problems.md
angielaird Nov 3, 2020
e0f8440
Update 2019-12-23-flannery-metaanalytic-clustering-dissociates.md
angielaird Nov 3, 2020
01786d7
Update 2019-10-22-flannery-habenular-and-striatal.md
angielaird Nov 3, 2020
4ef8ff2
Update 2019-05-23-yanes-effects-of-cannabinoid.md
angielaird Nov 3, 2020
cea6157
Update 2019-03-02-bottenhorn-cooperating-yet-distinct.md
angielaird Nov 3, 2020
e016772
Update 2018-02-26-riedel-dissociable-meta-analytic-brain.md
angielaird Nov 3, 2020
6916acd
Update 2018-02-01-sutherland-functional-neurocircuits-and.md
angielaird Nov 3, 2020
14e3b26
Update 2018-01-09-muller-ten-simple-rules.md
angielaird Nov 3, 2020
3021982
Update 2018-01-01-yanes-neuroimaging-meta-analysis-of.md
angielaird Nov 3, 2020
fe2b4ee
Add Donisha Smith's profile (#275)
Nov 5, 2020
56e388d
Update 2015-04-22-home.md
angielaird Nov 12, 2020
5ab2cbd
Change member photos to circular. (#277)
tsalo Nov 16, 2020
883ac19
Update Taylor Salo's profile (#276)
tsalo Nov 16, 2020
3497a12
Update 2015-04-22-home.md
angielaird Dec 4, 2020
a6dbd69
[ENH] Add NIH biosketch field (#279)
tsalo Dec 18, 2020
d8df759
Improve biosketch. (#280)
tsalo Dec 18, 2020
b509230
Show social element in hover text (#281)
tsalo Dec 18, 2020
af9fba6
Use my CV from my website. (#282)
tsalo Dec 22, 2020
4064151
Create jekyll.yml (#283)
tsalo Dec 22, 2020
a81d85f
Make Google Drive URL determination function more flexible. (#284)
tsalo Dec 22, 2020
bf197c5
Add new paper. (#285)
tsalo Jan 1, 2021
bfb6a1a
Add Publons.
tsalo Jan 14, 2021
daf38c0
Add new article and talk. (#286)
tsalo Jan 22, 2021
34efe7b
Fix typo.
tsalo Jan 22, 2021
93670bc
Add Katie's preprint. (#287)
tsalo Jan 27, 2021
775b041
New paper (#288)
tsalo Feb 15, 2021
9869ed4
Update CV link (#289)
Mar 8, 2021
e096e07
Add Betsy Alas (#290)
tsalo Mar 10, 2021
f59e540
Add Katie and Jessica F's new preprints (#291)
tsalo Apr 26, 2021
5ef04ee
Fix journal logo link.
tsalo Apr 26, 2021
1322bc7
Replace Witt preprint with article. (#292)
tsalo Jun 2, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 2.1

jobs:
run_pytest:
docker:
- image: continuumio/miniconda3
working_directory: /tmp/src/NBCLab.github.io
steps:
- checkout
- run:
name: Run tests
command: |
conda create -n py36_env python=3.6 numpy pytest matplotlib -yq
source activate py36_env
pytest /tmp/src/NBCLab.github.io
workflows:
version: 2.1
build:
jobs:
- run_pytest
20 changes: 20 additions & 0 deletions .github/workflows/jekyll.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Jekyll site CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Build the site in the jekyll/builder container
run: |
docker run \
-v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
jekyll/builder:latest /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future"
140 changes: 140 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,143 @@ Thumbs.db

.rbenv-version
.rvmrc

# Python stuff
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"[html]": {
"editor.tabSize": 4
}
}
93 changes: 85 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,95 @@ bundle exec jekyll serve
Open a browser and go to `localhost:4000/`. Any changes you make to any of the repository's files, except `_config.yml`, will be reflected on the site after refreshing the page. If you edit `_config.yml`, you will need to quit the local server (`Ctrl+C`) and rebuild the site locally in order to see your changes.

# How the site is set up
The structure can be a little confusing, but I'll try to outline the basics. Just to be clear, I (TS) don't know much, and everything I do know is from playing with the site for a day and a half. Still, here is goes:
The structure can be a little confusing, but I'll try to outline the basics.
Still, here it goes:

The different pages (e.g., News, Papers, Team) are organized in separate folders. Each folder contains a file for the page itself (`index.html`) and a folder containing markdown files with the different entries for the page (`_posts/`). Whether adding a new lab member, paper, poster, presentation, project, or piece of news, you will generally be creating one of these markdown files.
## Framework and tools

The markdown files have two sections, a header with metadata and the content below. How the post is formatted on the general page (e.g., how Taylor Salo's picture fits into the [Team webpage](https://nbclab.github.io/team/)) is determined by the `index.html` file mentioned above. How the post is formatted on its own page (e.g., [Taylor Salo's member page](https://nbclab.github.io/team/taylor-salo)) is determined by the theme for that post's category. Themes are saved as html files in `_includes/themes/lab/`. You can change these themes, but be aware that they will affect all other pages of the same type. For example, if you resize the photo field in the lab member theme file, then the photos of all lab members will be affected.
- NOTE: You might assume that the themes or similar info are in the `_layouts` folder, but that appears to be a red herring. Those pages just call the files in the `themes` folder.
- Ultimately, if it is possible, we would like simplify this structure.
This website (and most GitHub Pages-based sites) uses [Jekyll](https://jekyllrb.com).
Jekyll uses HTML, CSS, [Liquid](https://shopify.github.io/liquid/), and Markdown to produce [static](https://en.wikipedia.org/wiki/Static_web_page) websites.
This website also uses the Bootstrap framework via [JekyllBootstrap](http://jekyllbootstrap.com) and SASS (a CSS preprocessing tool).

Pictures, pdfs, etc. can be placed in `assets/`. However, because GitHub repositories are limited in terms of space, I would ultimately like to shift toward using a public Google Drive folder or something similar.
- When adding pictures of posters or presentations, please export the pdf (assuming that's what you have) to png format, and then resample to a lower resolution. For posters, we use a width of 250 pixels with whatever height scales proportionally with that, and a resolution of 72 pixels per inch. For presentations, please save just the first slide for the page thumbnail, and use a width of 1000 pixels (again, with whatever height matches this) and a resolution of 150 pixels per inch.
Okay, so what does this all mean to the layperson?

The markdown files for the homepage, the "About the site" page, and the "Contact us" page are all located in `misc/_posts/`. I only mention this because it wasn't obvious to me when I went searching for those pages.
HTML is the basic language for making websites.
Everything is more or less built off of HTML, but HTML is ugly and writing raw HTML generally means a lot of duplication that is hard to maintain.

Markdown is the simple markup language used throughout GitHub; Jekyll lets you specify content in Markdown files (easy to write) that is rendered into HTML files automatically, instead of having to work directly with HTML (harder to write).

CSS and SASS provide style-sheets, which are sets of custom formatting commands that the HTML code can use.
We currently only have a SASS style-sheet.

Liquid is a "template language" that lets you write more standard code (e.g., working with variables) in your HTML and Markdown files.
Liquid is essential, but frustratingly limited.

Bootstrap is a CSS framework with CSS and Javascript design templates.

JekyllBootstrap shares a number of shortcuts, including interfaces for social networking sites like Twitter.
It is also what lets us switch between themes (more on that later), which we probably don't even want.

## Organization

The different pages (e.g., News, Papers, Team) are organized in separate folders.
Each folder contains a file for the page itself (`index.html`) and a folder containing markdown files with the different entries for the page (`_posts/`).

The markdown files for the homepage, the "About the site" page, and the "Contact us" page are all located in `misc/_posts/`.

Whether adding a new lab member, paper, poster, presentation, project, or piece of news, you will generally be creating one of these markdown files in `[type]/_posts/` where `[type]` is the type of post.

Each post (i.e., markdown file) is also rendered as its own page, with a link on the main page for the type.
For example, an individual poster corresponds to one of the markdown files in `posters/_posts/`.
That poster has its own page, and there is a link to that page on the main "Posters" page (which is generated from `posters/index.html`).

The markdown files have two sections, a header with metadata and the content below.
How the post is formatted on the general page (e.g., how Taylor Salo's picture fits into the [Team webpage](https://nbclab.github.io/team/)) is determined by the `index.html` file mentioned above.
How the post is formatted on its own page (e.g., [Taylor Salo's member page](https://nbclab.github.io/team/taylor-salo)) is determined by the theme file for that post's category.

## Themes

This website is set up so that you can switch between "themes" (i.e., sets of HTML and CSS patterns).
Files controlling the formatting of the different themes are located in `_includes/themes/[theme]/*.html` and `assets/themes[theme]/`.
The default theme for the website is "lab", but we may add other ones in the future.

Which theme is in use is controlled by the files in `_layouts`.
The theme can be changed with commands in the Rakefile.
The command to change the theme is `rake theme:switch name="[theme]"`, where `[theme]` is replaced with whatever the target theme is.
**There is very little reason to play with the themes.
Focus your formatting efforts on the `lab` theme.**

To be honest, we should probably just remove the theme functionality completely, except that it's packaged as part of JekyllBootstrap.

## Changing the formatting

The basic HTML file template is `_includes/themes/lab/default.html`.
The actual formatting for the different post types is going to be controlled by the files in `_includes/themes/lab`.
The formatting for the different group pages (e.g., "Team") is primarily controlled by the `[type]/index.html` files.

The files in `_layouts` should be left alone.
They are just there to make it easier to switch themes.

### Meta-formatting

Edit the SASS file at `_includes/themes/lab/css/style.scss`.
Don't bother messing with files in `_includes/themes/twitter`, because we don't use that theme.
Don't bother messing with files in `_includes/themes/lab/bootstrap/`, because that is a prepackaged framework.

## Assets

Pictures, pdfs, etc. can be placed in `assets/`.
Because GitHub repositories are limited in terms of space, we tend to use low-resolution images.
Any important, high-resolution files that do not need to be directly rendered on the website should be stored elsewhere (e.g., Google Drive) and linked to on the website.

In order to reduce the amount of data we use with images, we have rules for image sizes:

| Category | Width (pixels) | Height (pixels) |
|------------------|----------------|-----------------|
| Lab member photo | 200 | 200 |
| Journal cover | 150 | variable |
| Poster | 250 | variable |
| Talk | 1000 | variable |
| Project | 1000 | variable |
| News | 1000 | variable |

## License

Expand Down
6 changes: 3 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ highlighter: rouge

markdown: kramdown

repository: NBCLab/nbclab.io
repository: NBCLab/nbclab.github.io

# Themes are encouraged to use these universal variables
# so be sure to set them if your theme uses them.
Expand All @@ -35,7 +35,7 @@ author :
# Else if you are pushing to username.github.io, replace with your username.
# Finally if you are pushing to a GitHub project page, include the project name at the end.
#
production_url : http://www.nbclab.io
production_url : http://www.nbclab.github.io

# All Jekyll-Bootstrap specific configurations are namespaced into this hash
#
Expand Down Expand Up @@ -136,7 +136,7 @@ JB :
via :
count :
facebook :
appid : 123
appid :
layout : button_count
font :
faces : false
Expand Down
11 changes: 8 additions & 3 deletions _includes/functions/get_drive_url.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{% assign temp = include.url | split: 'open?id=' %}
{% assign temp2 = temp[1] %}
{% assign out_url = 'https://drive.google.com/uc?export=&confirm=no_antivirus&id='| append: temp2 %}
{% assign url = include.url %}
{% if url contains 'open?id=' %}
{% assign temp = url | split: 'open?id=' %}
{% assign temp2 = temp[1] %}
{% assign out_url = 'https://drive.google.com/uc?export=&confirm=no_antivirus&id='| append: temp2 %}
{% else %}
{% assign out_url = url %}
{% endif %}
{{ out_url }}
Loading