Merge pull request #3751 from jsaalfeld/dsgvo

adding working privacy policy
This commit is contained in:
Emanuel Schütze 2018-05-23 15:53:23 +02:00 committed by GitHub
commit e52910a67b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 1 deletions

View File

@ -57,6 +57,15 @@ def get_config_variables():
group='General', group='General',
subgroup='Event') subgroup='Event')
yield ConfigVariable(
name='general_event_privacy_policy',
default_value='',
input_type='markupText',
label='Privacy policy',
weight=132,
group='General',
subgroup='Event')
yield ConfigVariable( yield ConfigVariable(
name='general_event_welcome_title', name='general_event_welcome_title',
default_value='Welcome to OpenSlides', default_value='Welcome to OpenSlides',

View File

@ -359,6 +359,15 @@ angular.module('OpenSlidesApp.core.site', [
}, },
}) })
// privacy policy
.state('privacypolicy', {
url: '/privacypolicy',
controller: 'PrivacyPolicyCtrl',
data: {
title: gettext('Privacy policy'),
},
})
//config //config
.state('config', { .state('config', {
url: '/config', url: '/config',
@ -1180,6 +1189,9 @@ angular.module('OpenSlidesApp.core.site', [
} }
]) ])
// Privacy Policy Controller
.controller('PrivacyPolicyCtrl', function () {})
// Config Controller // Config Controller
.controller('ConfigCtrl', [ .controller('ConfigCtrl', [
'$scope', '$scope',
@ -2053,6 +2065,7 @@ angular.module('OpenSlidesApp.core.site', [
gettext('Event location'); gettext('Event location');
gettext('Event organizer'); gettext('Event organizer');
gettext('Legal notice'); gettext('Legal notice');
gettext('Privacy policy');
gettext('Front page title'); gettext('Front page title');
gettext('Welcome to OpenSlides'); gettext('Welcome to OpenSlides');
gettext('Front page text'); gettext('Front page text');

View File

@ -222,7 +222,8 @@
<!-- footer --> <!-- footer -->
<div id="footer"> <div id="footer">
&copy; Copyright by <a href="http://www.openslides.org" target="_blank">OpenSlides</a> | &copy; Copyright by <a href="http://www.openslides.org" target="_blank">OpenSlides</a> |
<a ui-sref="legalnotice" translate>Legal notice</a> <a ui-sref="legalnotice" translate>Legal notice</a> |
<a ui-sref="privacypolicy" translate>Privacy Policy</a>
</div><!--end footer--> </div><!--end footer-->
</div> </div>

View File

@ -0,0 +1,9 @@
<div class="header">
<div class="title">
<h1 translate>Privacy Policy</h1>
</div>
</div>
<div class="details">
<div ng-bind-html="config('general_event_privacy_policy') | translate"></div>
</div>