-
-
Notifications
You must be signed in to change notification settings - Fork 331
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
00beba5
commit 7b93a9c
Showing
11 changed files
with
125 additions
and
72 deletions.
There are no files selected for viewing
32 changes: 17 additions & 15 deletions
32
UI/Web/src/app/admin/_modals/reset-password-modal/reset-password-modal.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,23 @@ | ||
<form [formGroup]="resetPasswordForm"> | ||
<ng-container *transloco="let t; read:'reset-password-modal'"> | ||
<form [formGroup]="resetPasswordForm"> | ||
<div class="modal-header"> | ||
<h4 class="modal-title" id="modal-basic-title">Reset {{member.username | sentenceCase}}'s Password</h4> | ||
<button type="button" class="btn-close" aria-label="Close" (click)="close()"> | ||
</button> | ||
<h4 class="modal-title" id="modal-basic-title">{{t('title', {username: member.username | sentenceCase})}}</h4> | ||
<button type="button" class="btn-close" [attr.aria-label]="t('close')" (click)="close()"> | ||
|
||
</button> | ||
</div> | ||
<div class="modal-body"> | ||
<div class="alert alert-info" *ngIf="errorMessage !== ''"> | ||
<strong>Error: </strong> {{errorMessage}} | ||
</div> | ||
<div class="mb-3"> | ||
<label for="password" class="form-label">New Password</label> | ||
<input id="password" class="form-control" minlength="4" formControlName="password" type="password"> | ||
</div> | ||
<div class="alert alert-info" *ngIf="errorMessage !== ''"> | ||
<strong>{{t('error-label')}}</strong> {{errorMessage}} | ||
</div> | ||
<div class="mb-3"> | ||
<label for="password" class="form-label">{{t('new-password-label')}}</label> | ||
<input id="password" class="form-control" minlength="4" formControlName="password" type="password"> | ||
</div> | ||
</div> | ||
<div class="modal-footer"> | ||
<button type="button" class="btn btn-secondary" (click)="close()">Cancel</button> | ||
<button type="submit" class="btn btn-primary" [disabled]="resetPasswordForm.value.password.length === 0" (click)="save()">Save</button> | ||
<button type="button" class="btn btn-secondary" (click)="close()">{{t('cancel')}}</button> | ||
<button type="submit" class="btn btn-primary" [disabled]="resetPasswordForm.value.password.length === 0" (click)="save()">{{t('save')}}</button> | ||
</div> | ||
</form> | ||
</form> | ||
</ng-container> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 14 additions & 11 deletions
25
UI/Web/src/app/all-series/_components/all-series/all-series.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,25 @@ | ||
<app-side-nav-companion-bar [hasFilter]="true" [filterOpenByDefault]="filterSettings.openByDefault" (filterOpen)="filterOpen.emit($event)" [filterActive]="filterActive"> | ||
<ng-container *transloco="let t; read: 'all-series'"> | ||
<app-side-nav-companion-bar [hasFilter]="true" [filterOpenByDefault]="filterSettings.openByDefault" (filterOpen)="filterOpen.emit($event)" [filterActive]="filterActive"> | ||
<h2 title> | ||
{{title}} | ||
{{title}} | ||
</h2> | ||
<h6 subtitle *ngIf="pagination">{{pagination.totalItems | number}} Series</h6> | ||
</app-side-nav-companion-bar> | ||
<app-bulk-operations [actionCallback]="bulkActionCallback"></app-bulk-operations> | ||
<app-card-detail-layout | ||
<h6 subtitle *ngIf="pagination">{{t('series-count', {num: pagination.totalItems | number})}}</h6> | ||
</app-side-nav-companion-bar> | ||
<app-bulk-operations [actionCallback]="bulkActionCallback"></app-bulk-operations> | ||
<app-card-detail-layout | ||
[isLoading]="loadingSeries" | ||
[items]="series" | ||
[trackByIdentity]="trackByIdentity" | ||
[filterSettings]="filterSettings" | ||
[filterOpen]="filterOpen" | ||
[jumpBarKeys]="jumpbarKeys" | ||
(applyFilter)="updateFilter($event)" | ||
> | ||
> | ||
<ng-template #cardItem let-item let-position="idx"> | ||
<app-series-card [data]="item" [libraryId]="item.libraryId" (reload)="loadPage()" | ||
(selection)="bulkSelectionService.handleCardSelection('series', position, series.length, $event)" | ||
[selected]="bulkSelectionService.isCardSelected('series', position)" [allowSelection]="true"></app-series-card> | ||
<app-series-card [data]="item" [libraryId]="item.libraryId" (reload)="loadPage()" | ||
(selection)="bulkSelectionService.handleCardSelection('series', position, series.length, $event)" | ||
[selected]="bulkSelectionService.isCardSelected('series', position)" [allowSelection]="true"></app-series-card> | ||
</ng-template> | ||
</app-card-detail-layout> | ||
</app-card-detail-layout> | ||
|
||
</ng-container> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 6 additions & 4 deletions
10
UI/Web/src/app/announcements/_components/announcements/announcements.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
<app-side-nav-companion-bar> | ||
<ng-container *transloco="let t; read: 'announcements'"> | ||
<app-side-nav-companion-bar> | ||
<h2 title> | ||
Announcements | ||
{{t('title')}} | ||
</h2> | ||
</app-side-nav-companion-bar> | ||
</app-side-nav-companion-bar> | ||
|
||
<app-changelog></app-changelog> | ||
<app-changelog></app-changelog> | ||
</ng-container> |
3 changes: 2 additions & 1 deletion
3
UI/Web/src/app/announcements/_components/announcements/announcements.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 19 additions & 12 deletions
31
UI/Web/src/app/announcements/_components/changelog/changelog.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,31 @@ | ||
<div class="changelog"> | ||
<p class="pb-2">If you do not see an <span class="badge bg-secondary">Installed</span> tag, you are on a nightly release. Only major versions will show as available.</p> | ||
<ng-container *ngFor="let update of updates; let indx = index;"> | ||
<div class="card w-100 mb-2" style="width: 18rem;"> | ||
<ng-container *transloco="let t; read: 'changelog'"> | ||
<div class="changelog"> | ||
<p class="pb-2"> | ||
{{t('description', {installed: ''})}} | ||
<span class="badge bg-secondary">{{t('installed')}}</span> | ||
{{t('description-continued', {installed: ''})}} | ||
</p> | ||
<ng-container *ngFor="let update of updates; let indx = index;"> | ||
<div class="card w-100 mb-2" style="width: 18rem;"> | ||
<div class="card-body"> | ||
<h4 class="card-title">{{update.updateTitle}} | ||
<span class="badge bg-secondary" *ngIf="update.updateVersion === update.currentVersion">Installed</span> | ||
<span class="badge bg-secondary" *ngIf="update.updateVersion > update.currentVersion">Available</span> | ||
<span class="badge bg-secondary" *ngIf="update.updateVersion === update.currentVersion">{{t('installed')}}</span> | ||
<span class="badge bg-secondary" *ngIf="update.updateVersion > update.currentVersion">{{t('available')}}</span> | ||
</h4> | ||
<h6 class="card-subtitle mb-1 mt-1 text-muted">Published: {{update.publishDate | date: 'short'}}</h6> | ||
<h6 class="card-subtitle mb-1 mt-1 text-muted">{{t('published-label')}}{{update.publishDate | date: 'short'}}</h6> | ||
|
||
|
||
<pre class="card-text update-body"> | ||
<app-read-more [text]="update.updateBody" [maxLength]="500"></app-read-more> | ||
</pre> | ||
<a *ngIf="!update.isDocker && update.updateVersion === update.currentVersion" href="{{update.updateUrl}}" class="btn disabled btn-{{indx === 0 ? 'primary' : 'secondary'}} float-end" target="_blank" rel="noopener noreferrer">Installed</a> | ||
<a *ngIf="!update.isDocker && update.updateVersion !== update.currentVersion" href="{{update.updateUrl}}" class="btn btn-{{indx === 0 ? 'primary' : 'secondary'}} float-end" target="_blank" rel="noopener noreferrer">Download</a> | ||
<a *ngIf="!update.isDocker && update.updateVersion === update.currentVersion" href="{{update.updateUrl}}" class="btn disabled btn-{{indx === 0 ? 'primary' : 'secondary'}} float-end" target="_blank" rel="noopener noreferrer">{{t('installed')}}</a> | ||
<a *ngIf="!update.isDocker && update.updateVersion !== update.currentVersion" href="{{update.updateUrl}}" class="btn btn-{{indx === 0 ? 'primary' : 'secondary'}} float-end" target="_blank" rel="noopener noreferrer">{{t('download')}}</a> | ||
</div> | ||
</div> | ||
</ng-container> | ||
</div> | ||
</ng-container> | ||
</div> | ||
|
||
|
||
<app-loading [loading]="isLoading"></app-loading> | ||
<app-loading [loading]="isLoading"></app-loading> | ||
|
||
</ng-container> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 23 additions & 20 deletions
43
UI/Web/src/app/registration/_components/reset-password/reset-password.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,27 @@ | ||
<app-splash-container> | ||
<ng-container title><h2>Password Reset</h2></ng-container> | ||
<ng-container *transloco="let t; read:'reset-password'"> | ||
<app-splash-container> | ||
<ng-container title><h2>{{t('title')}}</h2></ng-container> | ||
<ng-container body> | ||
<p>Enter the email of your account. We will send you an email </p> | ||
<form [formGroup]="registerForm" (ngSubmit)="submit()"> | ||
<div class="mb-3" style="width:100%"> | ||
<label for="email" class="form-label">Email</label> | ||
<input class="form-control custom-input" type="email" inputmode="email" id="email" formControlName="email" [class.is-invalid]="registerForm.get('email')?.invalid && registerForm.get('email')?.touched"> | ||
<div id="inviteForm-validations" class="invalid-feedback" *ngIf="registerForm.dirty || registerForm.touched"> | ||
<div *ngIf="registerForm.get('email')?.errors?.required"> | ||
This field is required | ||
</div> | ||
<div *ngIf="registerForm.get('email')?.errors?.email"> | ||
This must be a valid email address | ||
</div> | ||
</div> | ||
<p>{{t('description')}}</p> | ||
<form [formGroup]="registerForm" (ngSubmit)="submit()"> | ||
<div class="mb-3" style="width:100%"> | ||
<label for="email" class="form-label">Email</label> | ||
<input class="form-control custom-input" type="email" inputmode="email" id="email" formControlName="email" [class.is-invalid]="registerForm.get('email')?.invalid && registerForm.get('email')?.touched"> | ||
<div id="inviteForm-validations" class="invalid-feedback" *ngIf="registerForm.dirty || registerForm.touched"> | ||
<div *ngIf="registerForm.get('email')?.errors?.required"> | ||
{{t('required-field')}} | ||
</div> | ||
|
||
<div> | ||
<button class="btn btn-secondary alt" type="submit">Submit</button> | ||
<div *ngIf="registerForm.get('email')?.errors?.email"> | ||
{{t('valid-email')}} | ||
</div> | ||
</form> | ||
</div> | ||
</div> | ||
|
||
<div> | ||
<button class="btn btn-secondary alt" type="submit">{{t('submit')}}</button> | ||
</div> | ||
</form> | ||
</ng-container> | ||
</app-splash-container> | ||
</app-splash-container> | ||
|
||
</ng-container> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters