From 4099dea8c7820f9f9687dedfae90d2f6cd412b56 Mon Sep 17 00:00:00 2001
From: Radovan Bast <bast@users.noreply.github.com>
Date: Thu, 2 Mar 2017 12:30:45 +0100
Subject: [PATCH] s/Projects/Activities/

---
 {_projects => _activities}/tryggve.md        | 4 ++--
 _config.yml                                  | 2 +-
 _data/nav.yml                                | 4 ++--
 _includes/{projects.html => activities.html} | 6 +++---
 _includes/{project.html => activity.html}    | 6 +++---
 _people/antti-pursula.md                     | 8 ++++----
 projects.md => activities.md                 | 2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)
 rename {_projects => _activities}/tryggve.md (74%)
 rename _includes/{projects.html => activities.html} (54%)
 rename _includes/{project.html => activity.html} (77%)
 rename projects.md => activities.md (53%)

diff --git a/_projects/tryggve.md b/_activities/tryggve.md
similarity index 74%
rename from _projects/tryggve.md
rename to _activities/tryggve.md
index b00f6f9f..a96e7597 100644
--- a/_projects/tryggve.md
+++ b/_activities/tryggve.md
@@ -1,6 +1,6 @@
 ---
 layout: master
-include: project
+include: activity
 name: Tryggve
 groups:
   - name: Team
@@ -11,4 +11,4 @@ groups:
     suffix: '-sg'
 ---
 
-Some text about the Tryggve project.
+Some text about the Tryggve activity.
diff --git a/_config.yml b/_config.yml
index 8f472d07..307748a3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -12,7 +12,7 @@ defaults:
       permalink: /:path/:basename/
 
 collections:
-  projects:
+  activities:
     output: true
     permalink: /:collection/:path/
   people:
diff --git a/_data/nav.yml b/_data/nav.yml
index c3a4c881..8a223bd0 100644
--- a/_data/nav.yml
+++ b/_data/nav.yml
@@ -3,5 +3,5 @@ main:
     text: 'Home'
   - url: '/people/'
     text: 'People'
-  - url: '/projects/'
-    text: 'Projects'
+  - url: '/activities/'
+    text: 'Activities'
diff --git a/_includes/projects.html b/_includes/activities.html
similarity index 54%
rename from _includes/projects.html
rename to _includes/activities.html
index ed89e9d9..f7ba1e70 100644
--- a/_includes/projects.html
+++ b/_includes/activities.html
@@ -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>
diff --git a/_includes/project.html b/_includes/activity.html
similarity index 77%
rename from _includes/project.html
rename to _includes/activity.html
index d84cb25e..17ee821a 100644
--- a/_includes/project.html
+++ b/_includes/activity.html
@@ -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 }}
 
@@ -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>
diff --git a/_people/antti-pursula.md b/_people/antti-pursula.md
index f86ed985..a694cde8 100644
--- a/_people/antti-pursula.md
+++ b/_people/antti-pursula.md
@@ -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.
diff --git a/projects.md b/activities.md
similarity index 53%
rename from projects.md
rename to activities.md
index ffb85d66..27ec4137 100644
--- a/projects.md
+++ b/activities.md
@@ -1,4 +1,4 @@
 ---
 layout: master
-include: projects
+include: activities
 ---