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

Merge pull request #4355 from MaximilianKrambach/amendmentbuttons

Browse Source 
placement of paragraph amendment buttons (fixes #4345)
This commit is contained in:
Emanuel Schütze 2019-02-18 09:45:48 +01:00 committed by GitHub
commit cc45525678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/src/app/site/motions/components/amendment-create-wizard/amendment-create-wizard.component.html
View File

@ -1,10 +1,22 @@
<os-head-bar [nav]="false"> <os-head-bar [nav]="false">
<!-- Title --> <!-- Title -->
<div class="title-slot"><h2 translate>New amendment</h2></div> <div class="title-slot"><h2 translate>New amendment</h2></div>
<div class="menu-slot">
<div *ngIf="matStepper.selectedIndex === 0">
<button mat-button [disabled]="contentForm.value.selectedParagraph === null" (click)="matStepper.next()">
<span class="upper" translate>Next</span>
</button>
</div>
<div *ngIf="matStepper.selectedIndex === 1">
<button type="button" mat-button (click)="saveAmendment()">
<span class="upper" translate>Create</span>
</button>
</div>
</div>
</os-head-bar> </os-head-bar>
<form [formGroup]="contentForm" (ngSubmit)="saveAmendment()" class="on-transition-fade"> <form [formGroup]="contentForm" (ngSubmit)="saveAmendment()" class="on-transition-fade">
<mat-horizontal-stepper linear> <mat-horizontal-stepper #matStepper linear>
<mat-step [completed]="contentForm.value.selectedParagraph"> <mat-step [completed]="contentForm.value.selectedParagraph">
<ng-template matStepLabel>{{ 'Select paragraph' | translate }}</ng-template> <ng-template matStepLabel>{{ 'Select paragraph' | translate }}</ng-template>
<div> <div>
@ -21,16 +33,6 @@
<div class="paragraph-text motion-text" [innerHTML]="paragraph.safeHtml"></div> <div class="paragraph-text motion-text" [innerHTML]="paragraph.safeHtml"></div>
</section> </section>
</div> </div>
<div>
<button
type="button"
mat-button
matStepperNext
[disabled]="contentForm.value.selectedParagraph === null"
>
<span translate>Next</span>
</button>
</div>
</mat-step> </mat-step>
<mat-step> <mat-step>
<ng-template matStepLabel>{{ 'Change paragraph' | translate }}</ng-template> <ng-template matStepLabel>{{ 'Change paragraph' | translate }}</ng-template>
@ -42,11 +44,6 @@
<h5 translate>Reason</h5> <h5 translate>Reason</h5>
<!-- The HTML Editor --> <!-- The HTML Editor -->
<editor formControlName="reason" [init]="tinyMceSettings"></editor> <editor formControlName="reason" [init]="tinyMceSettings"></editor>
<div>
<button type="button" mat-button matStepperPrevious><span translate>Back</span></button>
<button type="button" mat-button (click)="saveAmendment()"><span translate>Create</span></button>
</div>
</mat-step> </mat-step>
</mat-horizontal-stepper> </mat-horizontal-stepper>
</form> </form>