From 5d29af5f523248fcdc4519d6df5238d2580492a4 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 10 Dec 2015 08:35:56 +0100
Subject: [PATCH] Improved login form.

- Add redirect after aborting login. (Fixes #1762)
- Use new state paramater 'guest_enabled' for login form.
---
 .../core/static/templates/core/login-form.html      |  2 +-
 openslides/users/static/js/users/site.js            | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/openslides/core/static/templates/core/login-form.html b/openslides/core/static/templates/core/login-form.html
index 91ecc11f7..75898a658 100644
--- a/openslides/core/static/templates/core/login-form.html
+++ b/openslides/core/static/templates/core/login-form.html
@@ -17,7 +17,7 @@
           placeholder="{{ 'Password' | translate }}">
     </div>
     <div class="form-group">
-      <button type="submit" class="btn btn-primary pull-right" translate>
+      <button type="submit" class="btn btn-primary" translate>
         Login
       </button>
       <button ng-if="guestAllowed" ng-click="guestLogin()" class="btn btn-default" translate>
diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js
index 8f08d537f..01d41d968 100644
--- a/openslides/users/static/js/users/site.js
+++ b/openslides/users/static/js/users/site.js
@@ -120,10 +120,16 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
     })
     .state('login', {
         template: null,
-        onEnter: ['$stateParams', 'ngDialog', function($stateParams, ngDialog) {
+        url: '/login',
+        params: { guest_enabled: false },
+        onEnter: ['$state', 'ngDialog', function($state, ngDialog) {
             ngDialog.open({
                 template: 'static/templates/core/login-form.html',
                 controller: 'LoginFormCtrl',
+                preCloseCallback: function() {
+                    $state.go('dashboard');
+                    return true;
+                }
             });
         }]
     });
@@ -716,10 +722,11 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
 .controller('LoginFormCtrl', [
     '$scope',
     '$http',
+    '$stateParams',
     'operator',
     'gettextCatalog',
     'Config',
-    function ($scope, $http, operator, gettextCatalog, Config) {
+    function ($scope, $http, $stateParams, operator, gettextCatalog, Config) {
         $scope.alerts = [];
 
         // TODO: add welcome message only on first time (or if admin password not changed)
@@ -734,7 +741,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
             $scope.alerts.splice(index, 1);
         };
         // check if guest login is allowed
-        $scope.guestAllowed = true; //TODO Config.get('general_system_enable_anonymous').value;
+        $scope.guestAllowed = $stateParams.guest_enabled;
         // login
         $scope.login = function () {
             $http.post(