Merge branch 'feature/v4' into feature/v4-CI-improvements

pull/3338/head
Jamie 5 years ago committed by GitHub
commit a14b463b44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -5,17 +5,17 @@
<legend>Customization</legend> <legend>Customization</legend>
<div class="col-12"> <div class="col-12">
<mat-form-field> <mat-form-field>
<input matInput placeholder="Application Name" [(ngModel)]="settings.applicationName"> <input matInput placeholder="Application Name" [(ngModel)]="settings.applicationName">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Application URL" [(ngModel)]="settings.applicationurl"> <input matInput placeholder="Application URL" [(ngModel)]="settings.applicationUrl">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Custom Logo" [(ngModel)]="settings.logo"> <input matInput placeholder="Custom Logo" [(ngModel)]="settings.logo">
</mat-form-field> </mat-form-field>
<div *ngIf="settings.logo" class="form-group"> <div *ngIf="settings.logo" class="form-group">
<label for="logo" class="control-label">Logo Preview:</label> <label for="logo" class="control-label">Logo Preview:</label>
@ -24,38 +24,36 @@
</div> </div>
</div> </div>
<mat-checkbox [(ngModel)]="settings.enableCustomDonations" matTooltip="Enable to show a custom donation link in the navigation bar"> <mat-checkbox [(ngModel)]="settings.enableCustomDonations" matTooltip="Enable to show a custom donation link in the navigation bar">
Enable Custom Donation Link Enable Custom Donation Link
</mat-checkbox> </mat-checkbox>
<mat-form-field *ngIf="settings.enableCustomDonations"> <mat-form-field *ngIf="settings.enableCustomDonations">
<input matInput placeholder="Custom Donation URL" [(ngModel)]="settings.customDonationUrl" <input matInput placeholder="Custom Donation URL" [(ngModel)]="settings.customDonationUrl" matTooltip="A link to a Paypal address, or your custom donation url.">
matTooltip="A link to a Paypal address, or your custom donation url."> </mat-form-field>
</mat-form-field> <mat-form-field *ngIf="settings.enableCustomDonations">
<mat-form-field *ngIf="settings.enableCustomDonations"> <input matInput placeholder="Custom Donation URL" [(ngModel)]="settings.enableCustomDonations" matTooltip="Set a custom message to be displayed in the navigation bar.">
<input matInput placeholder="Custom Donation URL" [(ngModel)]="settings.enableCustomDonations" </mat-form-field>
matTooltip="Set a custom message to be displayed in the navigation bar.">
</mat-form-field>
<mat-checkbox [(ngModel)]="settings.useCustomPage" matTooltip="Enabled a custom page where you can fully edit. You will need the Edit Custom Page role.">
Enable Custom Page
<mat-checkbox [(ngModel)]="settings.useCustomPage" matTooltip="Enabled a custom page where you can fully edit. You will need the Edit Custom Page role."> </mat-checkbox>
Enable Custom Page
</mat-checkbox>
<div class="form-group"> <div class="form-group">
<button mat-raised-button (click)="save()" type="submit" type="submit" id="save" color="accent">Submit</button> <button mat-raised-button (click)="save()" type="submit" type="submit" id="save" color="accent">Submit</button>
</div> </div>
<mat-form-field> <mat-form-field>
<textarea matInput [(ngModel)]="settings.customCss" placeholder="Custom CSS"></textarea> <textarea matInput [(ngModel)]="settings.customCss" placeholder="Custom CSS"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<!-- <div class="col-7"> --> <!-- <div class="col-7"> -->
<!-- </div> --> <!-- </div> -->

Loading…
Cancel
Save