From 05477d57a1576073237c9a80a030089764e43d4d Mon Sep 17 00:00:00 2001 From: Taylor Salo Date: Mon, 2 Nov 2020 12:24:49 -0500 Subject: [PATCH 1/2] Reorganize projects a bit. --- _includes/themes/lab/member.html | 6 +- .../_posts/2014-08-15-physics-learning.md | 3 +- projects/_posts/2015-09-25-abcd.md | 3 +- projects/_posts/2015-12-01-mmmm.md | 3 +- projects/_posts/2016-05-01-hiv-cannabis.md | 3 +- projects/_posts/2016-08-17-athena.md | 3 +- projects/_posts/2017-04-03-pace.md | 3 +- projects/_posts/2017-09-20-ace.md | 3 +- projects/_posts/2018-01-15-nimare.md | 3 +- projects/_posts/2018-01-16-metacurious.md | 3 +- projects/_posts/2018-10-05-diva.md | 11 +- projects/_posts/2018-10-05-mip.md | 3 +- projects/_posts/2018-10-05-seaas.md | 3 +- projects/_posts/template.md | 3 +- projects/index.html | 117 +++++++++++++++--- 15 files changed, 131 insertions(+), 39 deletions(-) diff --git a/_includes/themes/lab/member.html b/_includes/themes/lab/member.html index 350062d6..2a0561ec 100755 --- a/_includes/themes/lab/member.html +++ b/_includes/themes/lab/member.html @@ -203,8 +203,10 @@ {% for project in site.categories.projects %} {% if project.contributors contains member.handle %}

