Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing member -vs- team #54

Closed
wants to merge 5 commits into from
Closed

Fixing member -vs- team #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06bdc47
Fixing member -vs- team
haz Oct 15, 2020
34db3d2
Organize vacancies by type.
haz Oct 16, 2020
53a52e7
Avoiding overloaded term.
haz Oct 16, 2020
b7a34b6
Don't display interests and education if they aren't specified.
haz Oct 19, 2020
e445d62
Only display the featured openings on the main page, and display type.
haz Oct 19, 2020
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
1 change: 1 addition & 0 deletions archetypes/vacancy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
description = ""
external_link = ""
vacancy_id = ""
vacancy_type = ""
featured = false
+++
5 changes: 4 additions & 1 deletion layouts/member/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ <h4>{{ .role }}, {{.name}}</h4>
<div class="col-xs-12 col-md-8" itemprop="description">
<div class="row">

{{ if isset .Params "interests" }}
<div class="col-sm-5">
<h3>Interests</h3>
<ul>
Expand All @@ -63,9 +64,10 @@ <h3>Interests</h3>
{{ end }}
</ul>
</div>
{{ end }}



{{ if isset .Params "education" }}
<div class="col-sm-7">
<h3>Education</h3>
<ul class="ul-edu fa-ul">
Expand All @@ -80,6 +82,7 @@ <h3>Education</h3>
{{ end }}
</ul>
</div>
{{ end }}

</div>

Expand Down
12 changes: 6 additions & 6 deletions layouts/partials/index/members.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<section id="members" class="home-section">
<div class="container">

<!-- Section heading -->
<div class="row">
<div class="col-xs-12 col-md-4 section-heading">
<h1 class="section-heading"><a href="{{.Site.BaseURL}}/team/{{if .Site.Params.uglyURLs}}index.html{{end}}"> Team </a></h1>
<h1 class="section-heading"><a href="{{.Site.BaseURL}}/member/{{if .Site.Params.uglyURLs}}index.html{{end}}"> Team </a></h1>
</div>
</div>

<!-- Members -->
<div class="row">
{{ range (sort (where .Site.RegularPages "Type" "member") ".Params.sort_position")}}
Expand All @@ -16,15 +16,15 @@ <h1 class="section-heading"><a href="{{.Site.BaseURL}}/team/{{if .Site.Params.ug
{{ end }}
{{ end }}
</div>

<!-- Link to all members -->
<div>
<p class="view-all">
<a href="{{ .Site.BaseURL }}/team/{{if .Site.Params.uglyURLs}}index.html{{end}}">
<a href="{{ .Site.BaseURL }}/member/{{if .Site.Params.uglyURLs}}index.html{{end}}">
Full team
<i class="fa fa-angle-double-right"></i>
</a>
</p>
</div>
</div>
</section>
</section>
14 changes: 7 additions & 7 deletions layouts/partials/index/open_projects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<section id="open-projects" class="home-section">
<div class="container">
<div class="row">

<!-- Section heading -->
<div class="col-xs-12 col-md-4 section-heading">
<h1><a href="{{.Site.BaseURL}}/open-projects/{{if .Site.Params.uglyURLs}}index.html{{end}}">{{ with .Site.Params.open_projects.title }}{{ . | markdownify }}{{ end }}</a></h1>
{{ with .Site.Params.open_projects.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
</div>

<!-- Vacancies -->
<div class="col-xs-12 col-md-8">
{{ range first .Site.Params.open_projects.count (where .Site.RegularPages "Type" "open-projects") }}
{{ range first .Site.Params.open_projects.count (where (where .Site.RegularPages "Type" "open-projects") ".Params.featured" "==" true) }}
<div class="article-list-item">
{{ if .Content }}
{{ .Scratch.Set "link" .Permalink}}
{{ else if .Params.external_link }}
{{ .Scratch.Set "link" .Params.external_link}}
{{ end }}

<h3 class="article-title" itemprop="name">
<a href="{{ .Scratch.Get "link" }}" itemprop="url">{{ .Title }}</a>
<a href="{{ .Scratch.Get "link" }}" itemprop="url">({{ .Params.vacancy_type }}) {{ .Title }}</a>
</h3>

{{ with .Params.description }}
Expand All @@ -36,7 +36,7 @@ <h3 class="article-title" itemprop="name">
Go to external website
</a>
{{ end }}

{{ if .Content }}
<a href="{{ .Scratch.Get "link" }}" class="btn btn-primary btn-outline">
{{ with .Site.Params.posts.str_read_more }}{{ . | markdownify }}{{ end }}
Expand All @@ -47,7 +47,7 @@ <h3 class="article-title" itemprop="name">
{{ end }}
</div>
</div>

<!-- Link to all vacancies -->
<div>
<p class="view-all">
Expand Down
4 changes: 2 additions & 2 deletions layouts/section/open-projects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="col-md-12">
<h1>Open projects</h1>

{{ range .Data.Pages.GroupByDate "2006" }}
{{ range (.Data.Pages.GroupByParam "vacancy_type").Reverse }}
<div class="row" id="pub_list">
<div class="col-md-2">
<h3>{{ .Key }}</h3>
Expand All @@ -18,7 +18,7 @@ <h3>{{ .Key }}</h3>
{{ else if .Params.external_link }}
{{ .Scratch.Set "link" .Params.external_link }}
{{ end }}

<h3><a href="{{ .Scratch.Get "link" }}" itemprop="url">{{ .Title }}</a></h3>
{{ with .Params.description }}
{{ . }}
Expand Down