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

Merge pull request #3055 from emanuelschuetze/fix

Browse Source 
Fixed iframeoverlay and missing ErrorMessage.
This commit is contained in:
Norman Jäckel 2017-03-05 22:43:10 +01:00 committed by GitHub
commit 0c5746b349
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,7 +439,8 @@ angular.module('OpenSlidesApp.agenda.site', [
'Agenda',
'User',
'operator',
function ($scope, $http, $filter, Agenda, User, operator) {
'ErrorMessage',
function ($scope, $http, $filter, Agenda, User, operator, ErrorMessage) {
User.bindAll({}, $scope, 'users');
$scope.speakerSelectBox = {};

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

@ -944,10 +944,11 @@ img {
.iframeoverlay {
width: 256px;
margin: 0 auto;
position: absolute;
top: 0px;
left: 0px;
display: block;
z-index: 1;
background-color: #f5f5f5;
}
/** Motion **/