Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

chore(frontend): admin group dialog UI enhancement

johavenae4ef763b219
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.html
index f7977cc9..8d666d03 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
@@ -24,77 +24,96 @@
<span class="app-tab-label" l10nTranslate>Settings</span>
</span>
</ng-template>
- <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>
- <input id="name"
- appAutofocus
- [autoSelect]="false"
- formControlName="name"
- [class.is-invalid]="groupForm.controls.name.invalid"
- class="form-control form-control-sm"
- autocomplete="off"
- type="text">
- </div>
- <div class="flex-fill col-6 ps-4">
- <label for="description" l10nTranslate>Description</label>
- <input id="description"
- formControlName="description"
- class="form-control form-control-sm"
- autocomplete="off"
- type="text">
- </div>
- </div>
- <div class="d-flex flex-column align-items-start col-12 pb-3">
- <div class="col-6 pe-4">
- <label for="visibility" l10nTranslate>Visibility</label>
- <select id="visibility"
- formControlName="visibility"
- class="form-control form-select form-select-sm">
- @for (v of allVisibilities | keyvalue: originalOrderKeyValue; track v.value) {
- <option [ngValue]="v.value" l10nTranslate>{{ v.key }}</option>
- }
- </select>
- </div>
- <div class="d-none d-sm-block fst-italic fs-2xs">
- @switch (groupForm.value.visibility) {
- @case (allVisibilities.Visible) {
- <span l10nTranslate>All users can see this group.</span>
- }
- @case (allVisibilities.Private) {
- <span l10nTranslate>Users who are not members of this group cannot see it.</span>
- }
- @case (allVisibilities.Isolated) {
- <span l10nTranslate>The group is not visible, its members cannot see it and cannot see each other.</span>
- }
- }
+ <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 gap-3">
+ <div>
+ <label class="form-label" for="name" l10nTranslate>Name</label>
+ <input id="name"
+ appAutofocus
+ [autoSelect]="false"
+ formControlName="name"
+ [class.is-invalid]="groupForm.controls.name.invalid"
+ class="form-control form-control-sm"
+ autocomplete="off"
+ type="text">
+ </div>
+ <div>
+ <label class="form-label" for="description" l10nTranslate>Description</label>
+ <input id="description"
+ formControlName="description"
+ class="form-control form-control-sm"
+ autocomplete="off"
+ type="text">
+ </div>
+ </div>
</div>
- </div>
- <div class="d-flex align-items-start col-12 pb-3">
- <div class="col-6 pe-4">
- <label for="parent" translate>Parent group</label>
- <app-select id="parent"
- [searchFunction]="searchGroups.bind(this)"
- (data)="onSetParent($event)"
- [active]="groupForm.value.parent"
- [itemIcon]="icons.GROUPS"
- [placeholder]="'Select the parent group' | translate:locale.language">
- </app-select>
+
+ <div class="card dialog-tab-card w-100">
+ <div class="card-body d-flex flex-column gap-2">
+ <div>
+ <label class="form-label" for="visibility" l10nTranslate>Visibility</label>
+ <select id="visibility"
+ formControlName="visibility"
+ class="form-control form-select form-select-sm">
+ @for (v of allVisibilities | keyvalue: originalOrderKeyValue; track v.value) {
+ <option [ngValue]="v.value" l10nTranslate>{{ v.key }}</option>
+ }
+ </select>
+ </div>
+ <div class="fst-italic fs-2xs">
+ @switch (groupForm.value.visibility) {
+ @case (allVisibilities.Visible) {
+ <span l10nTranslate>All users can see this group.</span>
+ }
+ @case (allVisibilities.Private) {
+ <span l10nTranslate>Users who are not members of this group cannot see it.</span>
+ }
+ @case (allVisibilities.Isolated) {
+ <span l10nTranslate>The group is not visible, its members cannot see it and cannot see each other.</span>
+ }
+ }
+ </div>
+ </div>
</div>
</div>
- @if (group) {
- <div class="d-flex align-items-start col-12 pb-3">
- <div class="col-6 pe-4">
- <label for="created" l10nTranslate>Creation date</label>
- <div id="created">{{ group.createdAt | amDateFormat }}</div>
- </div>
- <div class="d-flex flex-column align-items-end col-6 ps-4">
- <label for="modified" l10nTranslate>Modification date</label>
- <div id="modified">{{ group.modifiedAt | amDateFormat }}</div>
+
+ <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">
+ <label class="form-label" for="parent" translate>Parent group</label>
+ <app-select id="parent"
+ [searchFunction]="searchGroups.bind(this)"
+ (data)="onSetParent($event)"
+ [active]="groupForm.value.parent"
+ [itemIcon]="icons.GROUPS"
+ [placeholder]="'Select the parent group' | translate:locale.language">
+ </app-select>
</div>
</div>
- }
+
+ @if (group) {
+ <div class="card dialog-tab-card w-100">
+ <div class="card-body">
+ <div class="row g-3 fs-2xs">
+ <div class="col-12 col-md-6">
+ <div class="d-flex flex-column">
+ <label class="form-label" for="created" l10nTranslate>Creation date</label>
+ <div id="created">{{ group.createdAt | amDateFormat }}</div>
+ </div>
+ </div>
+ <div class="col-12 col-md-6">
+ <div class="d-flex flex-column text-md-end">
+ <label class="form-label" for="modified" l10nTranslate>Modification date</label>
+ <div id="modified">{{ group.modifiedAt | amDateFormat }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ }
+ </div>
</div>
</tab>
<tab (selectTab)="tabView='permissions'" customClass="tab-dialog form-validation">
@@ -104,9 +123,11 @@
<span class="app-tab-label" l10nTranslate>Permissions</span>
</span>
</ng-template>
- <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 class="app-tab-content">
+ <div class="card dialog-tab-card">
+ <div class="card-body">
+ <app-admin-permissions [permissions]="groupForm.value.applications" (permissionsChange)="updateApplications($event)"></app-admin-permissions>
+ </div>
</div>
</div>
</tab>
diff --git a/frontend/src/app/applications/admin/components/utils/admin-permissions.component.ts b/frontend/src/app/applications/admin/components/utils/admin-permissions.component.ts
index 97db84a5..2f165641 100644
--- a/frontend/src/app/applications/admin/components/utils/admin-permissions.component.ts
+++ b/frontend/src/app/applications/admin/components/utils/admin-permissions.component.ts
@@ -7,7 +7,7 @@ import { CapitalizePipe } from '../../../../common/pipes/capitalize.pipe'
selector: 'app-admin-permissions',
imports: [CapitalizePipe, L10nTranslateDirective, L10nTranslatePipe],
template: ` <div class="d-flex flex-column col-12 pb-3">
- <label for="permissions" l10nTranslate>Permissions</label>
+ <label for="permissions" class="form-label" l10nTranslate>Permissions</label>
<div id="permissions" class="form-check form-switch form-check-inline">
@for (app of allApplications; track $index) {
<div class="d-flex">
@@ -30,10 +30,11 @@ export class AdminPermissionsComponent {
@Input() permissions: USER_PERMISSION[] = []
@Output() permissionsChange = new EventEmitter<USER_PERMISSION[]>()
protected readonly locale = inject<L10nLocale>(L10N_LOCALE)
- protected readonly allApplications = Object.values(USER_PERMISSION)
+ protected readonly allApplications: USER_PERMISSION[] = Object.values(USER_PERMISSION) as USER_PERMISSION[]
- updatePermissions(app: USER_PERMISSION, event: any) {
- if (event.target.checked) {
+ updatePermissions(app: USER_PERMISSION, event: Event) {
+ const target = event.target as HTMLInputElement
+ if (target.checked) {
this.permissions.push(app)
} else {
this.permissions.splice(this.permissions.indexOf(app), 1)
diff --git a/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html b/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html
index 772d92cf..b6a30686 100644
--- a/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html
+++ b/frontend/src/app/applications/spaces/components/utils/space-manage-roots.component.html
@@ -21,7 +21,7 @@
<div class="text-truncate">
<span>{{ r.name }}</span>
</div>
- <div class="d-none d-lg-block fs-3xs text-truncate">
+ <div class="d-none d-lg-block fs-3xs text-truncate text-muted">
@if (user.isAdmin && r.externalPath) {
<span>{{ r.externalPath }}</span>
} @else {
diff --git a/frontend/src/app/applications/users/components/utils/users-search.component.html b/frontend/src/app/applications/users/components/utils/users-search.component.html
index 35939863..c1949a53 100644
--- a/frontend/src/app/applications/users/components/utils/users-search.component.html
+++ b/frontend/src/app/applications/users/components/utils/users-search.component.html
@@ -12,10 +12,10 @@
<div class="d-flex ms-2 pe-5 {{member.description ? 'flex-column align-items-start' : 'align-items-center'}}">
<div [innerHTML]="member.name | highlight: selection"></div>
@if (member.description) {
- <span class="fs-3xs me-4" [innerHTML]="member.description | highlight: selection"></span>
+ <span class="fs-4xs me-4 text-muted" [innerHTML]="member.description | highlight: selection"></span>
}
</div>
- <div class="ms-auto ps-5 me-1 text-muted d-none d-lg-block fs-3xs align-self-center">
+ <div class="ms-auto ps-5 me-1 text-muted d-none d-lg-block fs-4xs align-self-center">
<span l10nTranslate>{{ member.type }}</span>
</div>
</div>
@@ -58,7 +58,7 @@
}
<div class="d-flex flex-column text-truncate ms-2">
<div class="text-truncate">{{ member.name }}</div>
- <div class="fs-3xs text-truncate">
+ <div class="fs-3xs text-truncate text-muted">
@if (member.description) {
<span class="fs-3xs">{{ member.description }}</span>
} @else if (!member.linkId) {
diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scss
index 384e4f0a..bf4633f7 100755
--- a/frontend/src/styles/components/_theme_light.scss
+++ b/frontend/src/styles/components/_theme_light.scss
@@ -215,6 +215,9 @@
.dialog-check-card--active {
border-color: $light-dialog-check-card-active-border-color;
}
+ .text-muted {
+ color: $light-text-muted-color !important;
+ }
tabset {
> .nav.nav-pills,
> ul.nav.nav-pills {
diff --git a/frontend/src/styles/components/_variables.scss b/frontend/src/styles/components/_variables.scss
index 44ae9faf..c8a6a73f 100644
--- a/frontend/src/styles/components/_variables.scss
+++ b/frontend/src/styles/components/_variables.scss
@@ -106,6 +106,7 @@ $dark-text-primary-color: #6ab8f0;
$dark-text-muted-color: #b6bcc2;
//Light theme
+$light-text-muted-color: #5f6f7f;
$light-sidebar-mini-bg: #ebeef5;
$light-sidebar-mini-hover-bg: lighten(#d4e1f1, 2%);
$light-sidebar-mini-active-bg: darken(#d4e1f1, 4%);