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

Merge pull request #5144 from tsiegleauq/hide-long-amendment-preview-slide

Browse Source 
Hide long amendment preview on motion slide
This commit is contained in:
Emanuel Schütze 2019-11-26 15:34:00 +01:00 committed by GitHub
commit b86054c4b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/app/slides/motions/motion/motion-slide.component.html
View File

@ -20,7 +20,7 @@
<div [ngStyle]="{ width: data.data.show_meta_box ? 'calc(100% - 250px)' : '100%' }"> <div [ngStyle]="{ width: data.data.show_meta_box ? 'calc(100% - 250px)' : '100%' }">
<!-- Title --> <!-- Title -->
<div class="spacer" [ngStyle]="{ height: projector.show_header_footer ? '50px' : '0' }"></div> <div class="spacer" [ngStyle]="{ height: projector.show_header_footer ? '50px' : '0' }"></div>
<div [ngClass]="{ 'slidetitle': data.data.show_meta_box }"> <div [ngClass]="{ slidetitle: data.data.show_meta_box }">
<h1> <h1>
<span *ngIf="data.data.identifier">{{ data.data.identifier }}:</span> <span *ngIf="data.data.identifier">{{ data.data.identifier }}:</span>
{{ getTitleWithChanges() }} {{ getTitleWithChanges() }}
@ -121,10 +121,7 @@
<h3 *ngIf="paragraph.diffLineTo !== paragraph.diffLineFrom + 1" class="amendment-line-header"> <h3 *ngIf="paragraph.diffLineTo !== paragraph.diffLineFrom + 1" class="amendment-line-header">
<span translate>Line</span> {{ paragraph.diffLineFrom }} - {{ paragraph.diffLineTo - 1 }}: <span translate>Line</span> {{ paragraph.diffLineFrom }} - {{ paragraph.diffLineTo - 1 }}:
</h3> </h3>
<div class="paragraph-context" [innerHtml]="paragraph.textPre | trust: 'html'"></div>
<div [innerHtml]="paragraph.text | trust: 'html'"></div> <div [innerHtml]="paragraph.text | trust: 'html'"></div>
<div class="paragraph-context" [innerHtml]="paragraph.textPost | trust: 'html'"></div>
</div> </div>
</section> </section>