Improved legal notice page (Fixes #267)

This commit is contained in:
Emanuel Schuetze 2016-01-09 14:44:49 +01:00
parent 363c928517
commit b035ee7d7c
5 changed files with 15 additions and 18 deletions

View File

@ -38,7 +38,7 @@ Other:
for generic Django REST Framework views in OpenSlides apps. for generic Django REST Framework views in OpenSlides apps.
- Removed most of the Django views and templates. - Removed most of the Django views and templates.
- Removed Django error pages. - Removed Django error pages.
- Added page for legal notes. - Added page for legal notice.
- Refactored projector API using metaclasses now. - Refactored projector API using metaclasses now.
- Renamed SignalConnectMetaClass classmethod get_all_objects to get_all - Renamed SignalConnectMetaClass classmethod get_all_objects to get_all
(private API). (private API).

View File

@ -64,10 +64,10 @@ def setup_general_config(sender, **kwargs):
subgroup=ugettext_lazy('Event')) subgroup=ugettext_lazy('Event'))
yield ConfigVariable( yield ConfigVariable(
name='general_event_legal_notes', name='general_event_legal_notice',
default_value='', default_value=_('<a href="http://www.openslides.org">OpenSlides</a> is a free web based presentation and assembly system for visualizing and controlling agenda, motions and elections of an assembly.'),
input_type='text', input_type='text',
label=ugettext_lazy('Legal notes'), label=ugettext_lazy('Legal notice'),
weight=132, weight=132,
group=ugettext_lazy('General'), group=ugettext_lazy('General'),
subgroup=ugettext_lazy('Event')) subgroup=ugettext_lazy('Event'))

View File

@ -205,10 +205,10 @@ angular.module('OpenSlidesApp.core.site', [
abstract: true, abstract: true,
template: "<ui-view/>", template: "<ui-view/>",
}) })
// version // legal notice and version
.state('version', { .state('legalnotice', {
url: '/version', url: '/legalnotice',
controller: 'VersionCtrl', controller: 'LegalNoticeCtrl',
}) })
//config //config
.state('config', { .state('config', {
@ -425,8 +425,8 @@ angular.module('OpenSlidesApp.core.site', [
} }
]) ])
// Version Controller // Legal Notice Controller
.controller('VersionCtrl', [ .controller('LegalNoticeCtrl', [
'$scope', '$scope',
'$http', '$http',
function ($scope, $http) { function ($scope, $http) {

View File

@ -143,7 +143,7 @@
<!-- 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="version">Version</a> <a ui-sref="legalnotice" translate>Legal notice</a>
</div><!--end footer--> </div><!--end footer-->
</div> </div>
<div class="col2" os-perms="core.can_see_projector" <div class="col2" os-perms="core.can_see_projector"

View File

@ -1,16 +1,13 @@
<div class="header"> <div class="header">
<div class="title"> <div class="title">
<h1 translate>Legal Notes and Version</h1> <h1 translate>Legal Notice</h1>
</div> </div>
</div> </div>
<div class="details"> <div class="details">
<p class="lead" translate>Legal Notes</p> <div ng-bind-html="config('general_event_legal_notice')"></div>
{{ config('general_event_legal_notes') }} <hr>
</div> <p>OpenSlides {{ core_version }}
<div class="details">
<p class="lead">OpenSlides {{ core_version }}
<div ng-show="plugins.length"> <div ng-show="plugins.length">
<p translate>Installed plugins:</p> <p translate>Installed plugins:</p>
<ol> <ol>