From b035ee7d7cb73036ec11709e2a0c9d4f7ec83eab Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 9 Jan 2016 14:44:49 +0100
Subject: [PATCH] Improved legal notice page (Fixes #267)

---
 CHANGELOG                                            |  2 +-
 openslides/core/signals.py                           |  6 +++---
 openslides/core/static/js/core/site.js               | 12 ++++++------
 openslides/core/static/templates/index.html          |  2 +-
 .../templates/{version.html => legalnotice.html}     | 11 ++++-------
 5 files changed, 15 insertions(+), 18 deletions(-)
 rename openslides/core/static/templates/{version.html => legalnotice.html} (57%)

diff --git a/CHANGELOG b/CHANGELOG
index e96fbefab..c51d10445 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,7 +38,7 @@ Other:
   for generic Django REST Framework views in OpenSlides apps.
 - Removed most of the Django views and templates.
 - Removed Django error pages.
-- Added page for legal notes.
+- Added page for legal notice.
 - Refactored projector API using metaclasses now.
 - Renamed SignalConnectMetaClass classmethod get_all_objects to get_all
   (private API).
diff --git a/openslides/core/signals.py b/openslides/core/signals.py
index f920d63ff..c69061640 100644
--- a/openslides/core/signals.py
+++ b/openslides/core/signals.py
@@ -64,10 +64,10 @@ def setup_general_config(sender, **kwargs):
         subgroup=ugettext_lazy('Event'))
 
     yield ConfigVariable(
-        name='general_event_legal_notes',
-        default_value='',
+        name='general_event_legal_notice',
+        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',
-        label=ugettext_lazy('Legal notes'),
+        label=ugettext_lazy('Legal notice'),
         weight=132,
         group=ugettext_lazy('General'),
         subgroup=ugettext_lazy('Event'))
diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index f1576393d..f5b97d411 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -205,10 +205,10 @@ angular.module('OpenSlidesApp.core.site', [
             abstract: true,
             template: "<ui-view/>",
         })
-        // version
-        .state('version', {
-            url: '/version',
-            controller: 'VersionCtrl',
+        // legal notice and version
+        .state('legalnotice', {
+            url: '/legalnotice',
+            controller: 'LegalNoticeCtrl',
         })
         //config
         .state('config', {
@@ -425,8 +425,8 @@ angular.module('OpenSlidesApp.core.site', [
     }
 ])
 
-// Version Controller
-.controller('VersionCtrl', [
+// Legal Notice Controller
+.controller('LegalNoticeCtrl', [
     '$scope',
     '$http',
     function ($scope, $http) {
diff --git a/openslides/core/static/templates/index.html b/openslides/core/static/templates/index.html
index 772719514..a63b9e15c 100644
--- a/openslides/core/static/templates/index.html
+++ b/openslides/core/static/templates/index.html
@@ -143,7 +143,7 @@
         <!-- footer -->
         <div id="footer">
           &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>
     <div class="col2" os-perms="core.can_see_projector"
diff --git a/openslides/core/static/templates/version.html b/openslides/core/static/templates/legalnotice.html
similarity index 57%
rename from openslides/core/static/templates/version.html
rename to openslides/core/static/templates/legalnotice.html
index bf3bb70c7..75dd2760f 100644
--- a/openslides/core/static/templates/version.html
+++ b/openslides/core/static/templates/legalnotice.html
@@ -1,16 +1,13 @@
 <div class="header">
   <div class="title">
-    <h1 translate>Legal Notes and Version</h1>
+    <h1 translate>Legal Notice</h1>
   </div>
 </div>
 
 <div class="details">
-  <p class="lead" translate>Legal Notes</p>
-  {{ config('general_event_legal_notes') }}
-</div>
-
-<div class="details">
-  <p class="lead">OpenSlides {{ core_version }}
+  <div ng-bind-html="config('general_event_legal_notice')"></div>
+  <hr>
+  <p>OpenSlides {{ core_version }}
   <div ng-show="plugins.length">
     <p translate>Installed plugins:</p>
     <ol>