NBCLab · tsalo · Nov 2, 2020 · Nov 2, 2020 · Nov 2, 2020
diff --git 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 %}
 						  <div class="pad-left note"><p>
-							{% if project.tags contains "software" %}
-								<a href="{{ project.url }}" class="off">[SOFTWARE] {{ project.title }}</a>
+							{% if project.type == "software" %}
+                                <a href="{{ project.url }}" class="off">[SOFTWARE] {{ project.title }}</a>
+                            {% elsif project.type == "pilot" %}
+                                <a href="{{ project.url }}" class="off">[PILOT] {{ project.title }}</a>
 							{% else %}
 								<a href="{{ project.url }}" class="off">{{ project.title }}</a>
 							{% endif %}

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 }}
 
 <div class="bigspacer"></div>
-<div class="title text-center">Current Projects</div>
+<div class="title text-center">Current Projects (Active Data Collection)</div>
 <div class="smallspacer"></div>
 <hr/>
 
 <table align="center"; width=1250px>
-    {% 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 @@
       <div class="media" style="width:525px; height:150px">
         <div class="media">
             <a class="pull-left" href="{{ product.url }}">
-            <img width=100 class="media-object" src="{{ image }}" style="border:5px solid #{{ border_color }};">
+            <img width=100 class="media-object" src="{{ image }}" style="border:3px solid #018b23;">
             </a>
             <div class="media-body">
                 <div class="smallhead media-heading">
-                    {% if product.tags contains "software" %}
-                        <a href="{{ product.url }}" class="off">[SOFTWARE] {{ product.title }}</a>
+                    {% if product.type contains "pilot" %}
+                        <a href="{{ product.url }}" class="off">[PILOT] {{ product.title }}</a>
                     {% else %}
                         <a href="{{ product.url }}" class="off">{{ product.title }}</a>
                     {% endif %}
@@ -74,16 +77,90 @@
 </table>
 
 <div class="bigspacer"></div>
-<div class="title text-center">Completed Projects</div>
+<div class="title text-center">Current Projects (Active Data Analysis)</div>
+<div class="smallspacer"></div>
+<hr />
+
+<table align="center" ; width=1250px>
+    {% tablerow product in analyzing cols:2 %}
+    {% if product.image %}
+        {% assign image = product.image %}
+    {% else %}
+        {% assign image = "/assets/images/placeholder.png" %}
+    {% endif %}
+
+    <div class="col-md-2.5 paperbox" style="min-width: 575px">
+        <div class="media" style="width:525px; height:150px">
+            <div class="media">
+                <a class="pull-left" href="{{ product.url }}">
+                    <img width=100 class="media-object" src="{{ image }}" style="border:3px solid #ff8d00;">
+                </a>
+                <div class="media-body">
+                    <div class="smallhead media-heading">
+                        {% if product.type contains "pilot" %}
+                            <a href="{{ product.url }}" class="off">[PILOT] {{ product.title }}</a>
+                        {% else %}
+                            <a href="{{ product.url }}" class="off">{{ product.title }}</a>
+                        {% endif %}
+                    </div>
+                    <div class="media-body">
+                        {{ product.tagline }}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="smallspacer"></div>
+    {% endtablerow %}
+</table>
+
+<div class="bigspacer"></div>
+<div class="title text-center">Software</div>
 <div class="smallspacer"></div>
 <hr />
 
 <table align="center" ; width=1250px>
-    {% tablerow product in defunct cols:2 %}
+    {% 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 %}
+
+    <div class="col-md-2.5 paperbox" style="min-width: 575px">
+        <div class="media" style="width:525px; height:150px">
+            <div class="media">
+                <a class="pull-left" href="{{ product.url }}">
+                    <img width=100 class="media-object" src="{{ image }}" style="border:3px solid #7774c3;">
+                </a>
+                <div class="media-body">
+                    <div class="smallhead media-heading">
+                        {% if product.type contains "pilot" %}
+                            <a href="{{ product.url }}" class="off">[PILOT] {{ product.title }}</a>
+                        {% else %}
+                            <a href="{{ product.url }}" class="off">{{ product.title }}</a>
+                        {% endif %}
+                    </div>
+                    <div class="media-body">
+                        {{ product.tagline }}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="smallspacer"></div>
+    {% endtablerow %}
+</table>
+
+<div class="bigspacer"></div>
+<div class="title text-center">Completed Projects</div>
+<div class="smallspacer"></div>
+<hr />
+
+<table align="center" ; width=1250px>
+    {% 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 @@
         <div class="media" style="width:525px; height:150px">
             <div class="media">
                 <a class="pull-left" href="{{ product.url }}">
-                    <img width=100 class="media-object" src="{{ image }}" style="border:1px solid #021a40;">
+                    <img width=100 class="media-object" src="{{ image }}" style="border:3px solid #990012;">
                 </a>
                 <div class="media-body">
                     <div class="smallhead media-heading">
-                        {% if product.tags contains "software" %}
-                        <a href="{{ product.url }}" class="off">[SOFTWARE] {{ product.title }}</a>
+                        {% if product.type contains "pilot" %}
+                        <a href="{{ product.url }}" class="off">[PILOT] {{ product.title }}</a>
                         {% else %}
                         <a href="{{ product.url }}" class="off">{{ product.title }}</a>
                         {% endif %}