Skip to content

Commit

Permalink
Merge pull request #379 from spderosso/theming
Browse files Browse the repository at this point in the history
Theming
  • Loading branch information
spderosso committed Nov 4, 2019
2 parents d43f6ce + 4a55184 commit e32c879
Show file tree
Hide file tree
Showing 82 changed files with 697 additions and 398 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<form (ngSubmit)="onSubmit()" class="form-horizontal">
<!-- TODO add the other fields -->
<div class="form-group">
<button mat-button type="submit">{{buttonLabel}}</button>
<div class="dv-mat-button">
<button mat-button type="submit">{{buttonLabel}}</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<div class="form-group">
<button mat-button (click)="deleteResource()">
<i class="material-icons">delete</i>
</button>
<div class="dv-mat-button">
<button mat-button (click)="deleteResource()">
<i class="material-icons">delete</i>
</button>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
</mat-form-field>
</div>
<div class="form-group">
<button mat-button [disabled]="!editConsumerForm.valid" type="submit">
{{buttonLabel}}
</button>
<div class="dv-mat-button">
<button mat-button [disabled]="!editConsumerForm.valid" type="submit">
{{buttonLabel}}
</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form (ngSubmit)="onSubmit()" [formGroup]="changePasswordForm"
<form (ngSubmit)="onSubmit()" [formGroup]="changePasswordForm"
class="form-horizontal">
<div class="form-group">
<div *ngIf="newPasswordSaved">
Expand All @@ -14,7 +14,7 @@
<div class="form-group">
<mat-form-field>
<mat-label>{{oldPasswordLabel}}</mat-label>
<input matInput required type="password"
<input matInput required type="password"
formControlName="oldPasswordControl">
</mat-form-field>
<div *ngIf="oldPasswordControl.invalid && oldPasswordControl.touched">
Expand All @@ -27,7 +27,7 @@
<div class="form-group">
<mat-form-field>
<mat-label>{{passwordLabel}}</mat-label>
<input matInput required type="password"
<input matInput required type="password"
formControlName="passwordControl">
</mat-form-field>
<div *ngIf="passwordControl.invalid && passwordControl.touched">
Expand All @@ -41,7 +41,7 @@
</strong>.
</mat-error>
<mat-error *ngIf="passwordControl.hasError('incorrectPattern')">
Passwords must contain
Passwords must contain
<strong>
{{passwordControl.errors.incorrectPattern}}
</strong>.
Expand All @@ -51,7 +51,7 @@
<div class="form-group">
<mat-form-field>
<mat-label>{{retypePasswordLabel}}</mat-label>
<input matInput required type="password"
<input matInput required type="password"
formControlName="retypePasswordControl">
</mat-form-field>
<div *ngIf="retypePasswordControl.invalid && retypePasswordControl.touched">
Expand All @@ -65,8 +65,10 @@
</div>

<div class="form-group">
<button mat-button type="submit" [disabled]="!changePasswordForm.valid">
{{buttonLabel}}
</button>
<div class="dv-mat-button">
<button mat-button type="submit" [disabled]="!changePasswordForm.valid">
{{buttonLabel}}
</button>
</div>
</div>
</form>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@
</div>

<div *ngIf="showOptionToSubmit" class="form-group">
<button mat-button type="submit" [disabled]="!registerForm.valid">
{{buttonLabel}}
</button>
<div class="dv-mat-button">
<button mat-button type="submit" [disabled]="!registerForm.valid">
{{buttonLabel}}
</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@
</div>

