Skip to content

Commit

Permalink
reverted to last working commit
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnGriffiths committed Apr 22, 2019
1 parent 7aa27a5 commit 0d7dd47
Show file tree
Hide file tree
Showing 13 changed files with 62 additions and 103 deletions.
2 changes: 1 addition & 1 deletion content/code_and_software/conwhat/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ url_code = ""
+++


[ConWhAt](https://github.com/JohnGriffiths/conwhat) (for Connectome-based White matter Atlas Analyses) is a tool for studying the effects of white matter damage on brain networks.
ConWhAt (for Connectome-based White matter Atlas Analyses) is a tool for studying the effects of white matter damage on brain networks.


<img src="/img/conwhat_atlas_fig.png" align="right" margin="15px 15px 15px 15px" width="150" />
Expand Down
18 changes: 8 additions & 10 deletions content/positions/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,16 @@ title = "Positions"
# 4 = Stream
list_format = 3

image="https://www.grifflab.com/img/KCNI_WereHiring.jpg"

# Featured image
# To use, add an image named `featured.jpg/png` to your project's folder.
#[image]
# # Caption (optional)
# #caption = "Image credit: [**Unsplash**](https://unsplash.com/photos/CpkOjOcXdUY)"
# # # Focal point (optional)
# # # Options: Smart, Center, TopLeft, Top, TopRight, Left, Right, BottomLeft, Bottom, BottomRight
# # focal_point = ""
# # # Show image only in page previews?
# preview_only = true
[image]
# Caption (optional)
#caption = "Image credit: [**Unsplash**](https://unsplash.com/photos/CpkOjOcXdUY)"
# # Focal point (optional)
# # Options: Smart, Center, TopLeft, Top, TopRight, Left, Right, BottomLeft, Bottom, BottomRight
# focal_point = ""
# # Show image only in page previews?
preview_only = true

+++

Expand Down
Binary file removed content/post/incf_obi_ntx_mtg/featured.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
53 changes: 0 additions & 53 deletions content/post/incf_obi_ntx_mtg/index.md

This file was deleted.

92 changes: 53 additions & 39 deletions layouts/project/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,49 +17,54 @@
{{ $page := . }}
{{ $project := .File.ContentBaseName }}

{{ $items := where (where .Site.RegularPages "Type" "post") ".Params.projects" "intersect" (slice $project) }}
{{ $count := len $items }}
{{ if ge $count 1 }}
<h2>{{ (i18n "posts") }}</h2>
{{ range $items }}
{{ if eq $page.Site.Params.projects.post_view 1 }}
{{ partial "li_list" . }}
{{ else if eq $page.Site.Params.projects.post_view 3 }}
{{ partial "li_card" . }}
{{ else }}
{{ partial "li_compact" . }}
{{ if (.Site.Params.projects.list_children | default true) }}

{{ $items := where (where .Site.RegularPages "Type" "post") ".Params.projects" "intersect" (slice $project) }}
{{ $count := len $items }}
{{ if ge $count 1 }}
<h2>{{ (i18n "posts") }}</h2>
{{ range $items }}
{{ if eq $page.Site.Params.projects.post_format 0 }}
{{ partial "post_li_simple" . }}
{{ else if eq $page.Site.Params.projects.post_format 1 }}
{{ partial "post_li_detailed" . }}
{{ else }}
{{ partial "post_li_stream" . }}
{{ end }}
{{ end }}
{{ end }}
{{ end }}

{{ $items := where (where .Site.RegularPages "Type" "publication") ".Params.projects" "intersect" (slice $project) }}
{{ $pubs_len := len $items }}
{{ if ge $pubs_len 1 }}
<h2>{{ (i18n "publications") }}</h2>
{{ range $items }}
{{ if eq $page.Site.Params.projects.publication_view 1 }}
{{ partial "li_list" . }}
{{ else if eq $page.Site.Params.projects.publication_view 3 }}
{{ partial "li_card" . }}
{{ else if eq $page.Site.Params.projects.publication_view 4 }}
{{ partial "li_citation" . }}
{{ else }}
{{ partial "li_compact" . }}
{{ $items := where (where .Site.RegularPages "Type" "publication") ".Params.projects" "intersect" (slice $project) }}
{{ $pubs_len := len $items }}
{{ if ge $pubs_len 1 }}
<h2>{{ (i18n "publications") }}</h2>
{{ range $items }}
{{ if eq $page.Site.Params.projects.publication_format 1 }}
{{ partial "publication_li_detailed" . }}
{{ else if eq $page.Site.Params.projects.publication_format 2 }}
{{ partial "publication_li_apa" . }}
{{ else if eq $page.Site.Params.projects.publication_format 3 }}
{{ partial "publication_li_mla" . }}
{{ else if eq $page.Site.Params.projects.publication_format 4 }}
{{ partial "publication_li_stream" . }}
{{ else }}
{{ partial "publication_li_simple" . }}
{{ end }}
{{ end }}
{{ end }}
{{ end }}

{{ $items := where (where .Site.RegularPages "Type" "talk") ".Params.projects" "intersect" (slice $project) }}
{{ $talks_len := len $items }}
{{ if ge $talks_len 1 }}
<h2>{{ (i18n "talks") }}</h2>
{{ range $items }}
{{ if eq $page.Site.Params.projects.talk_view 1 }}
{{ partial "li_list" . }}
{{ else if eq $page.Site.Params.projects.talk_view 3 }}
{{ partial "li_card" . }}
{{ else }}
{{ partial "li_compact" . }}
{{ $items := where (where .Site.RegularPages "Type" "talk") ".Params.projects" "intersect" (slice $project) }}
{{ $talks_len := len $items }}
{{ if ge $talks_len 1 }}
<h2>{{ (i18n "talks") }}</h2>
{{ range sort $items ".Params.time_start" "desc" }}
{{ if eq $page.Site.Params.projects.talk_format 1 }}
{{ partial "talk_li_detailed" . }}
{{ else if eq $page.Site.Params.projects.talk_format 2 }}
{{ partial "talk_li_stream" . }}
{{ else }}
{{ partial "talk_li_simple" . }}
{{ end }}
{{ end }}
{{ end }}
{{ end }}
Expand All @@ -73,5 +78,14 @@ <h2>{{ (i18n "talks") }}</h2>
</div>
{{ end }}

{{ partial "footer_container.html" . }}
{{ partial "footer.html" . }}







{{ if eq .Params.showFooter true }}
{{ partial "footer_container.html" . }}
{{ partial "footer.html" . }}
{{ end }}

0 comments on commit 0d7dd47

Please sign in to comment.