diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index a0ddc1068..cd3848cb4 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -760,7 +760,7 @@ img { box-shadow: -5px 5px 5px rgba(0, 0, 0, 0.2); height: 200px; padding: 0 10px 10px 10px; - z-index: 1; + z-index: 10; } #chatbox-text { diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 39ab89cc1..b67ea289c 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -189,9 +189,6 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions']) // angular-formly fields for motion form getFormFields: function () { var workflows = Workflow.getAll(); - angular.forEach(workflows, function(workflow) { - workflow.name = gettextCatalog.getString(workflow.name); - }); var images = Mediafile.getAllImages(); return [ { @@ -319,7 +316,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions']) label: gettextCatalog.getString('Workflow'), optionsAttr: 'bs-options', options: workflows, - ngOptions: 'option.id as option.name for option in to.options', + ngOptions: 'option.id as option.name | translate for option in to.options', placeholder: gettextCatalog.getString('Select or search a workflow ...') }, hideExpression: '!model.more', diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js index 3eea33247..afc711e77 100644 --- a/openslides/users/static/js/users/site.js +++ b/openslides/users/static/js/users/site.js @@ -304,7 +304,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users']) templateOptions: { label: gettextCatalog.getString('Groups'), options: Group.getAll(), - ngOptions: 'option.id as option.name for option in to.options | ' + + ngOptions: 'option.id as option.name | translate for option in to.options | ' + 'filter: {id: "!1"} | filter: {id: "!2"}', placeholder: gettextCatalog.getString('Select or search a group ...') } diff --git a/openslides/users/static/templates/users/group-form.html b/openslides/users/static/templates/users/group-form.html index 260108fe3..43780ebed 100644 --- a/openslides/users/static/templates/users/group-form.html +++ b/openslides/users/static/templates/users/group-form.html @@ -15,7 +15,7 @@
- +