freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added links for imprint and privacy information.

Browse source
This commit is contained in:
baldo 2018-05-21 13:22:28 +02:00
parent b5805540ec
commit d23024241c
5 changed files with 62 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -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`

64
admin/js/main.js
View file

@ -55,30 +55,48 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest
});
}
var header =
'<div class="navbar-header">' +
'<a class="navbar-brand" href="#" ng-click="appController.displayHome()">' +
title + ' ' +
'<small style="font-size: 0.7em;">(<fa-version></fa-version>)</small>' +
'</a>' +
'</div>';
if (config.legal.imprintUrl) {
header +=
'<p class="navbar-text navbar-right">' +
'<a href="' + config.legal.imprintUrl + '" target="_blank">' +
'Imprint' +
'</a>' +
'</p>';
}
if (config.legal.privacyUrl) {
header +=
'<p class="navbar-text navbar-right">' +
'<a href="' + config.legal.privacyUrl + '" target="_blank">' +
'Privacy' +
'</a>' +
'</p>';
}
header +=
'<p class="navbar-text navbar-right">' +
'<a href="https://github.com/freifunkhamburg/ffffng/issues" target="_blank">' +
'<i class="fa fa-bug" aria-hidden="true"></i> Report Error' +
'</a>' +
'</p>' +
'<p class="navbar-text navbar-right">' +
'<a href="https://github.com/freifunkhamburg/ffffng" target="_blank">' +
'<i class="fa fa-code" aria-hidden="true"></i> Source Code' +
'</a>' +
'</p>' +
'<p class="navbar-text navbar-right">' +
'<a href="' + pathPrefix + '/" target="_blank">' +
'<i class="fa fa-external-link" aria-hidden="true"></i> Frontend' +
'</a>' +
'</p>';
admin
.header(
'<div class="navbar-header">' +
'<a class="navbar-brand" href="#" ng-click="appController.displayHome()">' +
title + ' ' +
'<small style="font-size: 0.7em;">(<fa-version></fa-version>)</small>' +
'</a>' +
'</div>' +
'<p class="navbar-text navbar-right">' +
'<a href="https://github.com/freifunkhamburg/ffffng/issues" target="_blank">' +
'<i class="fa fa-bug" aria-hidden="true"></i> Report Error' +
'</a>' +
'</p>' +
'<p class="navbar-text navbar-right">' +
'<a href="https://github.com/freifunkhamburg/ffffng" target="_blank">' +
'<i class="fa fa-code" aria-hidden="true"></i> Source Code' +
'</a>' +
'</p>' +
'<p class="navbar-text navbar-right">' +
'<a href="' + pathPrefix + '/" target="_blank">' +
'<i class="fa fa-external-link" aria-hidden="true"></i> Frontend' +
'</a>' +
'</p>'
)
.header(header)
.baseApiUrl(pathPrefix + '/internal/api/')
.debug(true);

10
app/views/directives/footer.html
View file

@ -13,5 +13,15 @@
<i class="fa fa-bug" aria-hidden="true"></i> Fehler melden
</a>
</li>
<li ng-if="config.legal.privacyUrl">
<a href="{{config.legal.privacyUrl}}" target="_blank">
Datenschutz
</a>
</li>
<li ng-if="config.legal.imprintUrl">
<a href="{{config.legal.imprintUrl}}" target="_blank">
Impressum
</a>
</li>
</ul>
</footer>

4
config.json.example
View file

@ -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"
},

4
server/config.js
View file

@ -99,6 +99,10 @@ var defaultConfig = {
contactEmail: 'kontakt@musterstadt.freifunk.net',
sites: []
},
legal: {
privacyUrl: null,
imprintUrl: null
},
map: {
mapUrl: 'http://map.musterstadt.freifunk.net'
},