Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
chore(frontend): tabs enhancement
johaven3e04f4d96b95
diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.html b/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.htmlindex 9360c4b4..f748186b 100644--- a/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.html+++ b/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.html@@ -17,13 +17,14 @@</div><div class="modal-body form-validation" [formGroup]="groupForm"><tabset [justified]="true" type="pills">- <hr class="my-3"><tab (selectTab)="tabView=null" customClass="tab-dialog form-validation"><ng-template tabHeading>- <fa-icon [icon]="icons.faCog"></fa-icon>- <span class="ms-2" l10nTranslate>Settings</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faCog"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Settings</span>+ </span></ng-template>- <div class="d-flex flex-column">+ <div class="app-tab-content d-flex flex-column"><div class="d-flex col-12 pb-3"><div class="flex-fill col-6 pe-4"><label for="name" l10nTranslate>Name</label>@@ -98,10 +99,12 @@</tab><tab (selectTab)="tabView='permissions'" customClass="tab-dialog form-validation"><ng-template tabHeading>- <fa-icon [icon]="icons.faShieldHalved"></fa-icon>- <span class="ms-2" l10nTranslate>Permissions</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faShieldHalved"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Permissions</span>+ </span></ng-template>- <div class="d-flex flex-column">+ <div class="app-tab-content d-flex flex-column"><div class="d-flex col-12 pb-3"><app-admin-permissions [permissions]="groupForm.value.applications" (permissionsChange)="updateApplications($event)"></app-admin-permissions></div>diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html b/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.htmlindex 83beba73..e01e3d05 100644--- a/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html+++ b/frontend/src/app/applications/admin/components/dialogs/admin-user-dialog.component.html@@ -20,13 +20,14 @@</div><div class="modal-body" [formGroup]="userForm"><tabset [justified]="true" type="pills">- <hr class="my-3"><tab (selectTab)="tabView=null" customClass="tab-dialog form-validation"><ng-template tabHeading>- <fa-icon [icon]="icons.faAddressCard"></fa-icon>- <span class="ms-2" l10nTranslate>Account</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faAddressCard"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Account</span>+ </span></ng-template>- <div class="d-flex flex-column">+ <div class="app-tab-content d-flex flex-column"><div class="d-flex col-12 pb-3"><div class="flex-fill col-6 pe-4"><label for="login" l10nTranslate>Login</label>@@ -136,78 +137,84 @@</div></div>}- </div>- @if (user) {- <div class="d-flex col-12 pb-3">- <div class="flex-fill col-6 pe-4">- <label for="created" l10nTranslate>Creation date</label>- <div id="created">{{ user.createdAt | amDateFormat }}</div>- </div>- <div class="d-flex flex-column align-items-end col-6 ps-4">- <label for="access" l10nTranslate>Last accesses</label>- <div class="text-align-end" id="access">- @if (user.lastAccess) {- <div>{{ user.currentAccess | amDateFormat }} - {{ user.currentIp }}</div>- <div>{{ user.lastAccess | amDateFormat }} - {{ user.lastIp }}</div>- } @else {- <span class="text-danger" l10nTranslate>never</span>- }+ @if (user) {+ <div class="d-flex col-12 pb-3">+ <div class="flex-fill col-6 pe-4">+ <label for="created" l10nTranslate>Creation date</label>+ <div id="created">{{ user.createdAt | amDateFormat }}</div>+ </div>+ <div class="d-flex flex-column align-items-end col-6 ps-4">+ <label for="access" l10nTranslate>Last accesses</label>+ <div class="text-align-end" id="access">+ @if (user.lastAccess) {+ <div>{{ user.currentAccess | amDateFormat }} - {{ user.currentIp }}</div>+ <div>{{ user.lastAccess | amDateFormat }} - {{ user.lastIp }}</div>+ } @else {+ <span class="text-danger" l10nTranslate>never</span>+ }+ </div></div></div>- </div>- }+ }+ </div></tab><tab (selectTab)="tabView='permissions'" customClass="tab-dialog"><ng-template tabHeading>- <fa-icon [icon]="icons.faShieldHalved"></fa-icon>- <span class="ms-2" l10nTranslate>Permissions</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faShieldHalved"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Permissions</span>+ </span></ng-template>- <div class="d-flex flex-column col-12 pb-3">- <label for="account" l10nTranslate>Account status</label>- <div id="account" class="form-check form-switch form-check-inline">- <div class="d-flex">- <label class="form-check-label" for="isActive">- <input class="form-check-input" formControlName="isActive" id="isActive" type="checkbox">- <span [class.text-danger]="!userForm.value.isActive">- {{ (userForm.value.isActive ? 'active' : 'suspended') | translate:locale.language | titlecase }}- </span>- </label>- </div>- <div class="d-flex">- <label class="form-check-label" for="isAdmin">- <input class="form-check-input" formControlName="isAdmin" id="isAdmin" type="checkbox">- <span l10nTranslate>Administrator</span>- </label>+ <div class="app-tab-content">+ <div class="d-flex flex-column col-12 pb-3">+ <label for="account" l10nTranslate>Account status</label>+ <div id="account" class="form-check form-switch form-check-inline">+ <div class="d-flex">+ <label class="form-check-label" for="isActive">+ <input class="form-check-input" formControlName="isActive" id="isActive" type="checkbox">+ <span [class.text-danger]="!userForm.value.isActive">+ {{ (userForm.value.isActive ? 'active' : 'suspended') | translate:locale.language | titlecase }}+ </span>+ </label>+ </div>+ <div class="d-flex">+ <label class="form-check-label" for="isAdmin">+ <input class="form-check-input" formControlName="isAdmin" id="isAdmin" type="checkbox">+ <span l10nTranslate>Administrator</span>+ </label>+ </div></div></div>- </div>- <app-admin-permissions [permissions]="userForm.value.applications" (permissionsChange)="updateApplications($event)"></app-admin-permissions>- @if (userForm.value.groups.length) {- <div class="d-flex flex-column col-12 pb-3">- <label for="groups_permissions" l10nTranslate>Permissions inherited from groups</label>- <div id="groups_permissions">- @for (g of userForm.value.groups; track g.id) {- @if (g.permissions) {- <div class="d-flex align-items-center mb-1">- <div class="d-flex align-items-center me-5">- <fa-icon [icon]="icons.GROUPS" class="circle-primary-icon me-2"></fa-icon>- <span>{{ g.name }}</span>+ <app-admin-permissions [permissions]="userForm.value.applications" (permissionsChange)="updateApplications($event)"></app-admin-permissions>+ @if (userForm.value.groups.length) {+ <div class="d-flex flex-column col-12 pb-3">+ <label for="groups_permissions" l10nTranslate>Permissions inherited from groups</label>+ <div id="groups_permissions">+ @for (g of userForm.value.groups; track g.id) {+ @if (g.permissions) {+ <div class="d-flex align-items-center mb-1">+ <div class="d-flex align-items-center me-5">+ <fa-icon [icon]="icons.GROUPS" class="circle-primary-icon me-2"></fa-icon>+ <span>{{ g.name }}</span>+ </div>+ <div class="d-flex fs-xxs ms-auto">{{ g.permissions | split | join:true }}</div></div>- <div class="d-flex fs-xxs ms-auto">{{ g.permissions | split | join:true }}</div>- </div>+ }}- }+ </div></div>- </div>- }+ }+ </div></tab><tab (selectTab)="tabView='groups'" customClass="tab-dialog"><ng-template tabHeading>- <fa-icon [icon]="icons.faUsers"></fa-icon>- <span class="ms-2 me-1" l10nTranslate>Groups</span>- <span>({{ userForm.value.groups.length || 0 }})</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faUsers"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Groups</span>+ <span class="app-tab-count">{{ userForm.value.groups.length || 0 }}</span>+ </span></ng-template>- <div class="my-3">+ <div class="app-tab-content my-3"><app-user-search[members]="userForm.value.groups"(membersChange)="updateMembers($event)"@@ -234,4 +241,4 @@l10nTranslate>{{ confirmDeletion ? 'Confirm deletion' : 'Confirm' }}</button>-</div>\ No newline at end of file+</div>diff --git a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.htmlindex 67cb8b70..da4ba02c 100644--- a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html+++ b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html@@ -19,13 +19,14 @@</div><div class="modal-body"><tabset [justified]="true" type="pills">- <hr class="my-3"><tab (selectTab)="tabView=null" customClass="tab-dialog form-validation"><ng-template tabHeading>- <fa-icon [icon]="icons.faCog"></fa-icon>- <span class="ms-2" l10nTranslate>Settings</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faCog"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Settings</span>+ </span></ng-template>- <div class="row g-3">+ <div class="app-tab-content row g-3"><div class="col-12 col-lg-6 d-flex flex-column"><div class="card dialog-tab-card w-100 flex-grow-1 d-flex"><div class="card-body d-flex flex-column h-100">@@ -51,9 +52,13 @@[(ngModel)]="share.description"class="form-control form-control-sm"></div>- @if (share.externalPath) {- <div class="d-flex flex-column align-items-start mb-3">- <app-storage-quota [(quota)]="share.storageQuota" [fullWidth]="true" class="w-100"></app-storage-quota>+ </div>+ </div>+ @if (share.externalPath) {+ <div class="card dialog-tab-card mt-2">+ <div class="card-body p-2 d-flex flex-column gap-2">+ <div class="d-flex flex-column align-items-start">+ <app-storage-quota [(quota)]="share.storageQuota" [fullWidth]="true" class="w-100 mb-3"></app-storage-quota></div>@if (share.storageUsage) {<div class="d-flex flex-column mb-3">@@ -61,54 +66,53 @@<app-storage-usage id="storage" [item]="share"></app-storage-usage></div>}- }-- <div class="d-flex justify-content-between gap-2 mt-auto">- <div- class="card dialog-check-card dialog-check-card--interactive flex-fill"- [class.dialog-check-card--active]="share.enabled"- (click)="toggleShareStatusFromCard()">- <div class="card-body p-2">- <label class="form-label" for="switchStatus" (click)="$event.stopPropagation()" l10nTranslate>Share status</label>- <div class="d-flex align-items-center form-check form-switch cursor-pointer">- <input class="form-check-input"- [ngModel]="share.enabled"- (ngModelChange)="setShareStatus($event)"- (click)="$event.stopPropagation()"- id="switchStatus"- type="checkbox"- role="button">- <label class="form-label form-check-label mb-0 ms-2" for="switchStatus" (click)="$event.stopPropagation()" l10nTranslate>- {{ share.enabled ? 'enabled' : 'disabled' }}- </label>- </div>- </div>+ </div>+ </div>+ }+ <div class="d-flex justify-content-between gap-2 mt-2">+ <div+ class="card dialog-check-card dialog-check-card--interactive flex-fill"+ [class.dialog-check-card--active]="share.enabled"+ (click)="toggleShareStatusFromCard()">+ <div class="card-body p-2">+ <label class="form-label" for="switchStatus" (click)="$event.stopPropagation()" l10nTranslate>Share status</label>+ <div class="d-flex align-items-center form-check form-switch cursor-pointer">+ <input class="form-check-input"+ [ngModel]="share.enabled"+ (ngModelChange)="setShareStatus($event)"+ (click)="$event.stopPropagation()"+ id="switchStatus"+ type="checkbox"+ role="button">+ <label class="form-label form-check-label mb-0 ms-2" for="switchStatus" (click)="$event.stopPropagation()" l10nTranslate>+ {{ share.enabled ? 'enabled' : 'disabled' }}+ </label></div>+ </div>+ </div>- @if (share.externalPath) {- <div- class="card dialog-check-card dialog-check-card--interactive flex-fill"- [class.dialog-check-card--active]="share.storageIndexing"- (click)="toggleFullTextSearchFromCard()">- <div class="card-body p-2">- <label class="form-label" for="switchFullText" (click)="$event.stopPropagation()" l10nTranslate>Full-text search</label>- <div class="d-flex align-items-center form-check form-switch cursor-pointer">- <input- class="form-check-input"- [(ngModel)]="share.storageIndexing"- (click)="$event.stopPropagation()"- id="switchFullText"- type="checkbox"- role="button">- <label class="form-label form-check-label mb-0 ms-2" for="switchFullText" (click)="$event.stopPropagation()" l10nTranslate>- {{ share.storageIndexing ? 'enabled' : 'disabled' }}- </label>- </div>- </div>+ @if (share.externalPath) {+ <div+ class="card dialog-check-card dialog-check-card--interactive flex-fill"+ [class.dialog-check-card--active]="share.storageIndexing"+ (click)="toggleFullTextSearchFromCard()">+ <div class="card-body p-2">+ <label class="form-label" for="switchFullText" (click)="$event.stopPropagation()" l10nTranslate>Full-text search</label>+ <div class="d-flex align-items-center form-check form-switch cursor-pointer">+ <input+ class="form-check-input"+ [(ngModel)]="share.storageIndexing"+ (click)="$event.stopPropagation()"+ id="switchFullText"+ type="checkbox"+ role="button">+ <label class="form-label form-check-label mb-0 ms-2" for="switchFullText" (click)="$event.stopPropagation()" l10nTranslate>+ {{ share.storageIndexing ? 'enabled' : 'disabled' }}+ </label></div>- }+ </div></div>- </div>+ }</div></div>@@ -133,10 +137,8 @@</div></div></div>- </div>- @if (share?.id) {- <div class="col-12">- <div class="card dialog-tab-card">+ @if (share?.id) {+ <div class="card dialog-tab-card mt-2"><div class="card-body"><div class="d-flex fs-xxs align-items-end flex-fill justify-content-between gap-3 flex-wrap">@if (share.disabledAt && !share.enabled) {@@ -156,17 +158,19 @@</div></div></div>- </div>- }+ }+ </div></div></tab><tab (selectTab)="tabView='members'" customClass="tab-dialog"><ng-template tabHeading>- <fa-icon [icon]="icons.faUsers"></fa-icon>- <span class="ms-2 me-1" l10nTranslate>Members</span>- <span>({{ share.members.length }})</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faUsers"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Members</span>+ <span class="app-tab-count">{{ share.members.length }}</span>+ </span></ng-template>- <div class="my-3">+ <div class="app-tab-content my-3"><app-user-search[(members)]="share.members"[withPermissions]="true"@@ -178,11 +182,13 @@</tab><tab (selectTab)="tabView='links'" customClass="tab-dialog"><ng-template tabHeading>- <fa-icon [icon]="icons.LINKS"></fa-icon>- <span class="ms-2 me-1" l10nTranslate>Links</span>- <span>({{ share.links.length }})</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.LINKS"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Links</span>+ <span class="app-tab-count">{{ share.links.length }}</span>+ </span></ng-template>- <div class="my-3">+ <div class="app-tab-content my-3"><app-user-search [(members)]="share.links"[filterPermissions]="true"[allowedPermissions]="allowedPermissions"diff --git a/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html b/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.htmlindex a1808747..b6b91327 100644--- a/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html+++ b/frontend/src/app/applications/spaces/components/dialogs/space-dialog.component.html@@ -19,15 +19,16 @@</div><div class="modal-body"><tabset [justified]="true" type="pills">- <hr class="my-3"><tab (selectTab)="tabView=null" customClass="tab-dialog form-validation"><ng-template tabHeading>- <fa-icon [icon]="icons.faCog"></fa-icon>- <span class="ms-2" l10nTranslate>Settings</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faCog"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Settings</span>+ </span></ng-template>- <div class="row g-3">- <div class="col-12 col-lg-6 d-flex">- <div class="card dialog-tab-card w-100">+ <div class="app-tab-content row g-3">+ <div class="col-12 col-lg-6 d-flex flex-column">+ <div class="card dialog-tab-card w-100 mb-3"><div class="card-body d-flex flex-column"><div class="mb-3 px-0"><label class="form-label" for="name" l10nTranslate>@@ -51,8 +52,12 @@[(ngModel)]="space.description"class="form-control form-control-sm"></div>- <div class="d-flex flex-column align-items-start mb-3">- <app-storage-quota [(quota)]="space.storageQuota" [fullWidth]="true" class="w-100"></app-storage-quota>+ </div>+ </div>+ <div class="card dialog-tab-card mb-3">+ <div class="card-body p-2 d-flex flex-column gap-2">+ <div class="d-flex flex-column align-items-start">+ <app-storage-quota [(quota)]="space.storageQuota" [fullWidth]="true" class="w-100 mb-3"></app-storage-quota></div>@if (space.storageUsage) {<div class="d-flex flex-column mb-3">@@ -60,40 +65,40 @@<app-storage-usage id="storage" [item]="space"></app-storage-usage></div>}- <div class="d-flex justify-content-between gap-2">- <div- class="card dialog-check-card dialog-check-card--interactive flex-fill"- [class.dialog-check-card--active]="space.enabled"- (click)="toggleSpaceStatusFromCard()">- <div class="card-body p-2">- <label class="form-label" for="switchStatus" (click)="$event.stopPropagation()" l10nTranslate>Space status</label>- <div class="d-flex align-items-center form-check form-switch cursor-pointer">- <input class="form-check-input"- [ngModel]="space.enabled"- (ngModelChange)="setSpaceStatus($event)"- (click)="$event.stopPropagation()"- id="switchStatus"- type="checkbox"- role="button">- <label class="form-label form-check-label mb-0 ms-2" for="switchStatus" (click)="$event.stopPropagation()" l10nTranslate>- {{ space.enabled ? 'enabled' : 'disabled' }}- </label>- </div>- </div>+ </div>+ </div>+ <div class="d-flex justify-content-between gap-2">+ <div+ class="card dialog-check-card dialog-check-card--interactive flex-fill"+ [class.dialog-check-card--active]="space.enabled"+ (click)="toggleSpaceStatusFromCard()">+ <div class="card-body p-2">+ <label class="form-label" for="switchStatus" (click)="$event.stopPropagation()" l10nTranslate>Space status</label>+ <div class="d-flex align-items-center form-check form-switch cursor-pointer">+ <input class="form-check-input"+ [ngModel]="space.enabled"+ (ngModelChange)="setSpaceStatus($event)"+ (click)="$event.stopPropagation()"+ id="switchStatus"+ type="checkbox"+ role="button">+ <label class="form-label form-check-label mb-0 ms-2" for="switchStatus" (click)="$event.stopPropagation()" l10nTranslate>+ {{ space.enabled ? 'enabled' : 'disabled' }}+ </label></div>- <div- class="card dialog-check-card dialog-check-card--interactive flex-fill"- [class.dialog-check-card--active]="space.storageIndexing"- (click)="toggleFullTextSearchFromCard()">- <div class="card-body p-2">- <label class="form-label" for="switchFullText" (click)="$event.stopPropagation()" l10nTranslate>Full-text search</label>- <div class="d-flex align-items-center form-check form-switch cursor-pointer">- <input class="form-check-input" [(ngModel)]="space.storageIndexing" (click)="$event.stopPropagation()" id="switchFullText" type="checkbox" role="button">- <label class="form-label form-check-label mb-0 ms-2" for="switchFullText" (click)="$event.stopPropagation()" l10nTranslate>- {{ space.storageIndexing ? 'enabled' : 'disabled' }}- </label>- </div>- </div>+ </div>+ </div>+ <div+ class="card dialog-check-card dialog-check-card--interactive flex-fill"+ [class.dialog-check-card--active]="space.storageIndexing"+ (click)="toggleFullTextSearchFromCard()">+ <div class="card-body p-2">+ <label class="form-label" for="switchFullText" (click)="$event.stopPropagation()" l10nTranslate>Full-text search</label>+ <div class="d-flex align-items-center form-check form-switch cursor-pointer">+ <input class="form-check-input" [(ngModel)]="space.storageIndexing" (click)="$event.stopPropagation()" id="switchFullText" type="checkbox" role="button">+ <label class="form-label form-check-label mb-0 ms-2" for="switchFullText" (click)="$event.stopPropagation()" l10nTranslate>+ {{ space.storageIndexing ? 'enabled' : 'disabled' }}+ </label></div></div></div>@@ -147,22 +152,26 @@<tab (selectTab)="tabView='roots'" customClass="tab-dialog"><ng-template tabHeading>- <fa-icon [icon]="icons.faAnchor"></fa-icon>- <span class="ms-2 me-1" l10nTranslate>Files</span>- <span>({{ space.roots?.length || 0 }})</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faAnchor"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Files</span>+ <span class="app-tab-count">{{ space.roots?.length || 0 }}</span>+ </span></ng-template>- <div class="mt-3">+ <div class="app-tab-content"><app-space-manage-roots [space]="space" [user]="user" [addRootFile]="addRootFileEvent"></app-space-manage-roots></div></tab><tab (selectTab)="tabView='members'" customClass="tab-dialog"><ng-template tabHeading>- <fa-icon [icon]="icons.faUsers"></fa-icon>- <span class="ms-2 me-1" l10nTranslate>Members</span>- <span>({{ space.members.length }})</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faUsers"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Members</span>+ <span class="app-tab-count">{{ space.members.length }}</span>+ </span></ng-template>- <div class="mt-3">+ <div class="app-tab-content"><app-user-search [(members)]="space.members"[withPermissions]="true"[searchFunction]="searchMembers.bind(this)">@@ -172,11 +181,13 @@<tab (selectTab)="tabView='links'" customClass="tab-dialog"><ng-template tabHeading>- <fa-icon [icon]="icons.LINKS"></fa-icon>- <span class="ms-2 me-1" l10nTranslate>Links</span>- <span>({{ space.links.length }})</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.LINKS"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Links</span>+ <span class="app-tab-count">{{ space.links.length }}</span>+ </span></ng-template>- <div class="mt-3">+ <div class="app-tab-content"><app-user-search [(members)]="space.links"[filterPermissions]="true"[allowedPermissions]="allowedLinkPermissions"diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.html b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.htmlindex 4cc0d40a..c66b6d31 100644--- a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.html+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.html@@ -7,11 +7,23 @@</div><div class="modal-body"><tabset [justified]="true" type="pills">- <hr style="margin-top: 8px; margin-bottom: 6px">- <tab [heading]="'Settings' | translate:locale.language" customClass="tab-dialog">- <app-sync-path-settings [showPaths]="true" [syncPath]="syncPath" direction="start" size="large"></app-sync-path-settings>+ <tab customClass="tab-dialog">+ <ng-template tabHeading>+ <span class="app-tab-heading">+ <span class="app-tab-label">{{ 'Settings' | translate:locale.language }}</span>+ </span>+ </ng-template>+ <div class="app-tab-content">+ <app-sync-path-settings [showPaths]="true" [syncPath]="syncPath" direction="start" size="large"></app-sync-path-settings>+ </div></tab>- <tab [heading]="'Filters' | translate:locale.language" customClass="tab-dialog">+ <tab customClass="tab-dialog">+ <ng-template tabHeading>+ <span class="app-tab-heading">+ <span class="app-tab-label">{{ 'Filters' | translate:locale.language }}</span>+ </span>+ </ng-template>+ <div class="app-tab-content"><div class="d-flex align-items-center mb-2"><div class="d-flex flex-row col-12 px-0"><select [(ngModel)]="currentFilterType" class="form-select form-select-sm me-1">@@ -46,6 +58,7 @@</button></div>}+ </div></tab></tabset></div>diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.ts b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.tsindex 315aeb57..1c0fe9f0 100755--- a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.ts+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.ts@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms'import { FaIconComponent } from '@fortawesome/angular-fontawesome'import { faRotate, faTimes } from '@fortawesome/free-solid-svg-icons'import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'-import { TabDirective, TabsetComponent } from 'ngx-bootstrap/tabs'+import { TabDirective, TabHeadingDirective, TabsetComponent } from 'ngx-bootstrap/tabs'import { ELECTRON_DIALOG } from '../../../../electron/constants/dialogs'import { LayoutService } from '../../../../layout/layout.service'import { StoreService } from '../../../../store/store.service'@@ -16,7 +16,16 @@ import { SyncPathSettingsComponent } from '../shared/sync-path-settings.componen@Component({selector: 'app-sync-path-settings-dialog',- imports: [TabsetComponent, L10nTranslatePipe, TabDirective, SyncPathSettingsComponent, FormsModule, FaIconComponent, L10nTranslateDirective],+ imports: [+ TabsetComponent,+ L10nTranslatePipe,+ TabDirective,+ SyncPathSettingsComponent,+ FormsModule,+ FaIconComponent,+ L10nTranslateDirective,+ TabHeadingDirective+ ],templateUrl: 'sync-path-settings.dialog.component.html'})export class SyncPathSettingsDialogComponent implements OnInit {diff --git a/frontend/src/app/applications/users/components/dialogs/user-guest-dialog.component.html b/frontend/src/app/applications/users/components/dialogs/user-guest-dialog.component.htmlindex f27e5f30..5418d6ee 100644--- a/frontend/src/app/applications/users/components/dialogs/user-guest-dialog.component.html+++ b/frontend/src/app/applications/users/components/dialogs/user-guest-dialog.component.html@@ -20,13 +20,14 @@</div><div class="modal-body" [formGroup]="guestForm"><tabset [justified]="true" type="pills">- <hr class="my-3"><tab (selectTab)="tabView=null" customClass="tab-dialog form-validation"><ng-template tabHeading>- <fa-icon [icon]="icons.faAddressCard"></fa-icon>- <span class="ms-2" l10nTranslate>Account</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faAddressCard"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Account</span>+ </span></ng-template>- <div class="d-flex flex-column">+ <div class="app-tab-content d-flex flex-column"><div class="d-flex col-12 pb-3"><div class="flex-fill col-6 pe-4"><label for="login" l10nTranslate>Login</label>@@ -142,11 +143,13 @@</tab><tab (selectTab)="tabView='managers'" customClass="tab-dialog"><ng-template tabHeading>- <fa-icon [icon]="icons.faUsersGear"></fa-icon>- <span class="ms-2 me-1" l10nTranslate>Managers</span>- <span>({{ guestForm.value.managers.length || 0 }})</span>+ <span class="app-tab-heading">+ <fa-icon [icon]="icons.faUsersGear"></fa-icon>+ <span class="app-tab-label" l10nTranslate>Managers</span>+ <span class="app-tab-count">{{ guestForm.value.managers.length || 0 }}</span>+ </span></ng-template>- <div class="my-3">+ <div class="app-tab-content my-3"><app-user-search[members]="guestForm.value.managers"(membersChange)="updateManagers($event)"@@ -176,4 +179,4 @@l10nTranslate>{{ confirmDeletion ? 'Confirm deletion' : 'Confirm' }}</button>-</div>\ No newline at end of file+</div>diff --git a/frontend/src/app/common/components/storage-quota.component.ts b/frontend/src/app/common/components/storage-quota.component.tsindex 1d1224af..d00d8c78 100644--- a/frontend/src/app/common/components/storage-quota.component.ts+++ b/frontend/src/app/common/components/storage-quota.component.ts@@ -9,7 +9,7 @@ import { quotaRegexp } from '../utils/regexp'selector: 'app-storage-quota',imports: [L10nTranslatePipe, TooltipModule, FormsModule, L10nTranslateDirective],template: `- <label for="storageQuota" l10nTranslate>Storage Quota</label>+ <label for="storageQuota" class="form-label" l10nTranslate>Storage Quota</label><div id="storageQuota"><inputid="quota"diff --git a/frontend/src/styles/components/_modal.scss b/frontend/src/styles/components/_modal.scssindex 8a42ddc1..44cb5a6d 100644--- a/frontend/src/styles/components/_modal.scss+++ b/frontend/src/styles/components/_modal.scss@@ -31,10 +31,60 @@padding: 8px 12px;}- .nav-link {- white-space: nowrap;- @extend .no-select-pointer;- width: 98% !important;+ tabset {+ > .nav.nav-pills,+ > ul.nav.nav-pills {+ display: grid;+ grid-auto-flow: column;+ grid-auto-columns: minmax(0, 1fr);+ gap: $nav-link-padding-y;+ padding: $nav-link-padding-y;+ margin: 0 0 .6rem;+ border-radius: $nav-tabs-border-radius;++ > li {+ min-width: 0;+ }++ .nav-link {+ width: 100% !important;+ margin: 0 !important;+ padding: $nav-link-padding-y $nav-link-padding-x !important;+ border-radius: $nav-pills-border-radius;+ border: .5px solid transparent;+ display: flex;+ align-items: center;+ justify-content: center;+ font-weight: $nav-link-font-weight;+ letter-spacing: .01em;+ transition: $nav-link-transition;+ }+ }++ .app-tab-heading {+ display: inline-flex;+ align-items: center;+ gap: .45rem;+ min-width: 0;+ }++ .app-tab-label {+ @extend .text-truncate;+ max-width: 100%;+ }++ .app-tab-count {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ min-width: 1.35rem;+ height: 1.35rem;+ padding: 0 .35rem;+ border-radius: 999px;+ font-size: $font-size-xxxs;+ font-weight: 600;+ line-height: 1;+ }}}@@ -98,4 +148,4 @@.modal.show .modal-dialog {opacity: 1;transform: translateY(0) scale(1);-}\ No newline at end of file+}diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scssindex ed1bb83b..061d4530 100755--- a/frontend/src/styles/components/_theme_dark.scss+++ b/frontend/src/styles/components/_theme_dark.scss@@ -193,6 +193,42 @@.dialog-check-card--active {border-color: $dark-dialog-check-card-active-border-color;}+ tabset {+ > .nav.nav-pills,+ > ul.nav.nav-pills {+ border: 1px solid $dark-dialog-tabs-bar-border-color;+ background: $dark-dialog-tabs-bar-bg;++ .nav-link {+ background: $dark-dialog-tab-bg;+ color: $dark-dialog-tab-color;+ }++ .nav-link:hover:not(.active) {+ background: $dark-dialog-tab-hover-bg;+ color: $dark-dialog-tab-hover-color;+ border-color: $dark-dialog-tab-hover-border-color;+ }++ .nav-link:hover:not(.active) .app-tab-count {+ background: $dark-dialog-tab-count-hover-bg;+ color: $dark-dialog-tab-count-hover-color;+ }++ .nav-link.active {+ background: $dark-dialog-tab-active-bg;+ color: $white;+ border-color: $dark-dialog-tab-active-border-color;+ box-shadow: $dark-dialog-tab-active-shadow;+ }+ }++ .app-tab-count {+ background: $dark-dialog-tab-count-bg;+ color: $dark-dialog-tab-count-color;+ }++ }.newly {color: $custom-color !important;border-bottom: none;@@ -642,7 +678,7 @@color: $dark-text-primary-color !important;}.bg-theme {- background-color: darken($sidebar-dark-icons-menu-bg, 4%);+ background-color: $dark-bg-theme;}.bg-theme-alt {background-color: $sidebar-dark-apps-menu-title-bg !important;diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scssindex f39b5663..1dd3e91d 100755--- a/frontend/src/styles/components/_theme_light.scss+++ b/frontend/src/styles/components/_theme_light.scss@@ -215,6 +215,43 @@.dialog-check-card--active {border-color: $light-dialog-check-card-active-border-color;}+ tabset {+ > .nav.nav-pills,+ > ul.nav.nav-pills {+ border: 1px solid $light-dialog-tabs-bar-border-color;+ background: $light-dialog-tab-card-bg;++ .nav-link {+ background: $light-dialog-tab-bg;+ color: $light-dialog-tab-color;+ border-color: $light-dialog-tab-bg;+ }++ .nav-link:hover:not(.active) {+ background: $light-dialog-tab-hover-bg;+ color: $light-dialog-tab-hover-color;+ border-color: $light-dialog-tab-hover-border-color;+ }++ .nav-link:hover:not(.active) .app-tab-count {+ background: $light-dialog-tab-count-hover-bg;+ color: $light-dialog-tab-count-hover-color;+ }++ .nav-link.active {+ background: $light-dialog-tab-active-bg;+ color: $white;+ border-color: $light-dialog-tab-active-border-color;+ box-shadow: $light-dialog-tab-active-shadow;+ }+ }++ .app-tab-count {+ background: $light-dialog-tab-count-bg;+ color: $light-dialog-tab-count-color;+ }++ }.btn {&:focus-visible {outline: 2px solid $light-btn-focus-color;@@ -587,7 +624,7 @@}}.bg-theme {- background-color: $gray-light;+ background-color: $light-bg-theme;}.bg-theme-alt {background-color: $gray-lightest !important;diff --git a/frontend/src/styles/components/_variables.scss b/frontend/src/styles/components/_variables.scssindex ae7a81ca..9f88634b 100644--- a/frontend/src/styles/components/_variables.scss+++ b/frontend/src/styles/components/_variables.scss@@ -61,8 +61,12 @@ $theme-btn-bg-hover-overlay-shadow: rgba(0, 0, 0, 0.2);$theme-dropdown-divider-bg: #eee;$theme-btn-close-white-filter: $btn-close-white-filter;$theme-btn-minimize-icon-svg: "data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' fill='%23000'%3e%3cpath d='M32,224c-17.7,0-32,14.3-32,32s14.3,32,32,32h448c17.7,0,32-14.3,32-32s-14.3-32-32-32H32z'/%3e%3c/svg%3e";+$theme-dialog-tab-active-bg: $primary;+$theme-dialog-tab-active-border-color: darken($primary, 7%);+$theme-dialog-tab-count-color: inherit;//Dark theme+$dark-bg-theme: darken($sidebar-dark-icons-menu-bg, 4%);$dark-tree-node-hover-bg: $sidebar-dark-apps-menu-title-bg;$dark-tree-node-selected-bg: darken($sidebar-dark-apps-menu-title-bg, 4%);$dark-surface-bg: lighten($sidebar-dark-icons-menu-bg, 5%);@@ -73,7 +77,7 @@ $dark-item-disabled-color: darken($gray-light, 12%);$dark-border-subtle: darken($sidebar-dark-icons-menu-border-color, 3%);$dark-table-row-hover-bg: darken($sidebar-dark-icons-menu-bg, 3%);$dark-striped-bg: lighten($sidebar-dark-apps-menu-title-bg, 4%);-$dark-field-border: lighten($sidebar-dark-icons-menu-bg, 4%);+$dark-field-border: $dark-bg-theme;$dark-btn-focus-color: rgba($primary, 0.28);$dark-control-sidebar-separator-color: rgba(146, 173, 204, 0.4);$dark-dialog-tab-card-shadow-color: rgba(0, 0, 0, 0.28);@@ -81,6 +85,20 @@ $dark-dialog-check-card-border-color: rgba(132, 157, 185, 0.24);$dark-dialog-check-card-hover-border-color: $dark-control-sidebar-separator-color;$dark-dialog-check-card-hover-shadow-color: rgba(0, 0, 0, 0.24);$dark-dialog-check-card-active-border-color: rgba(92, 141, 202, 0.62);+$dark-dialog-tabs-bar-bg: #202a2f;+$dark-dialog-tabs-bar-border-color: $dark-dialog-check-card-border-color;+$dark-dialog-tab-bg: #354851;+$dark-dialog-tab-color: #c8d7e6;+$dark-dialog-tab-hover-bg: mix($primary, $dark-dialog-tab-bg, 24%);+$dark-dialog-tab-hover-border-color: mix($primary, $dark-dialog-tab-bg, 40%);+$dark-dialog-tab-hover-color: #edf5ff;+$dark-dialog-tab-active-bg: $theme-dialog-tab-active-bg;+$dark-dialog-tab-active-border-color: $theme-dialog-tab-active-border-color;+$dark-dialog-tab-active-shadow: none;+$dark-dialog-tab-count-bg: rgba(255, 255, 255, 0.16);+$dark-dialog-tab-count-color: $theme-dialog-tab-count-color;+$dark-dialog-tab-count-hover-bg: rgba(255, 255, 255, 0.24);+$dark-dialog-tab-count-hover-color: #f7fbff;$dark-box-transparent-shadow-color: rgba(0, 0, 0, 0.35);$dark-menu-surface-shadow: 0 12px 26px rgba(0, 0, 0, 0.35);$dark-text-purple-color: #cb97ff;@@ -88,6 +106,7 @@ $dark-text-primary-color: #6ab8f0;$dark-text-muted-color: #b6bcc2;//Light theme+$light-bg-theme: #c8d6ea;$light-sidebar-mini-bg: #ebeef5;$light-sidebar-mini-hover-bg: lighten(#d4e1f1, 2%);$light-sidebar-mini-active-bg: darken(#d4e1f1, 4%);@@ -124,9 +143,23 @@ $light-dialog-tab-card-shadow-color: rgba(31, 56, 86, 0.1);$light-dialog-check-card-bg: rgba(236, 243, 251, 0.72);$light-dialog-check-card-border-color: rgba(30, 59, 89, 0.14);$light-dialog-check-card-hover-bg: rgba(236, 243, 251, 0.88);-$light-dialog-check-card-hover-border-color: rgba(30, 59, 89, 0.3);+$light-dialog-check-card-hover-border-color: rgba(52, 94, 146, 0.48);$light-dialog-check-card-hover-shadow-color: rgba(31, 56, 86, 0.12);-$light-dialog-check-card-active-border-color: rgba(52, 94, 146, 0.48);+$light-dialog-check-card-active-border-color: rgba(30, 59, 89, 0.3);+$light-dialog-tabs-bar-bg: mix($light-dialog-tab-card-bg, #eaf2fc, 74%);+$light-dialog-tabs-bar-border-color: rgba(51, 84, 121, 0.24);+$light-dialog-tab-bg: #b8cbe4;+$light-dialog-tab-color: #2f3e4e;+$light-dialog-tab-hover-bg: mix($primary, $light-dialog-tab-bg, 30%);+$light-dialog-tab-hover-border-color: mix($primary, $light-dialog-tab-bg, 52%);+$light-dialog-tab-hover-color: $light-dialog-tab-color;+$light-dialog-tab-active-bg: $theme-dialog-tab-active-bg;+$light-dialog-tab-active-border-color: $theme-dialog-tab-active-border-color;+$light-dialog-tab-active-shadow: 0 0 0 1px rgba(255, 255, 255, 0.22);+$light-dialog-tab-count-bg: rgba(255, 255, 255, 0.24);+$light-dialog-tab-count-color: $theme-dialog-tab-count-color;+$light-dialog-tab-count-hover-bg: rgba(255, 255, 255, 0.34);+$light-dialog-tab-count-hover-color: $light-dialog-tab-count-color;$light-app-top-menu-gradient-start: #e1ebf8;$light-app-top-menu-gradient-mid: $theme-light-panel-bg;$light-app-top-menu-gradient-end: #f4f8fe;diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scssindex edb63646..d3bd6a50 100644--- a/frontend/src/styles/variables.scss+++ b/frontend/src/styles/variables.scss@@ -76,6 +76,15 @@ $link-color: $blue;$link-decoration: none;$link-hover-color: darken($link-color, 5%);$link-hover-decoration: none;+// Navs+$nav-link-padding-y: .35rem;+$nav-link-padding-x: .65rem;+$nav-link-font-weight: 400;+$nav-link-transition: background-color .2s ease, color .2s ease, border-color .2s ease, box-shadow .2s ease;+$nav-link-focus-box-shadow: none;+$nav-tabs-border-width: .5px;+$nav-tabs-border-radius: .7rem;+$nav-pills-border-radius: .55rem;// Forms$input-bg: $white;$input-color: $custom-color;