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): enhance sync UI
johaven6c21c0db91b7
diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.html b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.htmlindex bdb5b968..b2ce8ff1 100644--- a/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.html+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.html@@ -6,134 +6,142 @@<button (click)="onMinimize()" aria-label="Minimize" class="btn-minimize btn-minimize-white" type="button"></button><button (click)="onClose()" aria-label="Close" class="btn-close btn-close-white ms-3" type="button"></button></div>-<div class="modal-body p-0">- <div class="app-top-menu bg-theme-alt">- <button (click)="manageReport(!running)" class="btn btn-sm btn-default ms-1" type="button">- <div class="d-flex align-items-center">- <fa-icon [icon]="running ? icons.faStop : icons.faFlask"></fa-icon>- <span class="ms-1" l10nTranslate>Simulate</span>- </div>- </button>- <div class="ms-auto">- @if (running) {- <fa-icon [icon]="icons.faSpinner" animation="spin" class="me-2"></fa-icon>- }- @if (transfers().length) {- <span class="fs-2xs">{{ 'nb_actions' | translate:locale.language:{ nb: count.actions } }}</span>- }- </div>-- <div class="d-flex align-items-center ms-auto">- @if (count.filtered) {- <button [(ngModel)]="this.showFiltered"- [tooltip]="'Show filtered files'|translate:locale.language"- placement="top"- class="btn btn-sm btn-outline-secondary me-1"- role="button"- type="button"- btnCheckbox>- <fa-icon [icon]="icons.faFilter"></fa-icon>- <span>{{ count.filtered }}</span>- </button>- }- <div [tooltip]="'Go to' | translate:locale.language">- <div [isDisabled]="!transferSelected" class="btn-group btn-group-sm me-1" dropdown>- <button class="btn btn-sm btn-default dropdown-toggle" dropdownToggle type="button">- <fa-icon [icon]="icons.faMapMarkerAlt"></fa-icon>+<div class="modal-body sync-report-body">+ <div class="sync-report-layout">+ <div class="card dialog-tab-card sync-report-toolbar">+ <div class="sync-report-top-menu">+ <button (click)="manageReport(!running)" class="btn btn-sm btn-default ms-1" type="button">+ <div class="d-flex align-items-center">+ <fa-icon [icon]="running ? icons.faStop : icons.faFlask"></fa-icon>+ <span class="ms-1" l10nTranslate>Simulate</span>+ </div></button>- <ul *dropdownMenu class="dropdown-menu" role="menu">- <li role="menuitem">- <a (click)="goToPath()" class="dropdown-item">- <span l10nTranslate>- <fa-icon [icon]="icons.CLIENT"></fa-icon>- <span class="ms-2">Client</span>- </span>- </a>- </li>- @if (transferSelected.action !== SYNC_TRANSFER_ACTION.FILTERED) {- <li role="menuitem">- <a (click)="goToPath(false)" class="dropdown-item">- <span l10nTranslate>- <fa-icon [icon]="icons.SERVER"></fa-icon>- <span class="ms-2">Server</span>- </span>- </a>- </li>+ <div class="sync-report-summary ms-3">+ @if (running) {+ <fa-icon [icon]="icons.faSpinner" animation="spin" class="me-2"></fa-icon>+ }+ @if (transfers().length) {+ <span class="badge bg-default sync-report-count-badge">{{ 'nb_actions' | translate:locale.language:{ nb: count.actions } }}</span>+ }+ </div>++ <div class="d-flex align-items-center ms-auto">+ @if (count.filtered) {+ <button [(ngModel)]="this.showFiltered"+ [tooltip]="'Show filtered files'|translate:locale.language"+ placement="top"+ class="btn btn-sm btn-custom me-2"+ role="button"+ type="button"+ btnCheckbox>+ <fa-icon [icon]="icons.faFilter"></fa-icon>+ <span>{{ count.filtered }}</span>+ </button>}- </ul>+ <div [tooltip]="'Go to' | translate:locale.language">+ <div [isDisabled]="!transferSelected" class="btn-group btn-group-sm me-2" dropdown>+ <button class="btn btn-sm btn-default dropdown-toggle" dropdownToggle type="button">+ <fa-icon [icon]="icons.faMapMarkerAlt"></fa-icon>+ </button>+ <ul *dropdownMenu class="dropdown-menu" role="menu">+ <li role="menuitem">+ <a (click)="goToPath()" class="dropdown-item">+ <span l10nTranslate>+ <fa-icon [icon]="icons.CLIENT"></fa-icon>+ <span class="ms-2">Client</span>+ </span>+ </a>+ </li>+ @if (transferSelected.action !== SYNC_TRANSFER_ACTION.FILTERED) {+ <li role="menuitem">+ <a (click)="goToPath(false)" class="dropdown-item">+ <span l10nTranslate>+ <fa-icon [icon]="icons.SERVER"></fa-icon>+ <span class="ms-2">Server</span>+ </span>+ </a>+ </li>+ }+ </ul>+ </div>+ </div>+ </div>+ <!--Start Filter Button-->+ <app-input-filter></app-input-filter>+ <!--End Filter Button--></div>- </div></div>- <!--Start Filter Button-->- <app-input-filter class="d-none d-sm-block"></app-input-filter>- <!--End Filter Button-->- </div>- @if (hasNoChanges) {- <div class="p-2" l10nTranslate>No differences</div>- } @else {- <table class="app-table">- <thead>- <tr>- @for (th of tableHeaders | keyvalue: originalOrderKeyValue; track th.key) {- @if (th.value.show) {- <th (click)="sortBy(th.key)"- [style.width.%]="th.value.width"- [class.text-align-center]="th.value.textCenter"- [class.cursor-pointer]="th.value.sortable"- class="{{th.value.class}}"- l10nTranslate>- {{ th.value.label }}- @if (sortTable.sortParam.column === th.key) {- <fa-icon [icon]="sortTable.sortParam.asc ? icons.faArrowDown : icons.faArrowUp"></fa-icon>- }- </th>- }- }- </tr>- </thead>- </table>- }- <div [resizeOffset]="225" [useMaxHeight]="false" appAutoResize>- <table class="app-table">- <tbody tabindex="-1">- @for (s of transfers() | searchFilter:inputFilter.search() | paginate:currentPage:itemsPerPage; track s.nbTasks) {- @if (!s.isFiltered || showFiltered && s.isFiltered) {- <tr (click)="onSelect(s)" [class.selected]="this.transferSelected && this.transferSelected.nbTasks === s.nbTasks">+ <div class="card dialog-tab-card sync-report-results">+ <div class="card-body">+ @if (hasNoChanges) {+ <div class="sync-report-empty" l10nTranslate>No differences</div>+ } @else {+ <table class="app-table">+ <thead>+ <tr>@for (th of tableHeaders | keyvalue: originalOrderKeyValue; track th.key) {@if (th.value.show) {- <td [style.width.%]="th.value.width"+ <th (click)="sortBy(th.key)"+ [style.width.%]="th.value.width"[class.text-align-center]="th.value.textCenter"- class="{{th.value.class}}">- @switch (th.key) {- @case ('action') {- <span class="d-flex align-items-center" style="font-size: 14px">- <fa-icon [icon]="s.sideIcon" class="{{s.sideIconClass}}"></fa-icon>- <fa-icon [icon]="s.actionIcon" class="circle-gray-icon-sm" size="sm"></fa-icon>- <span class="fs-3xs" l10nTranslate>{{ s.actionText }}</span>- </span>- }- @case ('file') {- <div class="d-flex align-items-center fs-2xs">- <img [src]="s.mimeUrl" (error)="s.fallBackMimeUrl()" class="me-2" alt="" width="24">- <span class="d-flex flex-column fs-2xs">- @if (s.fileDst) {- <span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}}">{{ s.fileDst }}</span>- <span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} fs-3xs"><b l10nTranslate>Source</b>: {{ s.file }}</span>- } @else {- <span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}}">{{ s.file }}</span>- }- </span>- </div>- }+ [class.cursor-pointer]="th.value.sortable"+ class="{{th.value.class}}"+ l10nTranslate>+ {{ th.value.label }}+ @if (sortTable.sortParam.column === th.key) {+ <fa-icon [icon]="sortTable.sortParam.asc ? icons.faArrowDown : icons.faArrowUp"></fa-icon>}- </td>+ </th>}}</tr>- }+ </thead>+ </table>}- </tbody>- </table>+ <div [resizeOffset]="270" [useMaxHeight]="false" appAutoResize class="sync-report-table-scroll bg-white">+ <table class="app-table">+ <tbody tabindex="-1">+ @for (s of transfers() | searchFilter:inputFilter.search() | paginate:currentPage:itemsPerPage; track s.nbTasks) {+ @if (!s.isFiltered || showFiltered && s.isFiltered) {+ <tr (click)="onSelect(s)" [class.selected]="this.transferSelected && this.transferSelected.nbTasks === s.nbTasks">+ @for (th of tableHeaders | keyvalue: originalOrderKeyValue; track th.key) {+ @if (th.value.show) {+ <td [style.width.%]="th.value.width"+ [class.text-align-center]="th.value.textCenter"+ class="{{th.value.class}}">+ @switch (th.key) {+ @case ('action') {+ <span class="d-flex align-items-center" style="font-size: 14px">+ <fa-icon [icon]="s.sideIcon" class="{{s.sideIconClass}}"></fa-icon>+ <fa-icon [icon]="s.actionIcon" class="circle-gray-icon-sm" size="sm"></fa-icon>+ <span class="fs-4xs" l10nTranslate>{{ s.actionText }}</span>+ </span>+ }+ @case ('file') {+ <div class="d-flex align-items-center fs-2xs">+ <img [src]="s.mimeUrl" (error)="s.fallBackMimeUrl()" class="me-2" alt="" width="24">+ <span class="d-flex flex-column fs-2xs">+ @if (s.fileDst) {+ <span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}}">{{ s.fileDst }}</span>+ <span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} fs-3xs"><b l10nTranslate>Source</b>: {{ s.file }}</span>+ } @else {+ <span class="{{s.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}}">{{ s.file }}</span>+ }+ </span>+ </div>+ }+ }+ </td>+ }+ }+ </tr>+ }+ }+ </tbody>+ </table>+ </div>+ </div>+ </div></div></div><div class="modal-footer justify-content-center align-items-center fs-sm">diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.scss b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.scssnew file mode 100644index 00000000..5643a473--- /dev/null+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.scss@@ -0,0 +1,43 @@+.sync-report-layout {+ display: flex;+ flex-direction: column;+ gap: 0.65rem;+}++.sync-report-toolbar,+.sync-report-results {+ border-radius: 0.7rem;+}++.sync-report-results {+ overflow: hidden;+ background-clip: padding-box;+ .card-body {+ padding: 0;+ }+}++.sync-report-top-menu {+ display: flex;+ align-items: center;+ padding: 6px;+ border-radius: 0.55rem;+}++.sync-report-summary {+ font-weight: 500;+}++.sync-report-empty {+ padding: 4px 10px;+ font-size: 0.75rem;+ font-weight: 500;+}++.sync-report-results b {+ font-weight: 500;+}++.sync-report-table-scroll {+ min-height: 11rem;+}\ No newline at end of filediff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.ts b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.tsindex 39fddd5e..49060c5d 100644--- a/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.ts+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-report.dialog.component.ts@@ -46,7 +46,8 @@ import { SYNC_ICON } from '../../sync.constants'SearchFilterPipe,ButtonCheckboxDirective],- templateUrl: 'sync-path-report.dialog.component.html'+ templateUrl: 'sync-path-report.dialog.component.html',+ styleUrl: './sync-path-report.dialog.component.scss'})export class SyncPathReportDialogComponent implements OnInit, OnDestroy {locale = inject<L10nLocale>(L10N_LOCALE)@@ -71,7 +72,7 @@ export class SyncPathReportDialogComponent implements OnInit, OnDestroy {protected tableHeaders: Record<'action' | 'file', TableHeaderConfig> = {action: {label: 'Action',- width: 16,+ width: 20,textCenter: false,class: '',show: true,@@ -79,7 +80,7 @@ export class SyncPathReportDialogComponent implements OnInit, OnDestroy {},file: {label: 'File',- width: 84,+ width: 80,textCenter: false,class: '',show: true,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 3e7567dd..53567a61 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@@ -23,41 +23,66 @@<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">- @if (store.isElectronApp()) {- <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.FILE">Select a file</option>- <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.FOLDER">Select a folder</option>- }- <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.START">The files starting</option>- <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.IN">The files containing</option>- <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.END">The files ending</option>- <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.EXPERT">Expert (Regexp)</option>- </select>- <input [(ngModel)]="currentFilter"- [disabled]="currentFilterType === SYNC_PATH_FILTER_TYPE.FILE || currentFilterType === SYNC_PATH_FILTER_TYPE.FOLDER"- [placeholder]="filterTypePlaceholder[currentFilterType] | translate:locale.language"- class="form-control form-select-sm me-1" type="text">- <button (click)="addFilter()" [disabled]="!currentFilter" class="btn btn-xs btn-default me-1" l10nTranslate type="button">Add</button>- @if (currentFilterType === SYNC_PATH_FILTER_TYPE.FILE) {- <button (click)="onSelect()" class="btn btn-xs btn-default" l10nTranslate type="button">Browse</button>- }- @if (currentFilterType === SYNC_PATH_FILTER_TYPE.FOLDER) {- <button (click)="onSelect(ELECTRON_DIALOG.DIRECTORY)" class="btn btn-xs btn-default" l10nTranslate type="button">Browse</button>- }+ <div class="app-tab-content sync-filters-tab">+ <div class="card dialog-tab-card sync-filters-card">+ <div class="card-body p-3">+ <div class="sync-filters-field mb-2">+ <label class="form-label mb-1" for="sync-filter-type" l10nTranslate>Filter type</label>+ <select id="sync-filter-type" [(ngModel)]="currentFilterType" class="form-select form-select-sm">+ @if (store.isElectronApp()) {+ <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.FILE">Select a file</option>+ <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.FOLDER">Select a folder</option>+ }+ <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.START">The files starting</option>+ <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.IN">The files containing</option>+ <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.END">The files ending</option>+ <option l10nTranslate [value]="SYNC_PATH_FILTER_TYPE.EXPERT">Expert (Regexp)</option>+ </select>+ </div>++ <div class="sync-filters-field">+ <label class="form-label mb-1" for="sync-filter-value" l10nTranslate>Filter value</label>+ <div class="sync-filters-entry-row">+ <input+ id="sync-filter-value"+ [(ngModel)]="currentFilter"+ [disabled]="currentFilterType === SYNC_PATH_FILTER_TYPE.FILE || currentFilterType === SYNC_PATH_FILTER_TYPE.FOLDER"+ [placeholder]="filterTypePlaceholder[currentFilterType] | translate:locale.language"+ class="form-control form-select-sm"+ type="text">+ <div class="sync-filters-actions">+ @if (currentFilterType === SYNC_PATH_FILTER_TYPE.FILE) {+ <button (click)="onSelect()" class="btn btn-xs btn-default" l10nTranslate type="button">Browse</button>+ }+ @if (currentFilterType === SYNC_PATH_FILTER_TYPE.FOLDER) {+ <button (click)="onSelect(ELECTRON_DIALOG.DIRECTORY)" class="btn btn-xs btn-default" l10nTranslate type="button">Browse</button>+ }+ <button (click)="addFilter()" [disabled]="!currentFilter" class="btn btn-xs btn-success" l10nTranslate type="button">Add</button>+ </div>+ </div>+ </div>+ </div></div>- </div>- <hr class="my-1">- @for (f of syncPath.settings.filters; track i; let i = $index) {- <div class="d-flex mb-1">- <input [(ngModel)]="syncPath.settings.filters[i]" class="form-control form-control-sm me-1" type="text">- <button (click)="onRemoveFilter(i)" class="btn btn-xs btn-danger" data-dismiss="modal" type="button">- <fa-icon [icon]="icons.faTimes"></fa-icon>- </button>++ <div class="card dialog-tab-card sync-filters-card">+ <div class="card-body p-2">+ @if (syncPath.settings.filters.length) {+ @for (f of syncPath.settings.filters; track $index; let i = $index) {+ <div class="sync-filter-item">+ <input [ngModel]="f"+ (ngModelChange)="syncPath.settings.filters[i] = $event"+ class="form-control form-control-sm"+ type="text">+ <button (click)="onRemoveFilter(i)" class="btn btn-xs btn-danger" data-dismiss="modal" type="button">+ <fa-icon [icon]="icons.faTimes"></fa-icon>+ </button>+ </div>+ }+ } @else {+ <div class="sync-filter-empty text-muted" l10nTranslate>No filter configured</div>+ }+ </div></div>- }</div></tab></tabset>diff --git a/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.scss b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.scssnew file mode 100644index 00000000..a30b9ee5--- /dev/null+++ b/frontend/src/app/applications/sync/components/dialogs/sync-path-settings.dialog.component.scss@@ -0,0 +1,53 @@+.sync-filters-tab {+ .sync-filters-card {+ border-radius: 0.7rem;+ margin-bottom: 0.75rem;+ }++ .sync-filters-field .form-label {+ font-weight: 500;+ }++ .sync-filters-entry-row {+ display: flex;+ align-items: center;+ gap: 0.5rem;+ }++ .sync-filters-actions {+ display: flex;+ align-items: center;+ gap: 0.5rem;+ flex-shrink: 0;+ }++ .sync-filter-item {+ display: flex;+ align-items: center;+ gap: 0.5rem;+ }++ .sync-filter-item + .sync-filter-item {+ margin-top: 0.4rem;+ }++ .sync-filter-empty {+ font-size: 0.74rem;+ padding: 0.3rem 0.4rem;+ }+}++@media (max-width: 767.98px) {+ .sync-filters-tab {+ .sync-filters-entry-row {+ flex-direction: column;+ align-items: stretch;+ }++ .sync-filters-actions {+ width: 100%;+ justify-content: flex-end;+ flex-wrap: wrap;+ }+ }+}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 1c0fe9f0..120d086d 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@@ -26,7 +26,8 @@ import { SyncPathSettingsComponent } from '../shared/sync-path-settings.componenL10nTranslateDirective,TabHeadingDirective],- templateUrl: 'sync-path-settings.dialog.component.html'+ templateUrl: 'sync-path-settings.dialog.component.html',+ styleUrl: './sync-path-settings.dialog.component.scss'})export class SyncPathSettingsDialogComponent implements OnInit {@Input({ required: true }) syncPathSelected: SyncPathModeldiff --git a/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.html b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.htmlindex 9bfe35c4..c9f779a6 100644--- a/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.html+++ b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.html@@ -1,114 +1,132 @@-<div class="d-flex flex-column justify-content-{{direction}}">+<div class="sync-settings-panel sync-settings-panel--{{size}} sync-settings-panel--{{direction}}">@if (showPaths) {- <div class="d-flex justify-content-{{direction}} align-items-center mb-2">- <div class="col-{{colSize[size][0]}}">- <fa-icon [icon]="icons.CLIENT"></fa-icon>- <span class="ms-2" l10nTranslate>Client</span>- </div>- <div class="col-8">- <span class="form-control-sm form-control-plaintext">{{ syncPath.settings.localPath }}</span>- </div>- </div>- <div class="d-flex justify-content-{{direction}} align-items-center mb-2">- <div class="col-{{colSize[size][0]}}">- <fa-icon [icon]="icons.SERVER"></fa-icon>- <span class="ms-2" l10nTranslate>Server</span>- </div>- <div class="col-8">- <span class="form-control-sm form-control-plaintext">- <div class="d-flex align-items-center">+ <div class="card dialog-tab-card sync-settings-section sync-settings-section--paths">+ <div class="card-body">+ <div class="sync-settings-row">+ <div class="sync-settings-label">+ <fa-icon [icon]="icons.CLIENT"></fa-icon>+ <span class="ms-2" l10nTranslate>Client</span>+ </div>+ <div class="sync-settings-value text-truncate">{{ syncPath.settings.localPath }}</div>+ </div>+ <div class="sync-settings-row">+ <div class="sync-settings-label">+ <fa-icon [icon]="icons.SERVER"></fa-icon>+ <span class="ms-2" l10nTranslate>Server</span>+ </div>+ <div class="sync-settings-value sync-settings-value--server text-truncate"><fa-icon [icon]="syncPath.icon" class="me-1"></fa-icon>- {{ syncPath.showedPath }}+ <span class="text-truncate">{{ syncPath.showedPath }}</span></div>- </span>+ </div></div></div>}- <div class="d-flex justify-content-{{direction}} align-items-center mb-2">- <div class="col-{{colSize[size][0]}}">- <fa-icon [icon]="icons.faEdit"></fa-icon>- <span class="ms-2" l10nTranslate>Name</span>- </div>- <div class="col-{{colSize[size][1]}}">- <input [(ngModel)]="syncPath.settings.name" class="form-control form-select-sm {{syncPath.settings.name ? '' : 'is-invalid'}}" type="text">- </div>- </div>- <div class="d-flex justify-content-{{direction}} align-items-center mb-2">- <div class="d-flex align-items-center col-{{colSize[size][0]}}">- <app-sync-path-direction-icon [syncPath]="syncPath" [small]="true"></app-sync-path-direction-icon>- <span class="ms-2" l10nTranslate>Direction</span>- @if (!syncPath.isWriteable) {- <span class="ms-2 fs-lg cursor-pointer">- <fa-icon [icon]="icons.faExclamationCircle"- [tooltip]="'You must have permission to modify the server folder to choose a different sync mode' | translate:locale.language"- class="text-warning">- </fa-icon>- </span>- }- </div>- <div class="col-{{colSize[size][1]}}">- <select [(ngModel)]="syncPath.settings.mode" class="form-select form-select-sm">- <option [disabled]="!syncPath.isWriteable" [ngValue]="SYNC_PATH_MODE.UPLOAD" l10nTranslate>upload only</option>- <option [ngValue]="SYNC_PATH_MODE.DOWNLOAD" l10nTranslate>download only</option>- <option [disabled]="!syncPath.isWriteable" [ngValue]="SYNC_PATH_MODE.BOTH" l10nTranslate>both</option>- </select>- </div>- </div>- <div class="d-flex justify-content-{{direction}} align-items-center mb-2">- <div class="col-{{colSize[size][0]}}">- <fa-icon [icon]="icons.faBug"></fa-icon>- <span class="ms-2" l10nTranslate>Conflict</span>- </div>- <div class="col-{{colSize[size][1]}}">- <select [(ngModel)]="syncPath.settings.conflictMode" [disabled]="syncPath.settings.mode !== 'both'" class="form-select form-select-sm">- <option [ngValue]="SYNC_PATH_CONFLICT_MODE.LOCAL" l10nTranslate>the client’s files take precedence</option>- <option [ngValue]="SYNC_PATH_CONFLICT_MODE.REMOTE" l10nTranslate>the server’s files take precedence</option>- <option [ngValue]="SYNC_PATH_CONFLICT_MODE.RECENT" l10nTranslate>the most recent files will be kept</option>- </select>- </div>- </div>- <div class="d-flex justify-content-{{direction}} align-items-center mb-2">- <div class="col-{{colSize[size][0]}}">- <fa-icon [icon]="icons.faGauge"></fa-icon>- <span class="ms-2" l10nTranslate>Mode</span>- </div>- <div class="col-{{colSize[size][1]}}">- <select [(ngModel)]="syncPath.settings.diffMode" class="form-select form-select-sm">- <option [ngValue]="SYNC_PATH_DIFF_MODE.FAST" l10nTranslate>{{ SYNC_PATH_DIFF_MODE.FAST }}</option>- <option [ngValue]="SYNC_PATH_DIFF_MODE.SECURE" l10nTranslate>{{ SYNC_PATH_DIFF_MODE.SECURE }}</option>- </select>- </div>- </div>- <div class="d-flex justify-content-{{direction}} align-items-center mb-2">- <div class="col-{{colSize[size][0]}}">- <fa-icon [icon]="icons.faClock"></fa-icon>- <span class="ms-2" l10nTranslate>Scheduler</span>- </div>- <div class="d-flex flex-row col-{{colSize[size][1]}}">- <input [(ngModel)]="syncPath.settings.scheduler.value"- [disabled]="syncPath.settings.scheduler.unit === SYNC_PATH_SCHEDULER_UNIT.DISABLED"- class="form-control form-select-sm pe-1 me-2"- min="1"- style="width: 70px"- type="number">- <select [(ngModel)]="syncPath.settings.scheduler.unit" class="form-select form-select-sm">- <option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.DISABLED" l10nTranslate>disabled</option>- <option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.MINUTE" l10nTranslate>scheduler_unit_minute</option>- <option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.HOUR" l10nTranslate>scheduler_unit_hour</option>- <option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.DAY" l10nTranslate>scheduler_unit_day</option>- </select>- </div>- </div>- <div class="d-flex justify-content-{{direction}} align-items-center">- <div class="col-{{colSize[size][0]}}">- <fa-icon [icon]="icons.faRotate"></fa-icon>- <span class="ms-2" l10nTranslate>Status</span>- </div>- <div class="col-{{colSize[size][1]}}">- <select [(ngModel)]="syncPath.settings.enabled" class="form-select form-select-sm" [class.text-danger]="!syncPath.settings.enabled">- <option [ngValue]="true" l10nTranslate>enabled</option>- <option [ngValue]="false" l10nTranslate>disabled</option>- </select>++ <div class="card dialog-tab-card sync-settings-section sync-settings-section--form">+ <div class="card-body">+ <div class="sync-settings-row">+ <label class="sync-settings-label form-label mb-0" for="sync-path-name">+ <fa-icon [icon]="icons.faEdit"></fa-icon>+ <span class="ms-2" l10nTranslate>Name</span>+ </label>+ <div class="sync-settings-control">+ <input+ id="sync-path-name"+ [(ngModel)]="syncPath.settings.name"+ class="form-control form-select-sm {{syncPath.settings.name ? '' : 'is-invalid'}}"+ type="text">+ </div>+ </div>++ <div class="sync-settings-row">+ <label class="sync-settings-label form-label mb-0" for="sync-path-mode">+ <app-sync-path-direction-icon [syncPath]="syncPath" [small]="true"></app-sync-path-direction-icon>+ <span class="ms-2" l10nTranslate>Direction</span>+ @if (!syncPath.isWriteable) {+ <span class="ms-2 fs-lg cursor-pointer">+ <fa-icon+ [icon]="icons.faExclamationCircle"+ [tooltip]="'You must have permission to modify the server folder to choose a different sync mode' | translate:locale.language"+ class="text-warning">+ </fa-icon>+ </span>+ }+ </label>+ <div class="sync-settings-control">+ <select id="sync-path-mode" [(ngModel)]="syncPath.settings.mode" class="form-select form-select-sm">+ <option [disabled]="!syncPath.isWriteable" [ngValue]="SYNC_PATH_MODE.UPLOAD" l10nTranslate>upload only</option>+ <option [ngValue]="SYNC_PATH_MODE.DOWNLOAD" l10nTranslate>download only</option>+ <option [disabled]="!syncPath.isWriteable" [ngValue]="SYNC_PATH_MODE.BOTH" l10nTranslate>both</option>+ </select>+ </div>+ </div>++ <div class="sync-settings-row">+ <label class="sync-settings-label form-label mb-0" for="sync-path-conflict">+ <fa-icon [icon]="icons.faBug"></fa-icon>+ <span class="ms-2" l10nTranslate>Conflict</span>+ </label>+ <div class="sync-settings-control">+ <select+ id="sync-path-conflict"+ [(ngModel)]="syncPath.settings.conflictMode"+ [disabled]="syncPath.settings.mode !== 'both'"+ class="form-select form-select-sm">+ <option [ngValue]="SYNC_PATH_CONFLICT_MODE.LOCAL" l10nTranslate>the client’s files take precedence</option>+ <option [ngValue]="SYNC_PATH_CONFLICT_MODE.REMOTE" l10nTranslate>the server’s files take precedence</option>+ <option [ngValue]="SYNC_PATH_CONFLICT_MODE.RECENT" l10nTranslate>the most recent files will be kept</option>+ </select>+ </div>+ </div>++ <div class="sync-settings-row">+ <label class="sync-settings-label form-label mb-0" for="sync-path-diff">+ <fa-icon [icon]="icons.faGauge"></fa-icon>+ <span class="ms-2" l10nTranslate>Mode</span>+ </label>+ <div class="sync-settings-control">+ <select id="sync-path-diff" [(ngModel)]="syncPath.settings.diffMode" class="form-select form-select-sm">+ <option [ngValue]="SYNC_PATH_DIFF_MODE.FAST" l10nTranslate>{{ SYNC_PATH_DIFF_MODE.FAST }}</option>+ <option [ngValue]="SYNC_PATH_DIFF_MODE.SECURE" l10nTranslate>{{ SYNC_PATH_DIFF_MODE.SECURE }}</option>+ </select>+ </div>+ </div>++ <div class="sync-settings-row">+ <label class="sync-settings-label form-label mb-0" for="sync-path-scheduler-value">+ <fa-icon [icon]="icons.faClock"></fa-icon>+ <span class="ms-2" l10nTranslate>Scheduler</span>+ </label>+ <div class="sync-settings-control sync-settings-control--scheduler">+ <input+ id="sync-path-scheduler-value"+ [(ngModel)]="syncPath.settings.scheduler.value"+ [disabled]="syncPath.settings.scheduler.unit === SYNC_PATH_SCHEDULER_UNIT.DISABLED"+ class="form-control form-select-sm pe-1"+ min="1"+ type="number">+ <select [(ngModel)]="syncPath.settings.scheduler.unit" class="form-select form-select-sm">+ <option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.DISABLED" l10nTranslate>disabled</option>+ <option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.MINUTE" l10nTranslate>scheduler_unit_minute</option>+ <option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.HOUR" l10nTranslate>scheduler_unit_hour</option>+ <option [ngValue]="SYNC_PATH_SCHEDULER_UNIT.DAY" l10nTranslate>scheduler_unit_day</option>+ </select>+ </div>+ </div>++ <div class="sync-settings-row">+ <label class="sync-settings-label form-label mb-0" for="sync-path-status">+ <fa-icon [icon]="icons.faRotate"></fa-icon>+ <span class="ms-2" l10nTranslate>Status</span>+ </label>+ <div class="sync-settings-control">+ <select id="sync-path-status" [(ngModel)]="syncPath.settings.enabled" class="form-select form-select-sm" [class.text-danger]="!syncPath.settings.enabled">+ <option [ngValue]="true" l10nTranslate>enabled</option>+ <option [ngValue]="false" l10nTranslate>disabled</option>+ </select>+ </div>+ </div></div></div></div>diff --git a/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.scss b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.scssnew file mode 100644index 00000000..e9cced7d--- /dev/null+++ b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.scss@@ -0,0 +1,99 @@+.sync-settings-panel {+ display: flex;+ flex-direction: column;+ gap: 0.75rem;+}++.sync-settings-panel--center .sync-settings-section {+ max-width: 42rem;+ margin-inline: auto;+ width: 100%;+}++.sync-settings-section {+ border-radius: 0.7rem;++ .card-body {+ padding: 0.65rem 0.75rem;+ }+}++.sync-settings-panel--small .sync-settings-section {+ background: transparent !important;+ max-width: 34rem;+ width: 100%;+ margin-inline: auto;+}++.sync-settings-row {+ display: grid;+ grid-template-columns: minmax(0, 8.9rem) minmax(0, 1fr);+ align-items: center;+ column-gap: 0.7rem;+ row-gap: 0.4rem;+ padding: 0.35rem 0;+}++.sync-settings-panel--large .sync-settings-row {+ grid-template-columns: minmax(0, 10.3rem) minmax(0, 1fr);+}++.sync-settings-row + .sync-settings-row {+ border-top: 1px solid rgba(var(--bs-body-color-rgb), 0.14);+}++.sync-settings-label {+ display: inline-flex;+ align-items: center;+ min-width: 0;+ font-weight: 500;+ line-height: 1.2;+}++.sync-settings-section--paths .sync-settings-label {+ font-weight: 500;+}++.sync-settings-section--paths .sync-settings-row + .sync-settings-row {+ border-top-color: rgba(var(--bs-body-color-rgb), 0.11);+}++.sync-settings-value {+ min-width: 0;+}++.sync-settings-value--server {+ display: inline-flex;+ align-items: center;+ width: 100%;+}++.sync-settings-control {+ width: 100%;++ .form-control,+ .form-select {+ width: 100%;+ }+}++.sync-settings-control--scheduler {+ display: flex;+ align-items: center;+ gap: 0.5rem;++ > input {+ width: 5rem !important;+ flex: 0 0 5rem;+ }+}++@media (max-width: 575.98px) {+ .sync-settings-panel--small .sync-settings-section {+ max-width: 100%;+ }++ .sync-settings-row {+ grid-template-columns: 1fr;+ }+}diff --git a/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.ts b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.tsindex 2524e037..3dd0cc61 100755--- a/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.ts+++ b/frontend/src/app/applications/sync/components/shared/sync-path-settings.component.ts@@ -17,7 +17,8 @@ import { SyncPathDirectionIconComponent } from '../utils/sync-path-direction-ico@Component({selector: 'app-sync-path-settings',imports: [L10nTranslateDirective, FaIconComponent, FormsModule, TooltipDirective, L10nTranslatePipe, SyncPathDirectionIconComponent],- templateUrl: './sync-path-settings.component.html'+ templateUrl: './sync-path-settings.component.html',+ styleUrl: './sync-path-settings.component.scss'})export class SyncPathSettingsComponent {@Input() syncPath: SyncPathModel@@ -35,7 +36,6 @@ export class SyncPathSettingsComponent {faEdit,faBug}- protected colSize = { small: [2, 5], large: [3, 6] }protected readonly SYNC_PATH_CONFLICT_MODE = SYNC_PATH_CONFLICT_MODEprotected readonly SYNC_PATH_MODE = SYNC_PATH_MODEprotected readonly SYNC_PATH_DIFF_MODE = SYNC_PATH_DIFF_MODEdiff --git a/frontend/src/app/applications/sync/components/sync-paths.component.ts b/frontend/src/app/applications/sync/components/sync-paths.component.tsindex 9e4e1840..aac072a1 100644--- a/frontend/src/app/applications/sync/components/sync-paths.component.ts+++ b/frontend/src/app/applications/sync/components/sync-paths.component.ts@@ -143,7 +143,7 @@ export class SyncPathsComponent implements OnInit, OnDestroy {},scheduler: {label: 'Scheduler',- width: 8,+ width: 12,textCenter: true,class: '',show: truediff --git a/frontend/src/app/applications/sync/components/sync-transfers.component.html b/frontend/src/app/applications/sync/components/sync-transfers.component.htmlindex 0ad6c874..3a70f6bb 100644--- a/frontend/src/app/applications/sync/components/sync-transfers.component.html+++ b/frontend/src/app/applications/sync/components/sync-transfers.component.html@@ -69,10 +69,9 @@class="{{th.value.class}}">@switch (th.key) {@case ('action') {- <span class="d-flex align-items-center">- <fa-icon [icon]="t.sideIcon" class="{{t.ok ? t.sideIconClass : 'circle-error-icon-sm'}}"></fa-icon>- <fa-icon [icon]="t.actionIcon" [class.text-danger]="!t.ok" class="circle-gray-icon-sm" size="sm"></fa-icon>- <span [class.text-danger]="!t.ok" class="fs-3xs" l10nTranslate>{{ t.actionText }}</span>+ <span class="d-flex align-items-center" [title]="t.actionText | translate:locale.language">+ <fa-icon [icon]="t.sideIcon" class="{{t.ok ? t.sideIconClass : 'circle-error-icon-sm'}} me-1"></fa-icon>+ <fa-icon [icon]="t.actionIcon" [class.text-danger]="!t.ok" class="circle-gray-icon-sm cursor-pointer" size="sm"></fa-icon></span>}@case ('sync') {@@ -91,7 +90,7 @@<span class="{{t.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}}">{{ t.file }}</span>}@if (!t.ok) {- <span class="{{t.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} text-danger fs-3xs">{{ t.error }}</span>+ <span class="{{t.selected ? 'overflow-wrap-and-whitespace' : 'truncate'}} text-danger fs-3xs" l10nTranslate>{{ t.error }}</span>}</span></div>diff --git a/frontend/src/app/applications/sync/components/sync-transfers.component.ts b/frontend/src/app/applications/sync/components/sync-transfers.component.tsindex 21cead38..8002c56b 100644--- a/frontend/src/app/applications/sync/components/sync-transfers.component.ts+++ b/frontend/src/app/applications/sync/components/sync-transfers.component.ts@@ -53,7 +53,7 @@ export class SyncTransfersComponent {protected tableHeaders: Record<'action' | 'sync' | 'file' | 'date', TableHeaderConfig> = {action: {label: 'Action',- width: 15,+ width: 8,textCenter: false,class: '',show: true,diff --git a/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts b/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.tsindex 4bdbaf11..de8de8f0 100644--- a/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts+++ b/frontend/src/app/applications/sync/components/utils/sync-path-direction-icon.component.ts@@ -11,14 +11,13 @@ import { SyncPathModel } from '../../models/sync-path.model'template: `<span class="d-flex justify-content-center">@if (small && syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {- <fa-icon [icon]="SYNC_TRANSFER_BOTH_ICON"> </fa-icon>+ <fa-icon [icon]="SYNC_TRANSFER_BOTH_ICON"></fa-icon>} @else {@if (syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD || syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {<fa-icon[icon]="SYNC_TRANSFER_SIDE_ICON[SYNC_TRANSFER_SIDE.LOCAL]"class="{{ small ? '' : SYNC_TRANSFER_SIDE_CLASS[SYNC_TRANSFER_SIDE.LOCAL] }}"- >- </fa-icon>+ ></fa-icon>}@if (syncPath.settings.mode === SYNC_PATH_MODE.UPLOAD || syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {<fa-icondiff --git a/frontend/src/app/applications/sync/components/utils/sync-path-scheduler.component.ts b/frontend/src/app/applications/sync/components/utils/sync-path-scheduler.component.tsindex 0aeeea5a..cf45a25a 100644--- a/frontend/src/app/applications/sync/components/utils/sync-path-scheduler.component.ts+++ b/frontend/src/app/applications/sync/components/utils/sync-path-scheduler.component.ts@@ -12,9 +12,9 @@ import { SyncPathModel } from '../../models/sync-path.model'class="{{s.settings.scheduler.unit !== SYNC_PATH_SCHEDULER_UNIT.DISABLED? store.clientScheduler() === CLIENT_SCHEDULER_STATE.DISABLED- ? 'text-warning text-failed'- : 'text-success'- : 'text-danger'+ ? 'badge bg-warning text-failed'+ : 'badge bg-success'+ : 'badge bg-danger'}}">@if (s.settings.scheduler.unit === SYNC_PATH_SCHEDULER_UNIT.DISABLED) {diff --git a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.htmlindex 1aeb802f..c0a9de51 100644--- a/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html+++ b/frontend/src/app/applications/sync/components/wizard/sync-wizard-settings.component.html@@ -2,7 +2,7 @@<div class="d-flex flex-row justify-content-center mb-3"><div class="d-flex flex-column align-items-end"><div class="d-flex flex-column align-items-end">- <div class="fw-bold mb-1 me-1">+ <div class="fw-500 mb-1 me-1"><fa-icon [icon]="icons.CLIENT"></fa-icon><span class="ms-2" l10nTranslate>Client</span></div>@@ -17,7 +17,7 @@</div><div class="d-flex flex-column align-items-start"><div class="d-flex flex-column align-items-start">- <div class="fw-bold mb-1 ms-1">+ <div class="fw-500 mb-1 ms-1"><fa-icon [icon]="icons.SERVER"></fa-icon><span class="ms-2" l10nTranslate>Server</span></div>@@ -32,50 +32,50 @@</div></div></div>- <hr class="mt-auto">- <app-sync-path-settings [syncPath]="syncPath"></app-sync-path-settings>- <hr class="mb-auto">- @if (error) {- <div class="text-center text-warning" l10nTranslate>{{ error }}</div>- } @else {- <div class="text-center">- <span l10nTranslate>The data will be synchronized from</span>- <span class="mx-1" l10nTranslate>{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? 'the server folder' : 'the client folder' }}</span>- @if (syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {- <span l10nTranslate>and from</span>- } @else {- <span class="fw-bold" l10nTranslate>to</span>- }- <span class="mx-1" l10nTranslate>{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? 'the client folder' : 'the server folder' }}</span>- @if (syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {- <span l10nTranslate>(Two-Way)</span>- } @else {- <span l10nTranslate>(One-Way)</span>- }- </div>- <br>- <div class="text-center">- @if (syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {- <div>- <span l10nTranslate>In case of conflict,</span>- <span> </span>- @if (syncPath.settings.conflictMode === SYNC_PATH_CONFLICT_MODE.RECENT) {- <span class="fw-bold" l10nTranslate>the most recent files will be kept</span>- } @else {- <span l10nTranslate>the files in</span>- <span class="fw-bold mx-1">{{ syncPath.settings.conflictMode === SYNC_PATH_CONFLICT_MODE.LOCAL ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>- <span l10nTranslate>will be preferred</span>- }- </div>- } @else {- <div>- <span l10nTranslate>All files created or modified in</span>- <span class="fw-bold mx-1">{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>- <span l10nTranslate>will be ignored and deleted</span>- </div>- }- </div>- }+ <app-sync-path-settings class="my-auto" [syncPath]="syncPath"></app-sync-path-settings>+ <div class="fs-xs">+ @if (error) {+ <div class="text-center text-warning" l10nTranslate>{{ error }}</div>+ } @else {+ <div class="text-center">+ <span l10nTranslate>The data will be synchronized from</span>+ <span class="mx-1" l10nTranslate>{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? 'the server folder' : 'the client folder' }}</span>+ @if (syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {+ <span l10nTranslate>and from</span>+ } @else {+ <span class="fw-bold" l10nTranslate>to</span>+ }+ <span class="mx-1" l10nTranslate>{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? 'the client folder' : 'the server folder' }}</span>+ @if (syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {+ <span l10nTranslate>(Two-Way)</span>+ } @else {+ <span l10nTranslate>(One-Way)</span>+ }+ </div>+ <br>+ <div class="text-center">+ @if (syncPath.settings.mode === SYNC_PATH_MODE.BOTH) {+ <div>+ <span l10nTranslate>In case of conflict,</span>+ <span> </span>+ @if (syncPath.settings.conflictMode === SYNC_PATH_CONFLICT_MODE.RECENT) {+ <span class="fw-bold" l10nTranslate>the most recent files will be kept</span>+ } @else {+ <span l10nTranslate>the files in</span>+ <span class="fw-bold mx-1">{{ syncPath.settings.conflictMode === SYNC_PATH_CONFLICT_MODE.LOCAL ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>+ <span l10nTranslate>will be preferred</span>+ }+ </div>+ } @else {+ <div>+ <span l10nTranslate>All files created or modified in</span>+ <span class="fw-bold mx-1">{{ syncPath.settings.mode === SYNC_PATH_MODE.DOWNLOAD ? syncService.wizard.localPath.name : syncService.wizard.remotePath.name }}</span>+ <span l10nTranslate>will be ignored and deleted</span>+ </div>+ }+ </div>+ }+ </div><div class="mt-auto"><div class="d-flex align-items-start"><button (click)="onPrevious()" class="btn btn-sm btn-default me-auto" translate type="button">diff --git a/frontend/src/app/electron/electron.service.ts b/frontend/src/app/electron/electron.service.tsindex 52b100eb..dc6f1d5c 100644--- a/frontend/src/app/electron/electron.service.ts+++ b/frontend/src/app/electron/electron.service.ts@@ -171,8 +171,8 @@ export class Electron {SYNC_MENU.count.value.next('!')SYNC_MENU.iconAnimated = false} else if (scheduler === CLIENT_SCHEDULER_STATE.DISABLED) {- SYNC_MENU.count.level = 'secondary-alt'- SYNC_MENU.count.value.next('off')+ SYNC_MENU.count.level = 'warning'+ SYNC_MENU.count.value.next('!')SYNC_MENU.iconAnimated = false} else {SYNC_MENU.count.value.next(0)diff --git a/frontend/src/app/layout/layout.tooltip.config.ts b/frontend/src/app/layout/layout.tooltip.config.tsindex e9f4422a..2f0bdeb7 100644--- a/frontend/src/app/layout/layout.tooltip.config.ts+++ b/frontend/src/app/layout/layout.tooltip.config.ts@@ -4,6 +4,6 @@ export function getToolTipConfig(): TooltipConfig {return Object.assign(new TooltipConfig(), {adaptivePosition: false,triggers: 'hover',- delay: 500+ delay: 600})}diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.jsonindex 810a125a..860ff2ae 100644--- a/frontend/src/i18n/de.json+++ b/frontend/src/i18n/de.json@@ -639,5 +639,8 @@"Share details": "Freigabedetails","Access rules": "Zugriffsregeln","Guest profile": "Gastprofil",- "Version": "Version"+ "Version": "Version",+ "Filter type": "Filtertyp",+ "Filter value": "Filterwert",+ "No filter configured": "Kein Filter konfiguriert"}diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.jsonindex 71a8dc3b..33ad25d0 100644--- a/frontend/src/i18n/es.json+++ b/frontend/src/i18n/es.json@@ -639,5 +639,8 @@"Share details": "Detalles del recurso compartido","Access rules": "Reglas de acceso","Guest profile": "Perfil del invitado",- "Version": "Versión"+ "Version": "Versión",+ "Filter type": "Tipo de filtro",+ "Filter value": "Valor del filtro",+ "No filter configured": "Ningún filtro configurado"}diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.jsonindex f479f002..9e98867b 100644--- a/frontend/src/i18n/fr.json+++ b/frontend/src/i18n/fr.json@@ -639,5 +639,8 @@"Share details": "Détails du partage","Access rules": "Règles d'accès","Guest profile": "Profil de l'invité",- "Version": "Version"+ "Version": "Version",+ "Filter type": "Type de filtre",+ "Filter value": "Valeur du filtre",+ "No filter configured": "Aucun filtre configuré"}diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.jsonindex 455597a7..9c29879d 100644--- a/frontend/src/i18n/hi.json+++ b/frontend/src/i18n/hi.json@@ -639,5 +639,8 @@"Share details": "शेयर विवरण","Access rules": "एक्सेस नियम","Guest profile": "अतिथि प्रोफ़ाइल",- "Version": "संस्करण"+ "Version": "संस्करण",+ "Filter type": "फ़िल्टर प्रकार",+ "Filter value": "फ़िल्टर मान",+ "No filter configured": "कोई फ़िल्टर कॉन्फ़िगर नहीं है"}diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.jsonindex cb96257f..027c7738 100644--- a/frontend/src/i18n/it.json+++ b/frontend/src/i18n/it.json@@ -639,5 +639,8 @@"Share details": "Dettagli della condivisione","Access rules": "Regole di accesso","Guest profile": "Profilo ospite",- "Version": "Versione"+ "Version": "Versione",+ "Filter type": "Tipo di filtro",+ "Filter value": "Valore del filtro",+ "No filter configured": "Nessun filtro configurato"}diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.jsonindex f9b19877..7e48f9be 100644--- a/frontend/src/i18n/ja.json+++ b/frontend/src/i18n/ja.json@@ -639,5 +639,8 @@"Share details": "共有の詳細","Access rules": "アクセスルール","Guest profile": "ゲストプロフィール",- "Version": "バージョン"+ "Version": "バージョン",+ "Filter type": "フィルタータイプ",+ "Filter value": "フィルター値",+ "No filter configured": "フィルターが設定されていません"}diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.jsonindex 391f7445..fc468505 100644--- a/frontend/src/i18n/ko.json+++ b/frontend/src/i18n/ko.json@@ -639,5 +639,8 @@"Share details": "공유 세부 정보","Access rules": "접근 규칙","Guest profile": "게스트 프로필",- "Version": "버전"+ "Version": "버전",+ "Filter type": "필터 유형",+ "Filter value": "필터 값",+ "No filter configured": "구성된 필터가 없습니다"}diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.jsonindex 7d0bf441..d2ffe1ee 100644--- a/frontend/src/i18n/pl.json+++ b/frontend/src/i18n/pl.json@@ -639,5 +639,8 @@"Share details": "Szczegóły udostępnienia","Access rules": "Zasady dostępu","Guest profile": "Profil gościa",- "Version": "Wersja"+ "Version": "Wersja",+ "Filter type": "Typ filtra",+ "Filter value": "Wartość filtra",+ "No filter configured": "Brak skonfigurowanych filtrów"}diff --git a/frontend/src/i18n/pt-BR.json b/frontend/src/i18n/pt-BR.jsonindex d64c9194..ca897bf5 100644--- a/frontend/src/i18n/pt-BR.json+++ b/frontend/src/i18n/pt-BR.json@@ -639,5 +639,8 @@"Share details": "Detalhes do compartilhamento","Access rules": "Regras de acesso","Guest profile": "Perfil do convidado",- "Version": "Versão"+ "Version": "Versão",+ "Filter type": "Tipo de filtro",+ "Filter value": "Valor do filtro",+ "No filter configured": "Nenhum filtro configurado"}diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.jsonindex 323c0a1f..0b3fe8a7 100644--- a/frontend/src/i18n/pt.json+++ b/frontend/src/i18n/pt.json@@ -639,5 +639,8 @@"Share details": "Detalhes da partilha","Access rules": "Regras de acesso","Guest profile": "Perfil do convidado",- "Version": "Versão"+ "Version": "Versão",+ "Filter type": "Tipo de filtro",+ "Filter value": "Valor do filtro",+ "No filter configured": "Nenhum filtro configurado"}diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.jsonindex b0819417..3a2a1d32 100644--- a/frontend/src/i18n/ru.json+++ b/frontend/src/i18n/ru.json@@ -639,5 +639,8 @@"Share details": "Детали общего доступа","Access rules": "Правила доступа","Guest profile": "Профиль гостя",- "Version": "Версия"+ "Version": "Версия",+ "Filter type": "Тип фильтра",+ "Filter value": "Значение фильтра",+ "No filter configured": "Фильтры не настроены"}diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.jsonindex 295f34a6..0d8bfe64 100644--- a/frontend/src/i18n/tr.json+++ b/frontend/src/i18n/tr.json@@ -639,5 +639,8 @@"Share details": "Paylaşım ayrıntıları","Access rules": "Erişim kuralları","Guest profile": "Misafir profili",- "Version": "Sürüm"+ "Version": "Sürüm",+ "Filter type": "Filtre türü",+ "Filter value": "Filtre değeri",+ "No filter configured": "Yapılandırılmış filtre yok"}diff --git a/frontend/src/i18n/zh.json b/frontend/src/i18n/zh.jsonindex ab15b132..345a66a8 100644--- a/frontend/src/i18n/zh.json+++ b/frontend/src/i18n/zh.json@@ -639,5 +639,8 @@"Share details": "共享详情","Access rules": "访问规则","Guest profile": "访客资料",- "Version": "版本"+ "Version": "版本",+ "Filter type": "过滤器类型",+ "Filter value": "过滤器值",+ "No filter configured": "未配置过滤器"}diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scssindex ab3f6177..50ff288d 100755--- a/frontend/src/styles/components/_app.scss+++ b/frontend/src/styles/components/_app.scss@@ -214,6 +214,12 @@span {@extend .text-truncate;}++ .badge {+ display: inline-block;+ max-width: 100%;+ vertical-align: middle;+ }}tbody td:first-child {diff --git a/frontend/src/styles/components/_circles.scss b/frontend/src/styles/components/_circles.scssindex fd047e49..43fe040b 100755--- a/frontend/src/styles/components/_circles.scss+++ b/frontend/src/styles/components/_circles.scss@@ -4,7 +4,7 @@justify-content: center;min-width: 30px;min-height: 30px;- font-size: $font-size-lg;+ font-size: $font-size-md;border-radius: 50%;}@@ -12,7 +12,7 @@@extend .circle-icon;min-width: 23px;min-height: 23px;- font-size: $font-size-md;+ font-size: $font-size-sm;}.circle-gray-icon {diff --git a/frontend/src/styles/components/_modal.scss b/frontend/src/styles/components/_modal.scssindex 224050d0..8d96cde0 100644--- a/frontend/src/styles/components/_modal.scss+++ b/frontend/src/styles/components/_modal.scss@@ -38,8 +38,8 @@grid-auto-flow: column;grid-auto-columns: minmax(0, 1fr);gap: 0.5rem;- padding: 0 0.3rem 0.6rem 0;- margin: 0 0 .8rem;+ padding: 0 0.3rem 0.75rem 0;+ margin: 0 0 .75rem;> li {min-width: 0;diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scssindex e7ba4a6d..130b342d 100755--- a/frontend/src/styles/components/_theme_dark.scss+++ b/frontend/src/styles/components/_theme_dark.scss@@ -597,6 +597,23 @@background-color: $sidebar-dark-apps-menu-title-bg;border-top-color: $sidebar-dark-apps-menu-title-bg;}+ .pagination {+ --bs-pagination-color: #{$gray-light};+ --bs-pagination-bg: #{lighten($sidebar-dark-icons-menu-bg, 6%)};+ --bs-pagination-border-color: #{$sidebar-dark-icons-menu-border-color};+ --bs-pagination-hover-color: #{$white};+ --bs-pagination-hover-bg: #{lighten($sidebar-dark-icons-menu-bg, 10%)};+ --bs-pagination-hover-border-color: #{lighten($sidebar-dark-icons-menu-border-color, 8%)};+ --bs-pagination-focus-color: #{$white};+ --bs-pagination-focus-bg: #{lighten($sidebar-dark-icons-menu-bg, 10%)};+ --bs-pagination-focus-box-shadow: none;+ --bs-pagination-active-color: #{$white};+ --bs-pagination-active-bg: #{$primary};+ --bs-pagination-active-border-color: #{darken($primary, 8%)};+ --bs-pagination-disabled-color: #{$dark-item-disabled-color};+ --bs-pagination-disabled-bg: #{$sidebar-dark-icons-menu-bg};+ --bs-pagination-disabled-border-color: #{$sidebar-dark-icons-menu-border-color};+ }.modal-auth-verify-2fa,.modal-viewer-select {.card {@@ -734,6 +751,9 @@.bg-theme-alt {background-color: $sidebar-dark-apps-menu-title-bg !important;}+ .bg-white {+ background-color: lighten($sidebar-dark-apps-menu-bg, 4%) !important;+ }.btn-close {filter: $theme-btn-close-white-filter;}diff --git a/frontend/src/styles/components/_theme_light.scss b/frontend/src/styles/components/_theme_light.scssindex 37ebdcea..8ee7053b 100755--- a/frontend/src/styles/components/_theme_light.scss+++ b/frontend/src/styles/components/_theme_light.scss@@ -603,6 +603,23 @@.modal-footer {background-color: $gray-lightest;}+ .pagination {+ --bs-pagination-color: #{$pagination-color};+ --bs-pagination-bg: #{$pagination-bg};+ --bs-pagination-border-color: #{$pagination-border-color};+ --bs-pagination-hover-color: #{$pagination-hover-color};+ --bs-pagination-hover-bg: #{$pagination-hover-bg};+ --bs-pagination-hover-border-color: #{$pagination-hover-border-color};+ --bs-pagination-focus-color: #{$pagination-focus-color};+ --bs-pagination-focus-bg: #{$pagination-focus-bg};+ --bs-pagination-focus-box-shadow: #{$pagination-focus-box-shadow};+ --bs-pagination-active-color: #{$pagination-active-color};+ --bs-pagination-active-bg: #{$pagination-active-bg};+ --bs-pagination-active-border-color: #{$pagination-active-border-color};+ --bs-pagination-disabled-color: #{$pagination-disabled-color};+ --bs-pagination-disabled-bg: #{$pagination-disabled-bg};+ --bs-pagination-disabled-border-color: #{$pagination-disabled-border-color};+ }typeahead-container,.ui-select-choices {&.dropdown-menu {diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scssindex b88ba419..de80ce9c 100644--- a/frontend/src/styles/variables.scss+++ b/frontend/src/styles/variables.scss@@ -144,14 +144,20 @@ $badge-padding-y: .35rem !default;$pagination-font-size: $font-size-2xs !important;$pagination-color: $body-color;$pagination-hover-color: darken($body-color, 4%);+$pagination-focus-color: $pagination-hover-color;-$pagination-bg: $secondary-light;-$pagination-hover-bg: darken($secondary-light, 8%);-$pagination-disabled-bg: $secondary;+$pagination-bg: $white;+$pagination-hover-bg: darken($gray-mid, 2%);+$pagination-focus-bg: $pagination-hover-bg;+$pagination-active-color: $white;+$pagination-active-bg: $primary;+$pagination-active-border-color: darken($primary, 7%);+$pagination-disabled-color: lighten($muted, 12%);+$pagination-disabled-bg: $white;-$pagination-border-color: darken($secondary, 10%);-$pagination-hover-border-color: darken($secondary, 10%);-$pagination-disabled-border-color: darken($secondary-light, 10%);+$pagination-border-color: $gray-mid;+$pagination-hover-border-color: darken($gray-mid, 10%);+$pagination-disabled-border-color: lighten($gray-mid, 2%);$pagination-focus-box-shadow: none;// List group