diff --git a/Rules b/Rules
index 6f9504d..ce3d915 100644
--- a/Rules
+++ b/Rules
@@ -30,7 +30,7 @@ preprocess do
check_schema(:event, event)
end
- all_privacy_projects do |project|
+ all_privacy_items do |project|
check_schema(:privacy, project)
end
@@ -144,7 +144,7 @@ end
# PRIVACY
#
-compile '/privacy/*' do
+compile '/about/privacy/*' do
filter :kramdown
# Don't write out the privacy items themselves for now
diff --git a/content/privacy.erb b/content/about/privacy.erb
similarity index 95%
rename from content/privacy.erb
rename to content/about/privacy.erb
index cdc3910..620c75f 100644
--- a/content/privacy.erb
+++ b/content/about/privacy.erb
@@ -4,6 +4,7 @@ narrow_page: true
typography: true
toc: true
---
+<%= render '/partials/_about_sub_navbar.*', selected: 'privacy' %>
Privacybeleid
- Als Zeus optreedt als verwerker, zal Zeus in het algemeen slechts de absoluut noodzakelijke data verzamelen voor de integriteit en goede werking van haar systemen in stand te houden verzamelen. Meer informatie kan u krijgen bij de verantwoordelijke vereniging of personen die gebruik maken van de diensten van Zeus.
+ Als Zeus optreedt als verwerker, zal Zeus in het algemeen slechts de absoluut noodzakelijke data verzamelen voor de integriteit en goede werking van haar systemen in stand te houden verzamelen: enkel technische informatie, zoals beschreven in paragraaf Welke data worden verzameld en waarvoor worden ze gebruikt?.
Wie heeft toegang tot de verzamelde data?
@@ -181,9 +182,9 @@ toc: true
<% end %>
- Ongebruikte of externe projecten
+ Projecten in opdracht
- Ter informatie volgt een lijst van projecten die ofwel geen Zeus-project zijn ofwel niet meer door Zeus gebruikt worden. Zeus heeft alle gegevens voor deze projecten verwijderd indien van toepassing.
+ Deze projecten worden door Zeus in opdracht van derden aangeboden. Hierbij treedt Zeus op als verwerker, zoals uitgelegd in paragraaf Zeus als verwerker. Dat komt er op neer dat Zeus enkel technische informatie verzamelt.
<% privacy_projects("external").each do |project| %>
diff --git a/content/privacy/12urenloop.md b/content/about/privacy/12urenloop.md
similarity index 100%
rename from content/privacy/12urenloop.md
rename to content/about/privacy/12urenloop.md
diff --git a/content/privacy/blokmap.md b/content/about/privacy/blokmap.md
similarity index 100%
rename from content/privacy/blokmap.md
rename to content/about/privacy/blokmap.md
diff --git a/content/privacy/cat.md b/content/about/privacy/cat.md
similarity index 100%
rename from content/privacy/cat.md
rename to content/about/privacy/cat.md
diff --git a/content/privacy/dap.md b/content/about/privacy/dap.md
similarity index 100%
rename from content/privacy/dap.md
rename to content/about/privacy/dap.md
diff --git a/content/privacy/doorkeeper.md b/content/about/privacy/doorkeeper.md
similarity index 100%
rename from content/privacy/doorkeeper.md
rename to content/about/privacy/doorkeeper.md
diff --git a/content/privacy/dut.md b/content/about/privacy/dut.md
similarity index 100%
rename from content/privacy/dut.md
rename to content/about/privacy/dut.md
diff --git a/content/privacy/endorsement.md b/content/about/privacy/endorsement.md
similarity index 100%
rename from content/privacy/endorsement.md
rename to content/about/privacy/endorsement.md
diff --git a/content/privacy/fathom.md b/content/about/privacy/fathom.md
similarity index 100%
rename from content/privacy/fathom.md
rename to content/about/privacy/fathom.md
diff --git a/content/privacy/fk_enrolment.md b/content/about/privacy/fk_enrolment.md
similarity index 100%
rename from content/privacy/fk_enrolment.md
rename to content/about/privacy/fk_enrolment.md
diff --git a/content/privacy/g2.md b/content/about/privacy/g2.md
similarity index 100%
rename from content/privacy/g2.md
rename to content/about/privacy/g2.md
diff --git a/content/privacy/gamification.md b/content/about/privacy/gamification.md
similarity index 100%
rename from content/privacy/gamification.md
rename to content/about/privacy/gamification.md
diff --git a/content/privacy/gandalf.md b/content/about/privacy/gandalf.md
similarity index 100%
rename from content/privacy/gandalf.md
rename to content/about/privacy/gandalf.md
diff --git a/content/privacy/gitlab.md b/content/about/privacy/gitlab.md
similarity index 100%
rename from content/privacy/gitlab.md
rename to content/about/privacy/gitlab.md
diff --git a/content/privacy/haldis.md b/content/about/privacy/haldis.md
similarity index 100%
rename from content/privacy/haldis.md
rename to content/about/privacy/haldis.md
diff --git a/content/privacy/httpizza.md b/content/about/privacy/httpizza.md
similarity index 100%
rename from content/privacy/httpizza.md
rename to content/about/privacy/httpizza.md
diff --git a/content/privacy/hydra.md b/content/about/privacy/hydra.md
similarity index 100%
rename from content/privacy/hydra.md
rename to content/about/privacy/hydra.md
diff --git a/content/privacy/lana.md b/content/about/privacy/lana.md
similarity index 100%
rename from content/privacy/lana.md
rename to content/about/privacy/lana.md
diff --git a/content/privacy/mattermore.md b/content/about/privacy/mattermore.md
similarity index 100%
rename from content/privacy/mattermore.md
rename to content/about/privacy/mattermore.md
diff --git a/content/privacy/mattermost.md b/content/about/privacy/mattermost.md
similarity index 100%
rename from content/privacy/mattermost.md
rename to content/about/privacy/mattermost.md
diff --git a/content/privacy/messageos.md b/content/about/privacy/messageos.md
similarity index 100%
rename from content/privacy/messageos.md
rename to content/about/privacy/messageos.md
diff --git a/content/privacy/mozaic.md b/content/about/privacy/mozaic.md
similarity index 100%
rename from content/privacy/mozaic.md
rename to content/about/privacy/mozaic.md
diff --git a/content/privacy/pannenkoekenwachtrij.md b/content/about/privacy/pannenkoekenwachtrij.md
similarity index 100%
rename from content/privacy/pannenkoekenwachtrij.md
rename to content/about/privacy/pannenkoekenwachtrij.md
diff --git a/content/privacy/sad.md b/content/about/privacy/sad.md
similarity index 100%
rename from content/privacy/sad.md
rename to content/about/privacy/sad.md
diff --git a/content/privacy/saruman.md b/content/about/privacy/saruman.md
similarity index 100%
rename from content/privacy/saruman.md
rename to content/about/privacy/saruman.md
diff --git a/content/privacy/site.md b/content/about/privacy/site.md
similarity index 100%
rename from content/privacy/site.md
rename to content/about/privacy/site.md
diff --git a/content/privacy/slotmachien.md b/content/about/privacy/slotmachien.md
similarity index 100%
rename from content/privacy/slotmachien.md
rename to content/about/privacy/slotmachien.md
diff --git a/content/privacy/tab.md b/content/about/privacy/tab.md
similarity index 100%
rename from content/privacy/tab.md
rename to content/about/privacy/tab.md
diff --git a/content/privacy/tap.md b/content/about/privacy/tap.md
similarity index 100%
rename from content/privacy/tap.md
rename to content/about/privacy/tap.md
diff --git a/content/privacy/tappb.md b/content/about/privacy/tappb.md
similarity index 100%
rename from content/privacy/tappb.md
rename to content/about/privacy/tappb.md
diff --git a/content/privacy/tuxcape.md b/content/about/privacy/tuxcape.md
similarity index 100%
rename from content/privacy/tuxcape.md
rename to content/about/privacy/tuxcape.md
diff --git a/content/privacy/wiki.md b/content/about/privacy/wiki.md
similarity index 100%
rename from content/privacy/wiki.md
rename to content/about/privacy/wiki.md
diff --git a/content/privacy/zauth.md b/content/about/privacy/zauth.md
similarity index 100%
rename from content/privacy/zauth.md
rename to content/about/privacy/zauth.md
diff --git a/content/privacy/zid.md b/content/about/privacy/zid.md
similarity index 100%
rename from content/privacy/zid.md
rename to content/about/privacy/zid.md
diff --git a/content/privacy/zinc.md b/content/about/privacy/zinc.md
similarity index 100%
rename from content/privacy/zinc.md
rename to content/about/privacy/zinc.md
diff --git a/layouts/partials/_about_sub_navbar.erb b/layouts/partials/_about_sub_navbar.erb
index 0c9c5d4..e9ad819 100644
--- a/layouts/partials/_about_sub_navbar.erb
+++ b/layouts/partials/_about_sub_navbar.erb
@@ -2,6 +2,7 @@
- Zeus WPI
- Statuten
+ - Privacybeleid
- Historiek
- Oud-bestuur
- Verslagen
diff --git a/lib/helpers/preprocess.rb b/lib/helpers/preprocess.rb
index d0d74fe..9a403fd 100644
--- a/lib/helpers/preprocess.rb
+++ b/lib/helpers/preprocess.rb
@@ -14,13 +14,7 @@ module PreprocessHelper
end
def allowed_privacy_status
- [
- "additional",
- "general",
- "processor",
- "development",
- "external"
- ]
+ %w(additional general processor development external)
end
def check_schema(itemtype, item)
@@ -113,10 +107,10 @@ module PreprocessHelper
def add_project_metadata
projects = data_from(:projecten)
- @items.find_all('/privacy/*').each do |project|
+ all_privacy_items.each do |project|
update_project_item(projects, project)
end
- @items.find_all('/projects/*').each do |project|
+ all_project_items.each do |project|
update_project_item(projects, project)
end
end
diff --git a/lib/helpers/privacy.rb b/lib/helpers/privacy.rb
index 54bb293..4566db8 100644
--- a/lib/helpers/privacy.rb
+++ b/lib/helpers/privacy.rb
@@ -1,11 +1,11 @@
module PrivacyHelper
- def all_privacy_projects
- @items.find_all('/privacy/*')
+ def all_privacy_items
+ @items.find_all('/about/privacy/*')
end
def privacy_projects(status)
- all_privacy_projects
+ all_privacy_items
.select {|project| project[:status] == status}
.sort_by {|project| project[:name]}
end
diff --git a/lib/helpers/projects.rb b/lib/helpers/projects.rb
index e648bb2..d8375a8 100644
--- a/lib/helpers/projects.rb
+++ b/lib/helpers/projects.rb
@@ -1,5 +1,10 @@
module ProjectsHelper
+
+ def all_project_items
+ @items.find_all('/projects/*')
+ end
+
def all_projects
- @items.find_all('/projects/*').sort_by{|project| -(project[:priority] || 0)}
+ all_project_items.sort_by{|project| -(project[:priority] || 0)}
end
end