From b291473c615b637b60a8ca3bec8b7d161f3111a2 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 21 Jan 2016 21:13:24 +0100
Subject: [PATCH] Set guest_enabled in rootScope to use it in login form after
 reload. (Fixes #1849)

- Justified login form elements (same width).
---
 openslides/core/static/css/app.css                    | 4 ++++
 openslides/core/static/templates/core/login-form.html | 2 +-
 openslides/users/static/js/users/site.js              | 7 ++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index e86fbf513..32f6aa0e0 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -589,6 +589,10 @@ img {
     width: 250px;
 }
 
+.loginForm .input-group-addon i {
+    width: 15px;
+}
+
 .modal-header {
     padding: 5px;
 }
diff --git a/openslides/core/static/templates/core/login-form.html b/openslides/core/static/templates/core/login-form.html
index 75898a658..8ef262722 100644
--- a/openslides/core/static/templates/core/login-form.html
+++ b/openslides/core/static/templates/core/login-form.html
@@ -2,7 +2,7 @@
   <div class="modal-header">
     <img src="/static/img/openslides-logo.png" alt="OpenSlides" class="login-logo center-block">
   </div>
-  <div class="modal-body">
+  <div class="modal-body loginForm">
     <uib-alert ng-repeat="alert in alerts" type="{{ alert.type }}" close="closeAlert($index)">
       <span ng-bind-html="alert.msg"><span>
     </uib-alert>
diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js
index 7ddccafef..ed9cf0caa 100644
--- a/openslides/users/static/js/users/site.js
+++ b/openslides/users/static/js/users/site.js
@@ -149,6 +149,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
         // Put the operator into the root scope
         $http.get('/users/whoami/').success(function(data) {
             operator.setUser(data.user_id);
+            $rootScope.guest_enabled = data.guest_enabled;
             if (data.user_id === null && !data.guest_enabled) {
                 // redirect to login dialog if use is not logged in
                 $state.go('login', {guest_enabled: data.guest_enabled});
@@ -854,13 +855,13 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
 ])
 
 .controller('LoginFormCtrl', [
+    '$rootScope',
     '$scope',
     '$http',
     '$stateParams',
     'operator',
     'gettextCatalog',
-    'Config',
-    function ($scope, $http, $stateParams, operator, gettextCatalog, Config) {
+    function ($rootScope, $scope, $http, $stateParams, operator, gettextCatalog) {
         $scope.alerts = [];
 
         // get login info-text from server
@@ -877,7 +878,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
             $scope.alerts.splice(index, 1);
         };
         // check if guest login is allowed
-        $scope.guestAllowed = $stateParams.guest_enabled;
+        $scope.guestAllowed = $rootScope.guest_enabled;
         // login
         $scope.login = function () {
             $scope.alerts = [];