Merge pull request #3299 from FinnStutzenstein/improvements

Some small changes and bugfixes

openslides/core/static/css/app.css

@@ -1567,6 +1567,7 @@ img {
     display: inline-block;
     padding: .4em .6em;
     margin-right: .2em;
+    white-space: normal;
 }
 
 /* for csv import form */

openslides/core/static/css/projector.css

@@ -282,7 +282,7 @@ hr {
     margin: 0 0 10px 10px;
     top: 0px;
     right: 0px;
-    padding: 23px 45px 0px 19px;
+    padding: 26px 45px 3px 19px;
     min-height: 72px;
     font-size: 3.7em;
     font-weight: bold;

openslides/core/static/js/core/base.js

@@ -610,8 +610,8 @@ angular.module('OpenSlidesApp.core', [
                 $timeout(function () {
                     Messaging.createOrEditMessage(
                         'connectionLostMessage',
-                        gettextCatalog.getString('Connection lost. You are not connected to the server anymore.'),
+                        gettextCatalog.getString('Offline mode: You can use OpenSlides but changes are not saved.'),
-                        'error',
+                        'warning',
                         {noClose: true});
                 }, 1);
             },

openslides/motions/static/js/motions/base.js

@@ -566,7 +566,7 @@ angular.module('OpenSlidesApp.motions', [
                         }
                         return value;
                     });
-                    mode = mode || 'original';
+                    mode = mode || Config.get('motions_recommendation_text_mode').value;
                     if (!wasProjectedBefore) {
                         return $http.post(
                             '/rest/core/projector/' + projectorId + '/prune_elements/',

openslides/motions/static/js/motions/projector.js

@@ -30,7 +30,13 @@ angular.module('OpenSlidesApp.motions.projector', [
 
         Motion.bindOne(id, $scope, 'motion');
         User.bindAll({}, $scope, 'users');
-        MotionChangeRecommendation.bindAll({}, $scope, 'change_recommendations');
+        MotionChangeRecommendation.bindAll({
+            where: {
+                motion_version_id: {
+                    '==': id,
+                },
+            },
+        }, $scope, 'change_recommendations');
     }
 ]);
 

openslides/motions/static/js/motions/site.js

@@ -1245,7 +1245,10 @@ angular.module('OpenSlidesApp.motions.site', [
             {mode: 'agreed',
             label: 'Final version'},
         ];
-        $scope.projectionMode = $scope.projectionModes[0];
+        var motionDefaultTextMode = Config.get('motions_recommendation_text_mode').value;
+        $scope.projectionMode = _.find($scope.projectionModes, function (mode) {
+            return mode.mode == motionDefaultTextMode;
+        });
         if (motion.isProjected().length) {
             var modeMapping = motion.isProjectedWithMode();
             _.forEach($scope.projectionModes, function (mode) {

openslides/users/static/js/users/site.js

@@ -493,8 +493,9 @@ angular.module('OpenSlidesApp.users.site', [
     'osTableSort',
     'gettext',
     'UserPdfExport',
+    'ErrorMessage',
     function($scope, $state, $http, $q, ngDialog, UserForm, User, Group, PasswordGenerator, Projector, ProjectionDefault,
-        Config, gettextCatalog, UserCsvExport, osTableFilter, osTableSort, gettext, UserPdfExport) {
+        Config, gettextCatalog, UserCsvExport, osTableFilter, osTableSort, gettext, UserPdfExport, ErrorMessage) {
         User.bindAll({}, $scope, 'users');
         Group.bindAll({where: {id: {'>': 1}}}, $scope, 'groups');
         $scope.$watch(function () {