<div class="form-group">
<button mat-button type="submit" [disabled]="!signInForm.valid">
{{buttonLabel}}
</button>
<div class="dv-mat-button">
<button mat-button type="submit" [disabled]="!signInForm.valid">
{{buttonLabel}}
</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<button mat-button (click)="signOut()">{{buttonLabel}}</button>
<div class="dv-mat-button">
<button mat-button (click)="signOut()">{{buttonLabel}}</button>
</div>
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<div *ngIf="resource || resourceId">
<button mat-button *ngIf="!canViewResource" (click)="addViewer()">Add Viewer</button>
<button mat-button *ngIf="canViewResource" (click)="removeViewer()">Remove Viewer</button>
<div class="dv-mat-button">
<button mat-button *ngIf="!canViewResource" (click)="addViewer()">Add Viewer</button>
<button mat-button *ngIf="canViewResource" (click)="removeViewer()">Remove Viewer</button>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
</mat-form-field>
</div>
<div class="form-group add-viewer-form-group">
<button mat-button type="submit">{{buttonLabel}}</button>
<div class="dv-mat-button">
<button mat-button type="submit">{{buttonLabel}}</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
</mat-form-field>
</div>
<div class="form-group create-resource-form-group">
<button mat-button type="submit">{{buttonLabel}}</button>
<div class="dv-mat-button">
<button mat-button type="submit">{{buttonLabel}}</button>
</div>
</div>
</form>
</form>
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<button mat-button (click)="deleteResource()">
<i class="material-icons">delete</i>
</button>
<div class="dv-mat-button">
<button mat-button (click)="deleteResource()">
<i class="material-icons">delete</i>
</button>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
</mat-form-field>
</div>
<div class="form-group remove-viewer-form-group">
<button mat-button type="submit">{{buttonLabel}}</button>
<div class="dv-mat-button">
<button mat-button type="submit">{{buttonLabel}}</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
</div>
</div>
<div *ngIf="showOptionToSubmit" class="form-group">
<button mat-button type="submit" [disabled]="!createMessageForm.valid">
{{buttonLabel}}
</button>
<div class="dv-mat-button">
<button mat-button type="submit" [disabled]="!createMessageForm.valid">
{{buttonLabel}}
</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<button mat-button (click)="deleteMessage()">
<i class="material-icons">delete</i>
</button>
<div class="dv-mat-button">
<button mat-button (click)="deleteMessage()">
<i class="material-icons">delete</i>
</button>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
</div>
</div>
<div *ngIf="showOptionToSubmit" class="form-group">
<button mat-button type="submit" [disabled]="!createCommentForm.valid">
{{buttonLabel}}
</button>
<div class="dv-mat-button">
<button mat-button type="submit" [disabled]="!createCommentForm.valid">
{{buttonLabel}}
</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<button mat-button (click)="deleteComment()">
<i class="material-icons">delete</i>
</button>
<div class="dv-mat-button">
<button mat-button (click)="deleteComment()">
<i class="material-icons">delete</i>
</button>
</div>
Original file line number Diff line number Diff line change
@@ -1,40 +1,46 @@
<div class="container">
<div class="dv-mat-button">
<button mat-button (click)="startEditing()" type="submit" *ngIf="!isEditing&&collapsible">
{{startEditButtonLabel}}
</button>
<form (ngSubmit)="onSubmit()" [formGroup]="editCommentForm"
class="form-horizontal" *ngIf="isEditing||!collapsible">
<div class="form-group">
<div *ngIf="editCommentSaved" class="edit-comment-success">
<i class="material-icons">done</i>
{{editCommentSavedText}}
</div>
<mat-error *ngIf="editCommentError">
<i class="material-icons">report_problem</i>
{{editCommentError}}
</mat-error>
</div>
<form (ngSubmit)="onSubmit()" [formGroup]="editCommentForm"
class="form-horizontal" *ngIf="isEditing||!collapsible">
<div class="form-group">
<div *ngIf="editCommentSaved" class="edit-comment-success">
<i class="material-icons">done</i>
{{editCommentSavedText}}
</div>
<div class="form-group">
<mat-form-field>
<mat-label>{{inputLabel}}</mat-label>
<textarea matInput required formControlName="contentControl">
</textarea>
</mat-form-field>
<div *ngIf="contentControl.invalid && contentControl.touched">
<mat-error *ngIf="contentControl.hasError('required')">
This field is <strong>required</strong>.
</mat-error>
</div>
<mat-error *ngIf="editCommentError">
<i class="material-icons">report_problem</i>
{{editCommentError}}
</mat-error>
</div>
<div class="form-group">
<mat-form-field>
<mat-label>{{inputLabel}}</mat-label>
<textarea matInput required formControlName="contentControl">
</textarea>
</mat-form-field>
<div *ngIf="contentControl.invalid && contentControl.touched">
<mat-error *ngIf="contentControl.hasError('required')">
This field is <strong>required</strong>.
</mat-error>
</div>
<div class="form-group">
</div>
<div class="form-group">
<div class="dv-mat-button">
<button mat-button type="submit" [disabled]="!editCommentForm.valid">
{{buttonLabel}}
</button>
</div>
<div *ngIf="collapsible" class="form-group">
</div>
<div *ngIf="collapsible" class="form-group">
<div class="dv-mat-button">
<button mat-button (click)="stopEditing()" type="button">
{{stopEditButtonLabel}}
</button>
</div>
</form>
</div>
</form>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@
</mat-form-field>
</div>
<div *ngIf="showOptionToSubmit" class="form-group">
<button mat-button type="submit"
[disabled]="!createEventForm.valid">
<div class="dv-mat-button">
<button mat-button type="submit" [disabled]="!createEventForm.valid">
{{buttonLabel}}
</button>
</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@
</mat-form-field>
</div>
<div *ngIf="showOptionToSubmit" class="form-group">
<button mat-button type="submit"
[disabled]="!createWeeklySeriesForm.valid">
{{buttonLabel}}
</button>
<div class="dv-mat-button">
<button mat-button type="submit"
[disabled]="!createWeeklySeriesForm.valid">
{{buttonLabel}}
</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<button mat-button (click)="deleteEvent()">
<i class="material-icons">delete</i>
</button>
<div class="dv-mat-button">
<button mat-button (click)="deleteEvent()">
<i class="material-icons">delete</i>
</button>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
</div>
</div>
<div *ngIf="showOptionToSubmit" class="form-group">
<button mat-button type="submit" [disabled]="!createMessageForm.valid">
{{buttonLabel}}
</button>
<div class="dv-mat-button">
<button mat-button type="submit" [disabled]="!createMessageForm.valid">
{{buttonLabel}}
</button>
</div>
</div>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
<input matInput [(ngModel)]="id" name="id">
</mat-form-field>
</div>
<div *ngIf="showOptionToSubmit" class="form-group">
<button mat-button type="submit">{{buttonLabel}}</button>
<div class="dv-mat-button">
<div *ngIf="showOptionToSubmit" class="form-group">
<button mat-button type="submit">{{buttonLabel}}</button>
</div>
</div>
</form>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button mat-button (click)="startEditing()" type="submit" *ngIf="!isEditing">
{{startEditButtonLabel}}
</button>
<form (ngSubmit)="onSubmit()" [formGroup]="editMessageForm"
<form (ngSubmit)="onSubmit()" [formGroup]="editMessageForm"
class="form-horizontal" *ngIf="isEditing">
<div class="form-group">
<div *ngIf="editMessageSaved" class="edit-message-success">
Expand Down Expand Up @@ -33,9 +33,11 @@
</button>
</div>
<div class="form-group">
<button mat-button (click)="stopEditing()" type="button">
{{stopEditButtonLabel}}
</button>
<div class="dv-mat-button">
<button mat-button (click)="stopEditing()" type="button">
{{stopEditButtonLabel}}
</button>
</div>
</div>
</form>
</div>
</div>
Loading

0 comments on commit e32c879

Please sign in to comment.