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

Merge pull request #2860 from FinnStutzenstein/Issue2852

Browse Source 
adding permission checks
This commit is contained in:
Norman Jäckel 2017-01-14 15:12:19 +01:00 committed by GitHub
commit 286119108c
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1041,6 +1041,7 @@ img {
width: 65%;
padding-right: 5px;
float: left;
margin-bottom: 10px;
}
.col2 .projectorSelector > div > div > button {

6
openslides/core/static/templates/core/manage-projectors.html
View File

@ -1,6 +1,6 @@
<div class="header">
<div class="title">
<div class="submenu">
<div class="submenu" os-perms="core.can_manage_projector">
<!-- New -->
<button class="btn btn-primary" ng-bootbox-prompt="{{ 'Please enter a name for the new projector' | translate }}"
ng-bootbox-prompt-action="createProjector(result)">
@ -37,7 +37,7 @@
</div>
<div class="details">
<div class="projectorContainer">
<div class="projectorContainer" os-perms="core.can_manage_projector">
<div ng-repeat="projector in projectors | orderBy: 'id'">
<div>
@ -130,7 +130,7 @@
</div>
</a>
<!-- projector control buttons -->
<div os-perms="core.can_manage_projector" class="nobr">
<div class="nobr">
<!-- edit -->
<a ng-click="editCurrentSlide(projector)"
ng-disabled="!projector.getStateForCurrentSlide()"

6
openslides/core/static/templates/core/projector-controls.html
View File

@ -48,20 +48,20 @@
</li>
</ul>
</div>
<div>
<div os-perms="core.can_manage_projector">
<button class="btn btn-sm" ng-click="active_projector.toggleBlank()" ng-hide="projectors.length > 1"
ng-class="active_projector.blank ? 'btn-primary' : 'btn-default'">
<i class="fa" ng-class="active_projector.blank ? 'fa-square' : 'fa-square-o'"></i>
<translate>Blank</translate>
</button>
</div>
<a class="btn btn-primary btn-sm manageBtn" ui-sref="manage-projectors">
<a os-perms="core.can_manage_projector" class="btn btn-primary btn-sm manageBtn" ui-sref="manage-projectors">
<i class="fa fa-cog fa-lg"></i>
<translate>Manage</translate>
</a>
</div>
<div class="btn-group nobr" ng-show="projectors.length > 1">
<div class="btn-group nobr" ng-show="projectors.length > 1" os-perms="core.can_manage_projector">
<button class="btn btn-sm" ng-class="broadcast == active_projector.id ? 'btn-primary' : 'btn-default'"
ng-click="active_projector.toggleBroadcast()" ng-disabled="broadcast > 0 && broadcast != active_projector.id">
<i class="fa" ng-class="broadcast == active_projector.id ? 'fa-star' : 'fa-star-o'"></i>