From 363c928517a5313e77ca926d5b2ce892d331ceca Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 9 Jan 2016 14:22:32 +0100
Subject: [PATCH] Show info text in login form (Fixes #1754)

---
 .../core/static/templates/config-form-field.html |  1 +
 openslides/users/static/js/users/site.js         | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/openslides/core/static/templates/config-form-field.html b/openslides/core/static/templates/config-form-field.html
index c079fec21..12614798a 100644
--- a/openslides/core/static/templates/config-form-field.html
+++ b/openslides/core/static/templates/config-form-field.html
@@ -6,6 +6,7 @@
         type="{{ type }}" class="form-control">
 
     <textarea ng-if="type == 'textarea'" ng-model="value" ng-change="save(configOption.key, value)" id="{{ key }}" class="form-control">
+    </textarea>
 
     <select ng-if="type == 'choice'" ng-model="value" ng-change="save(configOption.key, value)" id="{{ key }}"
         class="form-control" ng-options="option.value as option.display_name for option in choices">
diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js
index c353f1c28..4c75a80e7 100644
--- a/openslides/users/static/js/users/site.js
+++ b/openslides/users/static/js/users/site.js
@@ -821,13 +821,15 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
     function ($scope, $http, $stateParams, operator, gettextCatalog, Config) {
         $scope.alerts = [];
 
-        // TODO: add welcome message only on first time (or if admin password not changed)
-        $scope.alerts.push({
-            type: 'success',
-            msg: gettextCatalog.getString("Installation was successfully.") + "<br>" +
-                 gettextCatalog.getString("Use <strong>admin</strong> and <strong>admin</strong> for first login.") + "<br>" +
-                 gettextCatalog.getString("Important: Please change your password!")
-        });
+        // get login info-text from server
+        $http.get('/users/login/').success(function(data) {
+            if(data.info_text) {
+                $scope.alerts.push({
+                    type: 'success',
+                    msg: data.info_text
+                });
+            }
+        })
         // close alert function
         $scope.closeAlert = function(index) {
             $scope.alerts.splice(index, 1);