Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
bast committed Mar 1, 2017
1 parent 5664aec commit 731dc2c
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 60 deletions.
5 changes: 1 addition & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ defaults:
permalink: /:path/:basename/

collections:
activities:
output: true
permalink: /:collection/:path/
groups:
projects:
output: true
permalink: /:collection/:path/
people:
Expand Down
4 changes: 2 additions & 2 deletions _data/nav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ main:
text: 'Home'
- url: '/people/'
text: 'People'
- url: '/groups/'
text: 'Groups'
- url: '/projects/'
text: 'Projects'
7 changes: 0 additions & 7 deletions _groups/tryggve-sg.md

This file was deleted.

12 changes: 0 additions & 12 deletions _groups/tryggve.md

This file was deleted.

31 changes: 0 additions & 31 deletions _includes/group.html

This file was deleted.

30 changes: 30 additions & 0 deletions _includes/project.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{% assign this_project = page.path | replace: '_projects/', '' | replace: '.md', '' %}

<div class="container mtt">
<div class="row">
<div class="col-lg-12">
<h2>{{ page.name }} project</h2>

{{ page.content | markdownify }}

{% for group in page.groups %}
<h3>{{ group.name }}</h3>
<ul>
{% for person in site.people %}
{% for person_group in person.groups %}
{% assign this_group_with_suffix = this_project | append: group.suffix %}
{% if person_group[0] == this_group_with_suffix %}
<li>
<a href="{{ site.baseurl }}{{ person.url }}">{{ person.name }}</a>
{% if person_group[1].role %}
({{ person_group[1].role }})
{% endif %}
</li>
{% endif %}
{% endfor %}
{% endfor %}
</ul>
{% endfor %}
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions _includes/groups.html → _includes/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<div class="col-lg-12">
{{ page.content | markdownify }}

<h2>Groups</h2>
<h2>Projects</h2>
<ul>
{% for group in site.groups %}
<li><a href="{{ site.baseurl }}{{ group.url }}">{{ group.name }}</a></li>
{% for project in site.projects %}
<li><a href="{{ site.baseurl }}{{ project.url }}">{{ project.name }}</a></li>
{% endfor %}
</ul>
</div>
Expand Down
1 change: 1 addition & 0 deletions _people/abdulrahman-azab.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ phone:
groups:
staff:
tryggve:
role: Expert
---

Abdulrahman Azab, a head Engineer at the Department of Informatics, University
Expand Down
12 changes: 12 additions & 0 deletions _projects/tryggve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
layout: master
include: project
name: Tryggve
groups:
- name: Team
suffix: ''
- name: Steering group
suffix: '-sg'
---

Some text about the Tryggve project.
2 changes: 1 addition & 1 deletion groups.md → projects.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
layout: master
include: groups
include: projects
---

0 comments on commit 731dc2c

Please sign in to comment.