ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some small changes and bugfixes

Browse Source
This commit is contained in:
FinnStutzenstein 2017-06-15 14:25:55 +02:00
parent 4810177b37
commit 2e898275cb
7 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/core/static/css/app.css
View File

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

2
openslides/core/static/css/projector.css
View File

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

4
openslides/core/static/js/core/base.js
View File

@ -610,8 +610,8 @@ angular.module('OpenSlidesApp.core', [
$timeout(function () { $timeout(function () {
Messaging.createOrEditMessage( Messaging.createOrEditMessage(
'connectionLostMessage', '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}); {noClose: true});
}, 1); }, 1);
}, },

2
openslides/motions/static/js/motions/base.js
View File

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

8
openslides/motions/static/js/motions/projector.js
View File

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

5
openslides/motions/static/js/motions/site.js
View File

@ -1245,7 +1245,10 @@ angular.module('OpenSlidesApp.motions.site', [
{mode: 'agreed', {mode: 'agreed',
label: 'Final version'}, 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) { if (motion.isProjected().length) {
var modeMapping = motion.isProjectedWithMode(); var modeMapping = motion.isProjectedWithMode();
_.forEach($scope.projectionModes, function (mode) { _.forEach($scope.projectionModes, function (mode) {

3
openslides/users/static/js/users/site.js
View File

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