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

Merge pull request #4887 from GabrielInTheWorld/saveTheProjector

Browse Source 
Updates the projector
This commit is contained in:
Sean 2019-07-31 15:26:46 +02:00 committed by GitHub
commit 62c55094bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/src/app/site/projector/components/projector-detail/projector-detail.component.html
View File

@ -142,7 +142,7 @@
<div class="drag-handle" cdkDragHandle *ngIf="editQueue"> <div class="drag-handle" cdkDragHandle *ngIf="editQueue">
<mat-icon>drag_indicator</mat-icon> <mat-icon>drag_indicator</mat-icon>
</div> </div>
<div class="drag-handle" *ngIf="!editQueue"> <div class="drag-handle no-drag" *ngIf="!editQueue">
<button type="button" mat-icon-button (click)="projectNow(i)"> <button type="button" mat-icon-button (click)="projectNow(i)">
<mat-icon>videocam</mat-icon> <mat-icon>videocam</mat-icon>
</button> </button>
@ -235,7 +235,12 @@
<!-- Slide--> <!-- Slide-->
<mat-list *ngIf="projectorCount > 1"> <mat-list *ngIf="projectorCount > 1">
<mat-list-item> <mat-list-item>
<button type="button" mat-mini-fab (click)="toggleClos(false)" [ngClass]="isClosProjected(false) ? 'projector-active' : 'projector-inactive'"> <button
type="button"
mat-mini-fab
(click)="toggleClos(false)"
[ngClass]="isClosProjected(false) ? 'projector-active' : 'projector-inactive'"
>
<mat-icon>videocam</mat-icon> <mat-icon>videocam</mat-icon>
</button> </button>
<span class="spacer-left-10" translate>Slide</span> <span class="spacer-left-10" translate>Slide</span>
@ -245,7 +250,12 @@
<!-- Overlay --> <!-- Overlay -->
<mat-list> <mat-list>
<mat-list-item> <mat-list-item>
<button type="button" mat-mini-fab (click)="toggleClos(true)" [ngClass]="isClosProjected(true) ? 'projector-active' : 'projector-inactive'"> <button
type="button"
mat-mini-fab
(click)="toggleClos(true)"
[ngClass]="isClosProjected(true) ? 'projector-active' : 'projector-inactive'"
>
<mat-icon>videocam</mat-icon> <mat-icon>videocam</mat-icon>
</button> </button>
<span class="spacer-left-10" translate>Overlay</span> <span class="spacer-left-10" translate>Overlay</span>
@ -255,7 +265,12 @@
<!-- Chyron --> <!-- Chyron -->
<mat-list> <mat-list>
<mat-list-item> <mat-list-item>
<button type="button" mat-mini-fab (click)="toggleChyron()" [ngClass]="isChyronProjected() ? 'projector-active' : 'projector-inactive'"> <button
type="button"
mat-mini-fab
(click)="toggleChyron()"
[ngClass]="isChyronProjected() ? 'projector-active' : 'projector-inactive'"
>
<mat-icon>videocam</mat-icon> <mat-icon>videocam</mat-icon>
</button> </button>
<span class="spacer-left-10" translate>Chyron</span> <span class="spacer-left-10" translate>Chyron</span>
@ -272,8 +287,7 @@
</os-presentation-control> </os-presentation-control>
</mat-expansion-panel>--> </mat-expansion-panel>-->
<os-presentation-control [projector]="projector"> <os-presentation-control [projector]="projector"> </os-presentation-control>
</os-presentation-control>
</mat-accordion> </mat-accordion>
</div> </div>
</div> </div>

4
client/src/app/site/projector/components/projector-detail/projector-detail.component.scss
View File

@ -93,6 +93,10 @@
width: 25px; width: 25px;
color: slategrey; color: slategrey;
cursor: move; cursor: move;
&.no-drag {
cursor: default;
}
} }
.button-right { .button-right {

1
openslides/core/views.py
View File

@ -179,6 +179,7 @@ class ProjectorViewSet(ModelViewSet):
at the same time. at the same time.
""" """
projector = self.get_object() projector = self.get_object()
projector.scroll = 0
elements = request.data.get("elements") elements = request.data.get("elements")
preview = request.data.get("preview") preview = request.data.get("preview")
history_element = request.data.get("append_to_history") history_element = request.data.get("append_to_history")