AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Amelia's Fixes in (#3722)

Browse source 
Co-authored-by: Amelia <77553571+Fesaa@users.noreply.github.com>
This commit is contained in:
Joe Milazzo 2025-04-11 08:48:12 -06:00 • committed by GitHub
parent 6d97dc6609
commit 416376456e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html
View file

@ -17,12 +17,8 @@
{{formControl.value | defaultValue}} {{formControl.value | defaultValue}}
</ng-template> </ng-template>
<ng-template #edit> <ng-template #edit>
<div class="input-group"> <input id="settings-hostname" aria-describedby="hostname-validations" class="form-control" formControlName="hostName" type="text"
<input id="settings-hostname" aria-describedby="hostname-validations" class="form-control" formControlName="hostName" type="text" [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur>
[class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur>
<button type="button" class="btn btn-outline-secondary" (click)="autofillGmail()">{{t('gmail-label')}}</button>
<button type="button" class="btn btn-outline-secondary" (click)="autofillOutlook()">{{t('outlook-label')}}</button>
</div>
@if (formControl.errors; as errors) { @if (formControl.errors; as errors) {
<div id="hostname-validations" class="invalid-feedback" style="display: inline-block"> <div id="hostname-validations" class="invalid-feedback" style="display: inline-block">
@ -69,7 +65,11 @@
{{formControl.value | defaultValue}} {{formControl.value | defaultValue}}
</ng-template> </ng-template>
<ng-template #edit> <ng-template #edit>
<input type="text" class="form-control" formControlName="host" id="settings-host" appEnterBlur /> <div class="input-group">
<input type="text" class="form-control" formControlName="host" id="settings-host" appEnterBlur />
<button type="button" class="btn btn-outline-secondary" (click)="autofillGmail()">{{t('gmail-label')}}</button>
<button type="button" class="btn btn-outline-secondary" (click)="autofillOutlook()">{{t('outlook-label')}}</button>
</div>
</ng-template> </ng-template>
</app-setting-item> </app-setting-item>
} }

5
UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts
View file

@ -239,6 +239,11 @@ export class SideNavComponent implements OnInit {
} }
async reorderDrop($event: CdkDragDrop<any, any, SideNavStream>) { async reorderDrop($event: CdkDragDrop<any, any, SideNavStream>) {
// Don't allow dropping on non SideNav items
if ($event.currentIndex < 3) {
return;
}
const stream = $event.item.data; const stream = $event.item.data;
// Offset the home, back, and customize button // Offset the home, back, and customize button
this.navService.updateSideNavStreamPosition(stream.name, stream.id, stream.order, $event.currentIndex - 3).subscribe({ this.navService.updateSideNavStreamPosition(stream.name, stream.id, stream.order, $event.currentIndex - 3).subscribe({