- {% if project.tags contains "software" %} - [SOFTWARE] {{ project.title }} + {% if project.type == "software" %} + [SOFTWARE] {{ project.title }} + {% elsif project.type == "pilot" %} + [PILOT] {{ project.title }} {% else %} {{ project.title }} {% endif %} diff --git a/projects/_posts/2014-08-15-physics-learning.md b/projects/_posts/2014-08-15-physics-learning.md index 8167b0a3..a1cef699 100755 --- a/projects/_posts/2014-08-15-physics-learning.md +++ b/projects/_posts/2014-08-15-physics-learning.md @@ -3,7 +3,8 @@ layout: project title: "Physics Learning: Exploring the Neural Mechanisms of Physics Learning" contributors: [alaird, jbartley, agonzalez, jforeman, calvarez] handle: physics-learning -status: defunct +status: analysis +type: dataset # Optional website: diff --git a/projects/_posts/2015-09-25-abcd.md b/projects/_posts/2015-09-25-abcd.md index b2217507..82421641 100755 --- a/projects/_posts/2015-09-25-abcd.md +++ b/projects/_posts/2015-09-25-abcd.md @@ -3,7 +3,8 @@ layout: project title: "ABCD: Adolescent Brain Cognitive Development" contributors: [alaird, msutherland, mriedel, kbottenhorn, lhill, rpintos, cgreaves, calvarez, lucros, jforeman, darencibia, amoor] handle: abcd -status: current +status: collection +type: dataset # Optional website: "https://abcdstudy.org/" diff --git a/projects/_posts/2015-12-01-mmmm.md b/projects/_posts/2015-12-01-mmmm.md index e60aaac8..8cb5b122 100755 --- a/projects/_posts/2015-12-01-mmmm.md +++ b/projects/_posts/2015-12-01-mmmm.md @@ -3,7 +3,8 @@ layout: project title: "MMMM: My Mind & My Money" contributors: [msutherland, alaird, rpoudel] handle: MMMM -status: defunct +status: analysis +type: dataset # Optional website: diff --git a/projects/_posts/2016-05-01-hiv-cannabis.md b/projects/_posts/2016-05-01-hiv-cannabis.md index 7f0d81bc..328f92a9 100755 --- a/projects/_posts/2016-05-01-hiv-cannabis.md +++ b/projects/_posts/2016-05-01-hiv-cannabis.md @@ -3,7 +3,8 @@ layout: project title: "HIV/Cannabis: Impact of HIV and Cannabis on Brain Function" contributors: [msutherland, jflannery, kcrooks, pvieraperez] handle: hiv_cannabis -status: current +status: analysis +type: dataset # Optional website: diff --git a/projects/_posts/2016-08-17-athena.md b/projects/_posts/2016-08-17-athena.md index 200b4107..e46b2915 100755 --- a/projects/_posts/2016-08-17-athena.md +++ b/projects/_posts/2016-08-17-athena.md @@ -3,7 +3,8 @@ layout: project title: "ATHENA: Integrative Knowledge Modeling in Cognitive Neuroimaging" contributors: [alaird, mriedel, tsalo, agonzalez, jforeman] handle: athena -status: defunct +status: complete +type: software # Optional website: "https://tsalo.github.io/athena-web/" diff --git a/projects/_posts/2017-04-03-pace.md b/projects/_posts/2017-04-03-pace.md index dccf2348..fb1c0e16 100644 --- a/projects/_posts/2017-04-03-pace.md +++ b/projects/_posts/2017-04-03-pace.md @@ -3,7 +3,8 @@ layout: project title: "PACE: Neuroimaging meta-analytics for addiction- Nodes, networks, and new heuristics" contributors: [alaird, msutherland, mriedel, jflannery, rpoudel] handle: pace -status: current +status: analysis +type: dataset # Optional website: diff --git a/projects/_posts/2017-09-20-ace.md b/projects/_posts/2017-09-20-ace.md index a108c785..8397ddc7 100644 --- a/projects/_posts/2017-09-20-ace.md +++ b/projects/_posts/2017-09-20-ace.md @@ -3,7 +3,8 @@ layout: project title: "ACE: Antecedents and consequences of electronic nicotine delivery systems in underrepresented youth" contributors: [msutherland, jflannery, kcrooks, pvieraperez, nhidmi, bmadan, bsutherland, omanresa] handle: ace -status: current +status: collection +type: dataset # Optional website: https://rcmi.fiu.edu/ace-project/ diff --git a/projects/_posts/2018-01-15-nimare.md b/projects/_posts/2018-01-15-nimare.md index fccb2852..b340b960 100644 --- a/projects/_posts/2018-01-15-nimare.md +++ b/projects/_posts/2018-01-15-nimare.md @@ -3,7 +3,8 @@ layout: project title: "NiMARE: Neuroimaging Meta-Analysis Research Environment" contributors: [tsalo, kbottenhorn, mriedel, alaird] handle: nimare -status: current +status: analysis +type: software # Optional website: https://nimare.readthedocs.io/en/latest/ diff --git a/projects/_posts/2018-01-16-metacurious.md b/projects/_posts/2018-01-16-metacurious.md index 0f9417f9..7914fcb1 100644 --- a/projects/_posts/2018-01-16-metacurious.md +++ b/projects/_posts/2018-01-16-metacurious.md @@ -3,7 +3,8 @@ layout: project title: "metaCurious" contributors: [kbottenhorn] handle: metacurious -status: current +status: analysis +type: software # Optional website: "https://metacurious.org" diff --git a/projects/_posts/2018-10-05-diva.md b/projects/_posts/2018-10-05-diva.md index e3bc2712..0a148f7c 100644 --- a/projects/_posts/2018-10-05-diva.md +++ b/projects/_posts/2018-10-05-diva.md @@ -3,7 +3,8 @@ layout: project title: "DIVA: Dense investigation of variability in affect" contributors: [alaird, tsalo, kbottenhorn] handle: diva -status: defunct +status: analysis +type: pilot # Optional website: @@ -23,9 +24,9 @@ osf: --- {% include JB/setup %} -DIVA is a 3-month longitudinal study in which we acquired weekly neuroimaging and electrophysiological data, in addition to biweekly endocrine, neuropsychological, and actigraphic data for a small sample of ~3 participants to capture fluctuations in the brain, sleep, exercise, mood, and stress over the course of three complete menstrual cycles. -Participants completed twice-weekly self-report questionnaires about their sleep, exercise, mood, stress, contraceptive use, and physical state; weekly 2-hour MRI sessions, including an assortment of cognitive tasks in addition to naturalistic movie-watching, resting, and structural scans, with concurrent electrocardiogram, electrodermal activity, and respiration recordings; twice-weekly vocal recordings; and twice weekly saliva sample collection, for measuring hormones. -Additionally, participants wore FitBit activity trackers for the duration of the study, which provide measures of heart rate, sleep, exercise, etc. daily over the course of the study. -These data will provide an insight into sources of variability in brain structure and function, across cognitive and behavioral contexts, as well as how they interact over the course of everyday life. +DIVA is a 3-month longitudinal study in which we acquired weekly neuroimaging and electrophysiological data, in addition to biweekly endocrine, neuropsychological, and actigraphic data for a small sample of ~3 participants to capture fluctuations in the brain, sleep, exercise, mood, and stress over the course of three complete menstrual cycles. +Participants completed twice-weekly self-report questionnaires about their sleep, exercise, mood, stress, contraceptive use, and physical state; weekly 2-hour MRI sessions, including an assortment of cognitive tasks in addition to naturalistic movie-watching, resting, and structural scans, with concurrent electrocardiogram, electrodermal activity, and respiration recordings; twice-weekly vocal recordings; and twice weekly saliva sample collection, for measuring hormones. +Additionally, participants wore FitBit activity trackers for the duration of the study, which provide measures of heart rate, sleep, exercise, etc. daily over the course of the study. +These data will provide an insight into sources of variability in brain structure and function, across cognitive and behavioral contexts, as well as how they interact over the course of everyday life. DIVA was launched in February 2020 and was unfortunately discontinued in March 2020 due to the COVID-19 pandemic. diff --git a/projects/_posts/2018-10-05-mip.md b/projects/_posts/2018-10-05-mip.md index fd60c3c0..82f6cfd3 100644 --- a/projects/_posts/2018-10-05-mip.md +++ b/projects/_posts/2018-10-05-mip.md @@ -3,7 +3,8 @@ layout: project title: "MIP: Motivation and Imaging Pilot" contributors: [msutherland, mriedel] handle: mip -status: defunct +status: complete +type: pilot # Optional website: diff --git a/projects/_posts/2018-10-05-seaas.md b/projects/_posts/2018-10-05-seaas.md index 78fd6265..8436c637 100644 --- a/projects/_posts/2018-10-05-seaas.md +++ b/projects/_posts/2018-10-05-seaas.md @@ -3,7 +3,8 @@ layout: project title: "SEAAS: Social and Emotional Aspects of Academic Success" contributors: [alaird, mriedel, kbottenhorn, rpintos, tsalo] handle: seass -status: defunct +status: complete +type: pilot # Optional website: diff --git a/projects/_posts/template.md b/projects/_posts/template.md index 6cfe8dfc..a1239328 100644 --- a/projects/_posts/template.md +++ b/projects/_posts/template.md @@ -3,7 +3,8 @@ layout: project title: contributors: [] handle: -status: defunct or current +status: collection, analysis, or complete +type: dataset, pilot, or software # Optional website: diff --git a/projects/index.html b/projects/index.html index f1d47a19..2ceee73f 100644 --- a/projects/index.html +++ b/projects/index.html @@ -12,14 +12,20 @@ {% endif %} {% endfor %} -{% assign current = "" | split: "" %} -{% assign defunct = "" | split: "" %} +{% assign software = "" | split: "" %} +{% assign collecting = "" | split: "" %} +{% assign analyzing = "" | split: "" %} +{% assign complete = "" | split: "" %} {% assign other = "" | split: "" %} {% for item in site.categories.projects %} - {% if item.status == "current" %} - {% assign current = current | push: item %} - {% elsif item.status == "defunct" %} - {% assign defunct = defunct | push: item %} + {% if item.type == "software" %} + {% assign software = software | push: item %} + {% elsif item.status == "collection" %} + {% assign collecting = collecting | push: item %} + {% elsif item.status == "analysis" %} + {% assign analyzing = analyzing | push: item %} + {% elsif item.status == "complete" %} + {% assign complete = complete | push: item %} {% else %} {% assign other = other | push: item %} {% endif %} @@ -33,17 +39,14 @@ {{ researchpage.content }}

