set another place for privacy section in schema

freifunk · May 11, 2016 · ee01a69 · ee01a69
1 parent 36cdf4c
commit ee01a69
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 45 deletions.
diff --git a/Makefile b/Makefile
@@ -8,6 +8,10 @@ pre-build:
 	mkdir -p $(WEBTARGET)
 	mkdir -p $(SRCTARGET)
 	mkdir -p $(SCRIPTTARGET)
+	git clone -q https://github.com/freifunk/common.api.freifunk.net.git $(SRCTARGET)/common
+	cp -r $(SRCTARGET)/common/collector $(SCRIPTTARGET)/
+	mkdir -p $(WEBTARGET)/calendar
+	cp -r $(SRCTARGET)/common/ics-collector $(WEBTARGET)/calendar
 
 map: pre-build
 	git clone -q https://github.com/freifunk/cmap.api.freifunk.net.git $(SRCTARGET)/map

diff --git a/generator/0.4.13.json b/generator/0.4.13.json
@@ -499,6 +499,20 @@
 					}
 				}
 			},
+          		"privacy" : {
+				"title" : "Privacy Policy",
+				"type" : "object",
+				"required" : false,
+				"properties" : {
+					"policyurl" : {
+						"title" : "Privacy Policy URL",
+						"description" : "URL to your privacy policy description",
+						"type" : "string",
+						"pattern": "^(http|https)://[A-Za-z0-9ÄÖÜäöüß\\-_\\./]+",
+						"required" : false
+					}
+				}
+			},
 			"techDetails": {
 				"type": "object",
 				"id": "http://wiki.freifunk.net/Freifunk_Firmware/%C3%9Cbersicht_Communities",
@@ -672,20 +686,6 @@
 							]
 						}
 					},
-          "privacy" : {
-            "title" : "Privacy Policy",
-            "type" : "object",
-            "required" : false,
-            "properties" : {
-              "policyurl" : {
-                "title" : "Privacy Policy URL",
-                "description" : "URL to privacy policy",
-                "type" : "string",
-				        "pattern": "^(http|https)://[A-Za-z0-9ÄÖÜäöüß\\-_\\./]+",
-                "required" : false
-              }
-            }
-          },
 					"updatemode": {
 						"title": "Updatemode",
 						"type": "array",

diff --git a/generator/ffapi.formTemplate.js b/generator/ffapi.formTemplate.js
@@ -123,6 +123,11 @@ ffapi.formTemplate =
 				"title": "How to support you?",
 				"expandable": true,
 				"items": "support"
+			}, {
+				"items" : "privacy",
+				"title": "Privacy description of your services",
+				"expandable": true,
+				"type" : "fieldset"
 			}, {
 				"type": "fieldset",
 				"title": "Technical Details",
@@ -207,9 +212,8 @@ ffapi.formTemplate =
 								"institutions": "We are a legal person to handle legal issues, e.g. an ISP, Foundation or Verein"
 							}
 						}
-							]
-					},
-            "privacy"
+						]
+					}
 				]
 			}, {
 				"key": "state.lastchange",

diff --git a/specs/0.4.13.json b/specs/0.4.13.json
@@ -499,6 +499,20 @@
 					}
 				}
 			},
+          		"privacy" : {
+				"title" : "Privacy Policy",
+				"type" : "object",
+				"required" : false,
+				"properties" : {
+					"policyurl" : {
+						"title" : "Privacy Policy URL",
+						"description" : "URL to your privacy policy description",
+						"type" : "string",
+						"pattern": "^(http|https)://[A-Za-z0-9ÄÖÜäöüß\\-_\\./]+",
+						"required" : false
+					}
+				}
+			},
 			"techDetails": {
 				"type": "object",
 				"id": "http://wiki.freifunk.net/Freifunk_Firmware/%C3%9Cbersicht_Communities",
@@ -672,20 +686,6 @@
 							]
 						}
 					},
-          "privacy" : {
-            "title" : "Privacy Policy",
-            "type" : "object",
-            "required" : false,
-            "properties" : {
-              "policyurl" : {
-                "title" : "Privacy Policy URL",
-                "description" : "URL to privacy policy",
-                "type" : "string",
-				        "pattern": "^(http|https)://[A-Za-z0-9ÄÖÜäöüß\\-_\\./]+",
-                "required" : false
-              }
-            }
-          },
 					"updatemode": {
 						"title": "Updatemode",
 						"type": "array",

diff --git a/specs/development.json b/specs/development.json
@@ -499,6 +499,20 @@
 					}
 				}
 			},
+          		"privacy" : {
+				"title" : "Privacy Policy",
+				"type" : "object",
+				"required" : false,
+				"properties" : {
+					"policyurl" : {
+						"title" : "Privacy Policy URL",
+						"description" : "URL to your privacy policy description",
+						"type" : "string",
+						"pattern": "^(http|https)://[A-Za-z0-9ÄÖÜäöüß\\-_\\./]+",
+						"required" : false
+					}
+				}
+			},
 			"techDetails": {
 				"type": "object",
 				"id": "http://wiki.freifunk.net/Freifunk_Firmware/%C3%9Cbersicht_Communities",
@@ -672,20 +686,6 @@
 							]
 						}
 					},
-          "privacy" : {
-            "title" : "Privacy Policy",
-            "type" : "object",
-            "required" : false,
-            "properties" : {
-              "policyurl" : {
-                "title" : "Privacy Policy URL",
-                "description" : "URL to privacy policy",
-                "type" : "string",
-				        "pattern": "^(http|https)://[A-Za-z0-9ÄÖÜäöüß\\-_\\./]+",
-                "required" : false
-              }
-            }
-          },
 					"updatemode": {
 						"title": "Updatemode",
 						"type": "array",