From d23024241cdac4635d5f468c4f407caac9e5d5ed Mon Sep 17 00:00:00 2001 From: baldo Date: Mon, 21 May 2018 13:22:28 +0200 Subject: [PATCH] Added links for imprint and privacy information. --- README.md | 3 ++ admin/js/main.js | 64 ++++++++++++++++++++------------ app/views/directives/footer.html | 10 +++++ config.json.example | 4 ++ server/config.js | 4 ++ 5 files changed, 62 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 3fb3c49..e62481b 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,9 @@ Dann die `config.json` anpassen nach belieben. Es gibt die folgenden Konfigurati * **`client.community.contactEmail`** Kontakt-E-Mail-Adresse der Freifunk-Community, z. B.: `"kontakt@musterstadt.freifunk.net"` * **`client.community.sites`** Liste der gültige Site-Codes in der `nodes.json`, z. B.: `["ffms-domain1", "ffms-domain2"]` +* **`client.legal.privacyUrl`** optional: URL zum Impressum, z. B.: `"http://map.musterstadt.freifunk.net/impressum"` +* **`client.legal.imprintUrl`** optional: URL zur Datenschutzerklärung, z. B.: `"http://map.musterstadt.freifunk.net/datenschutz"` + * **`client.map.mapUrl`** URL der Knotenkarte, z. B.: `"http://map.musterstadt.freifunk.net"` * **`client.monitoring.enabled`** Gibt an, ob die Nutzer Monitoring für ihre Knoten aktivieren können sollen, z. B.: `true` diff --git a/admin/js/main.js b/admin/js/main.js index 1d01ed6..7f5c22e 100644 --- a/admin/js/main.js +++ b/admin/js/main.js @@ -55,30 +55,48 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest }); } + var header = + ''; + if (config.legal.imprintUrl) { + header += + ''; + } + if (config.legal.privacyUrl) { + header += + ''; + } + header += + '' + + '' + + ''; + admin - .header( - '' + - '' + - '' + - '' - ) + .header(header) .baseApiUrl(pathPrefix + '/internal/api/') .debug(true); diff --git a/app/views/directives/footer.html b/app/views/directives/footer.html index f28029f..700a9c2 100644 --- a/app/views/directives/footer.html +++ b/app/views/directives/footer.html @@ -13,5 +13,15 @@ Fehler melden +
  • + + Datenschutz + +
  • +
  • + + Impressum + +
  • diff --git a/config.json.example b/config.json.example index 206c390..824ea4a 100644 --- a/config.json.example +++ b/config.json.example @@ -44,6 +44,10 @@ "contactEmail": "kontakt@musterstadt.freifunk.net", "sites": ["ffms-domain1", "ffms-domain2"] }, + "legal": { + "privacyUrl": "http://map.musterstadt.freifunk.net/datenschutz", + "imprintUrl": "http://map.musterstadt.freifunk.net/impressum" + }, "map": { "mapUrl": "http://map.musterstadt.freifunk.net" }, diff --git a/server/config.js b/server/config.js index 20b0c3d..c479882 100644 --- a/server/config.js +++ b/server/config.js @@ -99,6 +99,10 @@ var defaultConfig = { contactEmail: 'kontakt@musterstadt.freifunk.net', sites: [] }, + legal: { + privacyUrl: null, + imprintUrl: null + }, map: { mapUrl: 'http://map.musterstadt.freifunk.net' },