From 4ee110dfc62a67ddb7991ac490bdcf545b23f371 Mon Sep 17 00:00:00 2001
From: andibraeu <ab@andi95.de>
Date: Mon, 30 Jun 2014 22:29:00 +0200
Subject: [PATCH] removed stoererhaftung, replaced it by legal issues, fixes
 #87

---
 generator/ffapi.formTemplate.js | 26 +++++++++++++++-----
 specs/development.json          | 42 ++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/generator/ffapi.formTemplate.js b/generator/ffapi.formTemplate.js
index ba64f8b..9c3b970 100644
--- a/generator/ffapi.formTemplate.js
+++ b/generator/ffapi.formTemplate.js
@@ -118,7 +118,7 @@ ffapi.formTemplate =
 				"title": "Technical Details",
 				"expandable": true,
 				"items": [
-					"techDetails.stoererhaftung", {
+					{
 						"type": "fieldset",
 						"title": "Firmware",
 						"items": [
@@ -149,9 +149,10 @@ ffapi.formTemplate =
 									"OLSR": "OLSR",
 									"OLSRv2": "OLSRv2"
 								}
+								
 							}, {
 								"key": "techDetails.updatemode",
-								"type":"checkboxes",
+								"type": "checkboxes",
 								"titleMap": {
 									"none": "No automatic updates",
 									"manual": "Manual updates supported (e.g. via web interface)",
@@ -161,10 +162,23 @@ ffapi.formTemplate =
 						]
 					}, {
 						"type": "fieldset",
-						"title": "Splash pages and VPN",
-						"items": [
-							"techDetails.splashpage",
-							"techDetails.vpn"
+						"title": "Legal Issues",
+						"items": [ 
+						{
+							"key": "techDetails.legals",
+							"type": "checkboxes",
+							"titleMap": {
+								"nothing": "We don't care and do nothing",
+							  "vpnnational": "We use national VPN connections",
+								"vpninternational": "Our traffic is rerouted to another county",
+								"zappscript": "Our communitiy uses the <a href=\"http://blog.freifunk-potsdam.de/zapp-zapp-zapp/\" target=\"_blank\">ZAPP Script</a> to prevent extreme network usage by individuals",
+								"p2pblock": "We block p2p traffic in general",
+								"splashpage": "Users will see a splash page to get informed on our network",
+								"termsconditions": "Users have to confirm terms and conditions before having internet access",
+								"anonymizer": "We use anonymizing technologies like tor",
+								"institutions": "We are a legal person to handle legal issues, e.g. an ISP, Foundation or Verein"
+							}
+						}
 							]
 					}
 				]
diff --git a/specs/development.json b/specs/development.json
index 79259ad..30a8be9 100644
--- a/specs/development.json
+++ b/specs/development.json
@@ -354,12 +354,6 @@
 				"description": "technical details of your community's freifunk implementation",
 				"required": false,
 				"properties": {
-					"stoererhaftung": {
-						"title": "Störerhaftung",
-						"description": "how the German störerhaftung is handled",
-						"required": false,
-						"type": "string"
-					},
 					"firmware": {
 						"type": "object",
 						"required": false,
@@ -386,11 +380,6 @@
 							}
 						}
 					},
-					"keyexchange": {
-						"type": "string",
-						"description": "needs to be defined",
-						"required": false
-					},
 					"dns": {
 						"title": "DNS Servers",
 						"descripition": "dns servers for domains used by your community",
@@ -483,11 +472,26 @@
 							]
 						}
 					},
-					"splashpage": {
-						"title": "Splash Page",
-						"type": "string",
-						"description": "what kind of splashpage does your community use?",
-						"required": false
+					"legals": {
+						"title": "Legal Issues",
+						"description": "What do you use to handle legal issues, e.g. the German Störerhaftung or restrictions in your country?",
+						"required": false,
+						"type": "array",
+						"items": {
+							"type": "string",
+							"title": "option",
+							"enum": [
+								"nothing",
+								"vpnnational",
+								"vpninternational",
+								"zappscript",
+								"p2pblock",
+								"splashpage",
+								"termsconditions",
+								"anonymizer",
+								"institutions"
+							]
+						}
 					},
 					"updatemode": {
 						"title": "Updatemode",
@@ -503,12 +507,6 @@
 								"autoupdate"
 							]
 						}
-					},
-					"vpn": {
-						"title": "VPN",
-						"type": "string",
-						"description": "implementation of inner city vpn",
-						"required": false
 					}
 				}
 			}