Skip to content

Commit

Permalink
s/Projects/Activities/
Browse files Browse the repository at this point in the history
  • Loading branch information
bast committed Mar 2, 2017
1 parent 294461b commit 4099dea
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions _projects/tryggve.md → _activities/tryggve.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: master
include: project
include: activity
name: Tryggve
groups:
- name: Team
Expand All @@ -11,4 +11,4 @@ groups:
suffix: '-sg'
---

Some text about the Tryggve project.
Some text about the Tryggve activity.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ defaults:
permalink: /:path/:basename/

collections:
projects:
activities:
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: '/projects/'
text: 'Projects'
- url: '/activities/'
text: 'Activities'
6 changes: 3 additions & 3 deletions _includes/projects.html → _includes/activities.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>Projects</h2>
<h2>Activities</h2>
<ul>
{% for project in site.projects %}
<li><a href="{{ site.baseurl }}{{ project.url }}">{{ project.name }}</a></li>
{% for activity in site.activities %}
<li><a href="{{ site.baseurl }}{{ activity.url }}">{{ activity.name }}</a></li>
{% endfor %}
</ul>
</div>
Expand Down
6 changes: 3 additions & 3 deletions _includes/project.html → _includes/activity.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% assign this_project = page.path | replace: '_projects/', '' | replace: '.md', '' %}
{% assign this_activity = page.path | replace: '_activities/', '' | replace: '.md', '' %}

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

{{ page.content | markdownify }}

Expand All @@ -12,7 +12,7 @@ <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 %}
{% assign this_group_with_suffix = this_activity | append: group.suffix %}
{% if person_group[0] == this_group_with_suffix %}
<li>
<a href="{{ site.baseurl }}{{ person.url }}">{{ person.name }}</a>
Expand Down
8 changes: 4 additions & 4 deletions _people/antti-pursula.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ groups:
---

Antti Pursula is located at CSC - IT Center for Science Ltd in Finland and holds
a 60% position at NeIC. He is the project manager of the NeIC's Tryggve project
on sensitive data for the bio- and medical sciences. He is also a project
a 60% position at NeIC. He is the activity manager of the NeIC's Tryggve activity
on sensitive data for the bio- and medical sciences. He is also a activity
director of research infrastructures at CSC coordinating CSC’s participation in
various research infrastructure projects. He has broad experience from different
roles ranging from software development and customer interaction to project
various research infrastructure activities. He has broad experience from different
roles ranging from software development and customer interaction to activity
management and leading a service area.
2 changes: 1 addition & 1 deletion projects.md → activities.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
layout: master
include: projects
include: activities
---

0 comments on commit 4099dea

Please sign in to comment.