-
Current Projects
+
Current Projects (Active Data Collection)
- {% assign border_color = "000000" %} - {% tablerow product in current cols:2 %} + {% tablerow product in collecting cols:2 %} {% if product.image %} {% assign image = product.image %} - {% elsif product.tags contains "software" %} - {% assign image = "/assets/images/placeholder-foss.png" %} {% else %} {% assign image = "/assets/images/placeholder.png" %} {% endif %} @@ -52,12 +55,12 @@
- +
- {% if product.tags contains "software" %} - [SOFTWARE] {{ product.title }} + {% if product.type contains "pilot" %} + [PILOT] {{ product.title }} {% else %} {{ product.title }} {% endif %} @@ -74,16 +77,90 @@
-
Completed Projects
+
Current Projects (Active Data Analysis)
- {% tablerow product in defunct cols:2 %} + {% tablerow product in analyzing cols:2 %} + {% if product.image %} + {% assign image = product.image %} + {% else %} + {% assign image = "/assets/images/placeholder.png" %} + {% endif %} + +
+
+
+ + + +
+
+ {% if product.type contains "pilot" %} + [PILOT] {{ product.title }} + {% else %} + {{ product.title }} + {% endif %} +
+
+ {{ product.tagline }} +
+
+
+
+
+
+ {% endtablerow %} +
+ +
+
Software
+
+
+ + + {% tablerow product in software cols:2 %} {% if product.image %} {% assign image = product.image %} - {% elsif product.tags contains "software" %} + {% else %} {% assign image = "/assets/images/placeholder-foss.png" %} + {% endif %} + +
+
+
+ + + +
+
+ {% if product.type contains "pilot" %} + [PILOT] {{ product.title }} + {% else %} + {{ product.title }} + {% endif %} +
+
+ {{ product.tagline }} +
+
+
+
+
+
+ {% endtablerow %} +
+ +
+
Completed Projects
+
+
+ + + {% tablerow product in complete cols:2 %} + {% if product.image %} + {% assign image = product.image %} {% else %} {% assign image = "/assets/images/placeholder.png" %} {% endif %} @@ -92,12 +169,12 @@
- +
- {% if product.tags contains "software" %} - [SOFTWARE] {{ product.title }} + {% if product.type contains "pilot" %} + [PILOT] {{ product.title }} {% else %} {{ product.title }} {% endif %} From 28dee3c593225bcc2962b5505cd20df5e5ac1b4a Mon Sep 17 00:00:00 2001 From: Taylor Salo Date: Mon, 2 Nov 2020 12:29:47 -0500 Subject: [PATCH 2/2] Frame colors. --- projects/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/index.html b/projects/index.html index 2ceee73f..8546347e 100644 --- a/projects/index.html +++ b/projects/index.html @@ -55,7 +55,7 @@
- +
@@ -93,7 +93,7 @@
- +
@@ -131,7 +131,7 @@
- +
@@ -169,7 +169,7 @@
- +