Skip to content

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

feat(files): improve editor selection and add editor preference support

johaven8fea357925a6
diff --git a/backend/src/applications/files/modules/collabora-online/collabora-online-manager.service.ts b/backend/src/applications/files/modules/collabora-online/collabora-online-manager.service.ts
index 5c93662d..20ab304a 100644
--- a/backend/src/applications/files/modules/collabora-online/collabora-online-manager.service.ts
+++ b/backend/src/applications/files/modules/collabora-online/collabora-online-manager.service.ts
@@ -201,7 +201,7 @@ export class CollaboraOnlineManager {
const collaboraBase = this.externalCollaboraOnlineServer || this.contextManager.headerOriginUrl()
// Example:
// - external: https://collabora.domain.com
- // - internal (via nginx proxy): https://domain.com/collabora
+ // - internal (via nginx proxy): https://domain.com/*
const editorUrl = new URL(COLLABORA_URI, collaboraBase)
// → /browser/dist/cool.html
diff --git a/backend/src/applications/files/modules/collabora-online/collabora-online.constants.ts b/backend/src/applications/files/modules/collabora-online/collabora-online.constants.ts
index 33f12eb0..86bb408e 100644
--- a/backend/src/applications/files/modules/collabora-online/collabora-online.constants.ts
+++ b/backend/src/applications/files/modules/collabora-online/collabora-online.constants.ts
@@ -8,7 +8,7 @@ export const COLLABORA_URI = 'browser/dist/cool.html'
export const COLLABORA_CONTEXT = 'CollaboraOnlineEnvironment' as const
export const COLLABORA_WOPI_SRC_QUERY_PARAM_NAME = 'WOPISrc' as const
export const COLLABORA_TOKEN_QUERY_PARAM_NAME = 'access_token' as const
-export const COLLABORA_OWNER_LOCK = 'Collabora Online' as const
+export const COLLABORA_OWNER_LOCK = 'Collabora' as const
export const COLLABORA_HEADERS = {
Action: 'x-wopi-override',
diff --git a/backend/src/configuration/config.environment.ts b/backend/src/configuration/config.environment.ts
index f012c633..4c9a535e 100755
--- a/backend/src/configuration/config.environment.ts
+++ b/backend/src/configuration/config.environment.ts
@@ -17,8 +17,9 @@ export const configuration: GlobalConfig = loadConfiguration()
export const serverConfig: ServerConfig = {
twoFaEnabled: configuration.auth.mfa.totp.enabled,
mailServerEnabled: !!configuration.mail?.host,
- applications: {
- files: { collaboraOnline: configuration.applications.files.collabora.enabled, onlyOffice: configuration.applications.files.onlyoffice.enabled }
+ fileEditors: {
+ collabora: configuration.applications.files.collabora.enabled,
+ onlyoffice: configuration.applications.files.onlyoffice.enabled
}
}
export const exportConfiguration: (reload?: boolean) => GlobalConfig = (reload = false) => (reload ? loadConfiguration() : configuration)
diff --git a/backend/src/configuration/config.interfaces.ts b/backend/src/configuration/config.interfaces.ts
index 875e26f9..b8fe4326 100644
--- a/backend/src/configuration/config.interfaces.ts
+++ b/backend/src/configuration/config.interfaces.ts
@@ -4,13 +4,13 @@
* See the LICENSE file for licensing details
*/
-export interface EditorConfig {
- collaboraOnline: boolean
- onlyOffice: boolean
+export interface FileEditorProvider {
+ collabora: boolean
+ onlyoffice: boolean
}
export interface ServerConfig {
twoFaEnabled: boolean
mailServerEnabled: boolean
- applications: { files: EditorConfig }
+ fileEditors: FileEditorProvider
}
diff --git a/frontend/src/app/applications/files/components/dialogs/files-overwrite-dialog.component.ts b/frontend/src/app/applications/files/components/dialogs/files-overwrite-dialog.component.ts
index 5678f7c3..56ccdbbd 100644
--- a/frontend/src/app/applications/files/components/dialogs/files-overwrite-dialog.component.ts
+++ b/frontend/src/app/applications/files/components/dialogs/files-overwrite-dialog.component.ts
@@ -4,7 +4,7 @@
* See the LICENSE file for licensing details
*/
-import { Component, HostListener, inject, Input, output } from '@angular/core'
+import { Component, inject, Input, output } from '@angular/core'
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
import { faFileShield } from '@fortawesome/free-solid-svg-icons'
import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'
@@ -25,16 +25,6 @@ export class FilesOverwriteDialogComponent {
protected readonly icons = { faFileShield }
protected submitted = false
- @HostListener('document:keyup.enter')
- onEnter() {
- this.onAction(true)
- }
-
- @HostListener('document:keyup.escape')
- onEsc() {
- this.onAction(false)
- }
-
onAction(overwrite: boolean) {
this.submitted = overwrite
this.overwrite.emit(overwrite)
diff --git a/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html
index 09c8b0cb..0cb17082 100644
--- a/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html
+++ b/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html
@@ -25,9 +25,9 @@
<app-files-viewer-media [currentHeight]="currentHeight" [fileUrl]="currentFile.dataUrl"></app-files-viewer-media>
}
@case (SHORT_MIME.DOCUMENT) {
- @if (store.server().applications.files.collaboraOnline) {
+ @if (editorProvider.collabora) {
<app-files-viewer-collabora-online [currentHeight]="currentHeight" [file]="currentFile" [(isReadonly)]="isReadonly"></app-files-viewer-collabora-online>
- } @else if (store.server().applications.files.onlyOffice) {
+ } @else if (editorProvider.onlyoffice) {
<app-files-viewer-only-office [currentHeight]="currentHeight" [file]="currentFile" [(isReadonly)]="isReadonly"></app-files-viewer-only-office>
} @else {
<!--This case should never happen-->
diff --git a/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.ts b/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.ts
index db9988a6..238b310e 100644
--- a/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.ts
+++ b/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.ts
@@ -8,6 +8,7 @@ import { Component, computed, inject, Input, model, OnDestroy, OnInit, signal }
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
import { faEye, faPen } from '@fortawesome/free-solid-svg-icons'
import { FILE_MODE } from '@sync-in-server/backend/src/applications/files/constants/operations'
+import type { FileEditorProvider } from '@sync-in-server/backend/src/configuration/config.interfaces'
import { L10nTranslateDirective } from 'angular-l10n'
import { Subscription } from 'rxjs'
import { LayoutService } from '../../../../layout/layout.service'
@@ -41,6 +42,7 @@ export class FilesViewerDialogComponent implements OnInit, OnDestroy {
@Input({ required: true }) mode: FILE_MODE
@Input({ required: true }) isWriteable: boolean
@Input({ required: true }) hookedShortMime: string
+ @Input({ required: true }) editorProvider: FileEditorProvider
modalClosing = signal<boolean>(false)
protected isReadonly = model<boolean>(true)
protected currentHeight: number
diff --git a/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.html
new file mode 100755
index 00000000..f76c8307
--- /dev/null
+++ b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.html
@@ -0,0 +1,78 @@
+<!--
+ ~ Copyright (C) 2012-2025 Johan Legrand <[email protected]>
+ ~ This file is part of Sync-in | The open source file sync and share solution
+ ~ See the LICENSE file for licensing details
+ -->
+
+<div class="modal-header">
+ <h4 class="modal-title">
+ <fa-icon [icon]="icons.faFile" class="me-1"></fa-icon>
+ <span>{{ file.name }}</span>
+ </h4>
+ <button
+ (click)="layout.closeDialog()"
+ aria-label="Close"
+ class="btn-close btn-close-white"
+ type="button">
+ </button>
+</div>
+<div class="modal-body modal-viewer-select">
+ <p class="text-muted mb-3" l10nTranslate>
+ Choose which editor you want to use to open this document.
+ </p>
+ <div class="row g-3">
+ <!-- Collabora -->
+ <div class="col-12 col-md-6">
+ <button
+ type="button"
+ class="editor-choice is-collabora w-100 btn p-0 border-0 text-start"
+ (click)="selectEditor('collabora')">
+ <div class="card h-100 shadow-sm editor-card editor-collabora">
+ <div class="card-body d-flex align-items-center gap-3 p-3">
+ <div class="editor-badge collabora">
+ <fa-icon [icon]="icons.faFileLines"></fa-icon>
+ </div>
+ <div class="flex-grow-1">
+ <h5 class="mb-1">Collabora</h5>
+ <div class="text-muted small" l10nTranslate>
+ Open-source office suite built on LibreOffice.
+ </div>
+ </div>
+ </div>
+ </div>
+ </button>
+ </div>
+ <!-- OnlyOffice -->
+ <div class="col-12 col-md-6">
+ <button
+ type="button"
+ class="editor-choice is-onlyoffice w-100 btn p-0 border-0 text-start"
+ (click)="selectEditor('onlyoffice')">
+ <div class="card h-100 shadow-sm editor-card">
+ <div class="card-body d-flex align-items-center gap-3 p-3">
+ <div class="editor-badge bg-primary-subtle text-primary">
+ <fa-icon [icon]="icons.faFileWord"></fa-icon>
+ </div>
+ <div class="flex-grow-1">
+ <h5 class="mb-1">OnlyOffice</h5>
+ <div class="text-muted small" l10nTranslate>
+ Open-source office suite for Microsoft Office.
+ </div>
+ </div>
+ </div>
+ </div>
+ </button>
+ </div>
+ </div>
+ <div class="form-check ms-auto mt-3">
+ <input
+ class="form-check-input"
+ type="checkbox"
+ id="rememberEditor"
+ [(ngModel)]="rememberChoice"
+ />
+ <label class="form-check-label" for="rememberEditor" l10nTranslate>
+ Remember my choice for next time
+ </label>
+ </div>
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.ts b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.ts
new file mode 100644
index 00000000..2a3d8108
--- /dev/null
+++ b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.component.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012-2025 Johan Legrand <[email protected]>
+ * This file is part of Sync-in | The open source file sync and share solution
+ * See the LICENSE file for licensing details
+ */
+
+import { Component, inject, Input } from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import { FaIconComponent } from '@fortawesome/angular-fontawesome'
+import { faFile, faFileLines, faFileWord } from '@fortawesome/free-regular-svg-icons'
+import { faArrowRight } from '@fortawesome/free-solid-svg-icons'
+import type { FileEditorProvider } from '@sync-in-server/backend/src/configuration/config.interfaces'
+import { L10N_LOCALE, L10nLocale, L10nTranslateDirective } from 'angular-l10n'
+import { LayoutService } from '../../../../layout/layout.service'
+import { UserService } from '../../../users/user.service'
+import { FileModel } from '../../models/file.model'
+
+@Component({
+ selector: 'app-files-viewer-select-dialog',
+ imports: [FaIconComponent, L10nTranslateDirective, FormsModule],
+ templateUrl: 'files-viewer-select-dialog.component.html',
+ styleUrls: ['./files-viewer-select-dialog.scss']
+})
+export class FilesViewerSelectDialog {
+ @Input({ required: true }) file: FileModel = null
+ @Input({ required: true }) editorProvider: FileEditorProvider
+ protected rememberChoice = false
+ protected readonly icons = { faFile, faFileWord, faArrowRight, faFileLines }
+ protected readonly locale = inject<L10nLocale>(L10N_LOCALE)
+ protected layout = inject(LayoutService)
+ private readonly userService = inject(UserService)
+
+ selectEditor(editor: keyof FileEditorProvider) {
+ if (this.rememberChoice) {
+ this.userService.setEditorProviderPreference(editor)
+ }
+ this.editorProvider[editor] = true
+ this.layout.closeDialog()
+ }
+}
diff --git a/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.scss b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.scss
new file mode 100644
index 00000000..1abf531d
--- /dev/null
+++ b/frontend/src/app/applications/files/components/dialogs/files-viewer-select-dialog.scss
@@ -0,0 +1,88 @@
+.editor-card {
+ position: relative;
+ background: rgba(255, 255, 255, 0.5);
+ transition: box-shadow 0.25s ease,
+ border-color 0.25s ease,
+ background-color 0.25s ease;
+ overflow: hidden;
+}
+
+/* Halo générique */
+.editor-card::before {
+ content: "";
+ position: absolute;
+ inset: 0;
+ opacity: 0;
+ pointer-events: none;
+ transition: opacity 0.25s ease;
+}
+
+/* -----------------------------
+ COLLABORA
+------------------------------ */
+
+.editor-choice.is-collabora .editor-card {
+ border: .5px solid rgba(188, 57, 205, 0.35);
+ box-shadow:
+ 0 0 0 1px rgba(188, 57, 205, 0.25),
+ 0 10px 26px rgba(188, 57, 205, 0.25);
+
+}
+
+.editor-choice.is-collabora .editor-card::before {
+ opacity: .55;
+ background: radial-gradient(
+ circle at top left,
+ rgba(188, 57, 205, 0.35),
+ transparent 65%
+ );
+}
+
+.editor-choice.is-collabora:hover .editor-card {
+ border-color: rgba(188, 57, 205, 0.75);
+ &::before {
+ opacity: 1;
+ }
+}
+
+/* -----------------------------
+ ONLYOFFICE
+------------------------------ */
+
+.editor-choice.is-onlyoffice .editor-card {
+ border: .5px solid rgba(0, 153, 248, 0.35);
+ box-shadow:
+ 0 0 0 1px rgba(0, 153, 248, 0.25),
+ 0 10px 26px rgba(0, 153, 248, 0.25);
+}
+
+.editor-choice.is-onlyoffice .editor-card::before {
+ opacity: .55;
+ background: radial-gradient(
+ circle at top left,
+ rgba(0, 153, 248, 0.35),
+ transparent 65%
+ );
+}
+
+.editor-choice.is-onlyoffice:hover .editor-card {
+ border-color: rgba(0, 153, 248, 0.75);
+ &::before {
+ opacity: 1;
+ }
+}
+
+/* Badge */
+.editor-badge {
+ min-width: 45px;
+ height: 45px;
+ border-radius: 16px;
+ display: grid;
+ place-items: center;
+ font-size: 22px;
+}
+
+.editor-badge.collabora {
+ background-color: #e7c3ee;
+ color: #9a4bb4;
+}
\ No newline at end of file
diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-collabora-online.component.ts b/frontend/src/app/applications/files/components/viewers/files-viewer-collabora-online.component.ts
index a279192d..da20876d 100644
--- a/frontend/src/app/applications/files/components/viewers/files-viewer-collabora-online.component.ts
+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-collabora-online.component.ts
@@ -19,14 +19,25 @@ import { FileModel } from '../../models/file.model'
selector: 'app-files-viewer-collabora-online',
template: `
@if (documentServerUrl) {
- <iframe
- [src]="documentServerUrl"
- [style.height.px]="currentHeight()"
- class="app-viewer-iframe"
- allow="clipboard-read *; clipboard-write *; fullscreen"
- ></iframe>
+ <div [style.height.px]="currentHeight()">
+ <iframe
+ [src]="documentServerUrl"
+ class="app-viewer-iframe collabora-scaling"
+ allow="clipboard-read *; clipboard-write *; fullscreen"
+ ></iframe>
+ </div>
}
- `
+ `,
+ styles: [
+ `
+ .collabora-scaling {
+ transform: scale(0.85);
+ transform-origin: 0 0;
+ width: calc(100% / 0.85);
+ height: calc(100% / 0.85);
+ }
+ `
+ ]
})
export class FilesViewerCollaboraOnlineComponent implements OnInit, OnDestroy {
file = input.required<FileModel>()
diff --git a/frontend/src/app/applications/files/models/file.model.ts b/frontend/src/app/applications/files/models/file.model.ts
index 3306d8b0..1ea3c24f 100644
--- a/frontend/src/app/applications/files/models/file.model.ts
+++ b/frontend/src/app/applications/files/models/file.model.ts
@@ -15,7 +15,7 @@ import { ONLY_OFFICE_EXTENSIONS } from '@sync-in-server/backend/src/applications
import type { File } from '@sync-in-server/backend/src/applications/files/schemas/file.interface'
import { SPACE_OPERATION } from '@sync-in-server/backend/src/applications/spaces/constants/spaces'
import { currentTimeStamp, popFromObject } from '@sync-in-server/backend/src/common/shared'
-import { EditorConfig } from '@sync-in-server/backend/src/configuration/config.interfaces'
+import type { FileEditorProvider } from '@sync-in-server/backend/src/configuration/config.interfaces'
import type { Observable } from 'rxjs'
import { convertBytesToText, getNewly } from '../../../common/utils/functions'
import { dJs } from '../../../common/utils/time'
@@ -89,7 +89,7 @@ export class FileModel implements File {
canBeReShared = false
haveThumbnail = false
- constructor(props: FileProps | File, basePath: string, inShare = false, editorConfig: EditorConfig) {
+ constructor(props: FileProps | File, basePath: string, inShare = false, editorConfig: FileEditorProvider) {
this.setShares(popFromObject('shares', props))
Object.assign(this, props)
this.path = `${basePath}/${this.path !== '.' ? `${this.path}/` : ''}${this.root?.alias || this.name}`
@@ -140,11 +140,16 @@ export class FileModel implements File {
this.lock = null
}
+ getExtension(): string {
+ const dot = this.name.lastIndexOf('.')
+ return dot >= 0 ? this.name.slice(dot + 1).toLowerCase() : ''
+ }
+
private getType(inShare: boolean): 'directory_share' | 'directory' | 'file' {
return this.isDir ? (inShare ? mimeDirectoryShare : mimeDirectory) : mimeFile
}
- private getMime(mime: string, inShare: boolean, editorConfig: EditorConfig): string {
+ private getMime(mime: string, inShare: boolean, editorConfig: FileEditorProvider): string {
if (this.isDir) {
this.isViewable = false
return this.getType(inShare)
@@ -156,21 +161,20 @@ export class FileModel implements File {
return this.getType(inShare)
}
- const dot = this.name.lastIndexOf('.')
- const extension = dot >= 0 ? this.name.slice(dot + 1).toLowerCase() : ''
+ const extension = this.getExtension()
const dash = mime.indexOf('-')
const temporaryMime = dash >= 0 ? mime.slice(0, dash) : mime
if (extension === SHORT_MIME.PDF) {
this.shortMime = SHORT_MIME.PDF
this.isViewable = true
- this.isEditable = editorConfig.onlyOffice === true
+ this.isEditable = editorConfig.onlyoffice === true
return mime
}
if (
- (editorConfig.collaboraOnline === true && COLLABORA_ONLINE_EXTENSIONS.has(extension)) ||
- (editorConfig.onlyOffice === true && ONLY_OFFICE_EXTENSIONS.has(extension))
+ (editorConfig.collabora === true && COLLABORA_ONLINE_EXTENSIONS.has(extension)) ||
+ (editorConfig.onlyoffice === true && ONLY_OFFICE_EXTENSIONS.has(extension))
) {
this.shortMime = SHORT_MIME.DOCUMENT
this.isEditable = true
diff --git a/frontend/src/app/applications/files/services/files.service.ts b/frontend/src/app/applications/files/services/files.service.ts
index 11599bb9..b0e63310 100644
--- a/frontend/src/app/applications/files/services/files.service.ts
+++ b/frontend/src/app/applications/files/services/files.service.ts
@@ -29,20 +29,25 @@ import type {
import type { FileLockProps } from '@sync-in-server/backend/src/applications/files/interfaces/file-props.interface'
import type { FileTree } from '@sync-in-server/backend/src/applications/files/interfaces/file-tree.interface'
import type { FileTask } from '@sync-in-server/backend/src/applications/files/models/file-task'
+import { COLLABORA_ONLINE_EXTENSIONS } from '@sync-in-server/backend/src/applications/files/modules/collabora-online/collabora-online.constants'
+import { ONLY_OFFICE_EXTENSIONS } from '@sync-in-server/backend/src/applications/files/modules/only-office/only-office.constants'
import type { FileContent } from '@sync-in-server/backend/src/applications/files/schemas/file-content.interface'
import type { FileRecent } from '@sync-in-server/backend/src/applications/files/schemas/file-recent.interface'
import { API_SPACES_TREE } from '@sync-in-server/backend/src/applications/spaces/constants/routes'
import { SPACE_OPERATION } from '@sync-in-server/backend/src/applications/spaces/constants/spaces'
import { forbiddenChars, isValidFileName } from '@sync-in-server/backend/src/common/shared'
+import type { FileEditorProvider } from '@sync-in-server/backend/src/configuration/config.interfaces'
import { BsModalRef } from 'ngx-bootstrap/modal'
import { EMPTY, firstValueFrom, map, Observable, Subject } from 'rxjs'
import { downloadWithAnchor } from '../../../common/utils/functions'
import { TAB_MENU } from '../../../layout/layout.interfaces'
import { LayoutService } from '../../../layout/layout.service'
import { StoreService } from '../../../store/store.service'
+import { UserService } from '../../users/user.service'
import { FilesLockDialogComponent } from '../components/dialogs/files-lock-dialog.component'
import { FilesOverwriteDialogComponent } from '../components/dialogs/files-overwrite-dialog.component'
import { FilesViewerDialogComponent } from '../components/dialogs/files-viewer-dialog.component'
+import { FilesViewerSelectDialog } from '../components/dialogs/files-viewer-select-dialog.component'
import { MAX_TEXT_FILE_SIZE, SHORT_MIME } from '../files.constants'
import { FileContentModel } from '../models/file-content.model'
import { FileRecentModel } from '../models/file-recent.model'
@@ -63,6 +68,7 @@ export class FilesService {
private readonly store = inject(StoreService)
private readonly sanitizer = inject(DomSanitizer)
private readonly filesTasksService = inject(FilesTasksService)
+ private readonly userService = inject(UserService)
getTreeNode(nodePath: string, showFiles = false): Promise<FileTree[]> {
return firstValueFrom(
@@ -245,14 +251,43 @@ export class FilesService {
}
async openOverwriteDialog(files: File[] | FileModel[], renamedTo?: string): Promise<boolean> {
- const overwriteDialog: BsModalRef<FilesOverwriteDialogComponent> = this.layout.openDialog(FilesOverwriteDialogComponent, null, {
- initialState: {
- files: files,
- renamedTo: renamedTo
- } as FilesOverwriteDialogComponent
+ const modalRef: BsModalRef<FilesOverwriteDialogComponent> = this.layout.openDialog(FilesOverwriteDialogComponent, null, {
+ initialState: { files, renamedTo } as FilesOverwriteDialogComponent
})
return new Promise<boolean>((resolve) => {
- overwriteDialog.content.overwrite.subscribe(resolve)
+ let resolved = false
+ const subOverwrite = modalRef.content!.overwrite.subscribe((value: boolean) => {
+ resolved = true
+ cleanup()
+ resolve(value)
+ })
+ // Triggered when the modal is closed (close button, backdrop click, ESC key, or programmatic hide)
+ const subHidden = modalRef.onHidden?.subscribe(() => {
+ if (!resolved) {
+ cleanup()
+ resolve(false)
+ }
+ })
+ const cleanup = () => {
+ subOverwrite.unsubscribe()
+ subHidden?.unsubscribe()
+ }
+ })
+ }
+
+ async openSelectViewerDialog(file: FileModel, editorProvider: FileEditorProvider): Promise<void> {
+ const modalRef: BsModalRef<FilesViewerSelectDialog> = this.layout.openDialog(FilesViewerSelectDialog, null, {
+ initialState: { file, editorProvider } as FilesViewerSelectDialog
+ })
+ return new Promise<void>((resolve) => {
+ // Fired when the modal is closed (button, backdrop, or ESC)
+ const subHidden = modalRef.onHidden?.subscribe(() => {
+ cleanup()
+ resolve(null)
+ })
+ const cleanup = () => {
+ subHidden?.unsubscribe()
+ }
})
}
@@ -276,6 +311,34 @@ export class FilesService {
return
}
+ const editorProvider: FileEditorProvider = { collabora: false, onlyoffice: false }
+ if (hookedShortMime === SHORT_MIME.DOCUMENT) {
+ if (this.store.server().fileEditors.collabora && this.store.server().fileEditors.onlyoffice) {
+ // Case with multiple editors
+ const collaboraHasExtension = COLLABORA_ONLINE_EXTENSIONS.has(file.getExtension())
+ const onlyofficeHasExtension = ONLY_OFFICE_EXTENSIONS.has(file.getExtension())
+ if (collaboraHasExtension && onlyofficeHasExtension) {
+ // Get user's saved preference
+ const userEditorPreference = this.userService.getEditorProviderPreference()
+ if (userEditorPreference && userEditorPreference in editorProvider) {
+ editorProvider[userEditorPreference] = true
+ } else {
+ // Both editors support this file extension, let the user choose
+ await this.openSelectViewerDialog(file, editorProvider)
+ if (!editorProvider.onlyoffice && !editorProvider.collabora) return
+ }
+ } else {
+ // Based on the supported extension
+ editorProvider.collabora = collaboraHasExtension
+ editorProvider.onlyoffice = onlyofficeHasExtension
+ }
+ } else {
+ // Based on availability
+ editorProvider.collabora = this.store.server().fileEditors.collabora
+ editorProvider.onlyoffice = this.store.server().fileEditors.onlyoffice
+ }
+ }
+
this.layout.openDialog(FilesViewerDialogComponent, 'full', {
id: file.id, // only used to manage the modal
initialState: {
@@ -283,7 +346,8 @@ export class FilesService {
directoryFiles: directoryFiles,
mode: mode,
isWriteable: isWriteable,
- hookedShortMime: hookedShortMime
+ hookedShortMime: hookedShortMime,
+ editorProvider: editorProvider
} satisfies Partial<FilesViewerDialogComponent>
})
},
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.html b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
index df6dc509..f051259a 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -164,7 +164,7 @@
@if (!hasDisabledItemsInSelection) {
<li role="menuitem">
<a (click)="copyMoveFiles()" class="dropdown-item">
- <span l10nTranslate><fa-icon [icon]="icons.faArrowsAlt"></fa-icon>Copy/Move</span>
+ <span l10nTranslate><fa-icon [icon]="icons.faArrowsAlt"></fa-icon>Copy · Move</span>
</a>
</li>
}
@@ -522,7 +522,7 @@
}
@if (!hasDisabledItemsInSelection) {
<ng-template (execute)="copyMoveFiles()" contextMenuItem>
- <span l10nTranslate><fa-icon [icon]="icons.faArrowsAlt"></fa-icon>Copy/Move</span>
+ <span l10nTranslate><fa-icon [icon]="icons.faArrowsAlt"></fa-icon>Copy · Move</span>
</ng-template>
}
@if (!isTrashRepo && canShare.outside || inSharesList && selection[0]?.canBeReShared) {
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
index c30541c7..e72c0197 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
@@ -342,7 +342,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
this.sortBy(
this.sortTable.sortParam.column,
false,
- spacesFiles.files.map((f: FileProps) => new FileModel(f, this.baseRepoUrl, this.isSharesRepo, this.store.server().applications.files))
+ spacesFiles.files.map((f: FileProps) => new FileModel(f, this.baseRepoUrl, this.isSharesRepo, this.store.server().fileEditors))
)
this.updateFilesStats(this.files)
this.loading = false
diff --git a/frontend/src/app/applications/users/components/user-account.component.html b/frontend/src/app/applications/users/components/user-account.component.html
index f5f68964..5e83ab35 100755
--- a/frontend/src/app/applications/users/components/user-account.component.html
+++ b/frontend/src/app/applications/users/components/user-account.component.html
@@ -11,6 +11,7 @@
<div class="col-lg-6 col-sm-12 p-2">
<div class="box box-primary mb-0">
<div class="box-body">
+
<div class="user-header">
<div class="d-flex flex-column justify-content-center me-2">
<div class="avatar-xl">
@@ -18,42 +19,51 @@
<span class="avatar-{{allOnlineStatus[user.onlineStatus]}}"></span>
</div>
</div>
+
<div class="user-details">
<div class="mb-1">{{ user.fullName }}</div>
<div class="fs-xxs text-nowrap">{{ user.email }}</div>
- <div class="text-muted fs-xxs">{{ 'Member since' | translate:locale.language }} {{ user.createdAt | amTimeAgo:true }}</div>
+ <div class="text-muted fs-xxs">
+ {{ 'Member since' | translate:locale.language }} {{ user.createdAt | amTimeAgo:true }}
+ </div>
+
<select [(ngModel)]="user.onlineStatus"
(ngModelChange)="setOnlineStatus($event)"
class="form-select form-select-sm my-auto mt-2">
@for (n of allOnlineStatus; track $index) {
- <option [ngValue]="allOnlineStatus.indexOf(n)">{{ n | translate:locale.language | capitalize }}</option>
+ <option [ngValue]="allOnlineStatus.indexOf(n)">
+ {{ n | translate:locale.language | capitalize }}
+ </option>
}
</select>
</div>
</div>
+
<ul class="list-group my-2">
<li class="list-group-item d-flex justify-content-between align-items-center">
<span class="me-auto pe-4" l10nTranslate>Login</span>
<span>{{ user.login }}</span>
</li>
+
<li class="list-group-item d-flex align-items-center justify-content-end flex-wrap">
<span class="me-auto pe-4" l10nTranslate>IP Addresses</span>
<span class="badge bg-warning rounded-pill my-1">{{ user.currentIp }}</span>
<span class="badge bg-secondary-alt rounded-pill ms-1 my-1">{{ user.lastIp }}</span>
</li>
+
<li class="list-group-item d-flex align-items-center justify-content-end flex-wrap">
<span class="me-auto pe-4" l10nTranslate>Connections</span>
<span class="badge bg-warning rounded-pill my-1">{{ user.currentAccess | amDateFormat }}</span>
<span class="badge bg-secondary-alt rounded-pill ms-1 my-1">{{ user.lastAccess | amDateFormat }}</span>
</li>
+
@if (user.isUser) {
<li class="list-group-item d-flex align-items-center justify-content-end flex-wrap">
<span class="me-auto pe-4" l10nTranslate>Permissions</span>
@if (user.isAdmin) {
<span class="badge bg-gray-dark rounded-pill ms-1 my-1">
- <fa-icon class="me-1" [icon]="icons.faKey"></fa-icon>
- <span l10nTranslate>Administrator</span>
- </span>
+ <fa-icon class="me-1" [icon]="icons.faKey"></fa-icon>
+ <span l10nTranslate>Administrator</span></span>
} @else {
@for (app of user.applications; track $index) {
<span class="badge bg-gray-dark rounded-pill ms-1 my-1" l10nTranslate>{{ app }}</span>
@@ -62,9 +72,7 @@
</li>
<li class="list-group-item d-flex align-items-center">
<span class="me-auto pe-4" l10nTranslate>Storage Space</span>
- <span class="col-5">
- <app-storage-usage [item]="user"></app-storage-usage>
- </span>
+ <span class="col-5"><app-storage-usage [item]="user"></app-storage-usage></span>
</li>
}
<li class="list-group-item d-flex justify-content-between align-items-center">
@@ -72,9 +80,64 @@
<span (click)="clipBoardLink()" class="text-primary text-end cursor-pointer">
<fa-icon [icon]="icons.faCopy"></fa-icon>
{{ webdavUrl }}
- </span>
+ </span>
</li>
</ul>
+ <hr class="mt-4" style="border-width: 1px"/>
+ <div>
+ <span class="fw-500 fs-md" l10nTranslate>Preferences</span>
+ @if (showEditorPreference) {
+ <!-- Document editor -->
+ <div class="row mt-3 mb-1">
+ <span class="col-4 align-self-center text-nowrap" l10nTranslate>Document editor</span>
+ <div class="col-auto ms-auto">
+ <div class="d-flex align-items-center justify-content-end gap-3">
+ <select
+ class="form-select form-select-sm w-auto"
+ [ngModel]="userEditorPreference"
+ (ngModelChange)="updateEditorPreference($event)">
+ <option [ngValue]="null" l10nTranslate>Ask Me</option>
+ @for (e of editors | keyvalue: originalOrderKeyValue; track e.key) {
+ <option [ngValue]="e.value">{{ e.key }}</option>
+ }
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="row mb-4">
+ <div class="text-muted fs-xxs" l10nTranslate>
+ Used when both editors support the file type.
+ </div>
+ </div>
+ }
+ @if (user.isUser) {
+ <!-- Full-text search -->
+ <div class="row mb-1">
+ <span class="col-4 text-nowrap align-self-center" l10nTranslate>Full-text search</span>
+ <div class="col-auto ms-auto">
+ <div class="d-flex align-items-center justify-content-end form-check form-switch cursor-pointer">
+ <div class="d-flex">
+ <label class="form-check-label" for="prefSwitchFullText">
+ <span l10nTranslate>{{ user.storageIndexing ? 'enabled' : 'disabled' }}</span>
+ </label>
+ <input
+ [ngModel]="user.storageIndexing"
+ (ngModelChange)="updateStorageIndexing($event)"
+ class="form-check-input ms-2"
+ id="prefSwitchFullText"
+ type="checkbox"
+ role="button">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row mb-4">
+ <div class="text-muted fs-xxs" l10nTranslate>
+ Enable content indexation for personal files.
+ </div>
+ </div>
+ }
+ </div>
</div>
</div>
</div>
@@ -125,23 +188,6 @@
</div>
</div>
@if (user.isUser) {
- <div class="row mb-3">
- <span class="col-4 text-nowrap align-self-start" l10nTranslate>Full-text search</span>
- <div class="col-auto">
- <div class="d-flex align-items-center form-check form-switch cursor-pointer">
- <input
- [ngModel]="user.storageIndexing"
- (ngModelChange)="updateStorageIndexing($event)"
- class="form-check-input"
- id="switchFullText"
- type="checkbox"
- role="button">
- <label class="form-check-label mb-0 ms-2" for="switchFullText">
- <span l10nTranslate>{{ user.storageIndexing ? 'enabled' : 'disabled' }}&nbsp;<span l10nTranslate>for personal files</span></span>
- </label>
- </div>
- </div>
- </div>
<div class="row mb-3">
<span class="col-4 text-nowrap align-self-start " l10nTranslate>Password</span>
<div class="col-auto">
diff --git a/frontend/src/app/applications/users/components/user-account.component.ts b/frontend/src/app/applications/users/components/user-account.component.ts
index 9bff9a90..a9543d5a 100644
--- a/frontend/src/app/applications/users/components/user-account.component.ts
+++ b/frontend/src/app/applications/users/components/user-account.component.ts
@@ -4,17 +4,21 @@
* See the LICENSE file for licensing details
*/
+import { KeyValuePipe } from '@angular/common'
import { HttpErrorResponse, HttpHeaders } from '@angular/common/http'
import { Component, inject, OnDestroy } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
import { faCopy, faKey } from '@fortawesome/free-solid-svg-icons'
+import { COLLABORA_OWNER_LOCK } from '@sync-in-server/backend/src/applications/files/modules/collabora-online/collabora-online.constants'
+import { ONLY_OFFICE_OWNER_LOCK } from '@sync-in-server/backend/src/applications/files/modules/only-office/only-office.constants'
import { USER_PASSWORD_MIN_LENGTH } from '@sync-in-server/backend/src/applications/users/constants/user'
import { UserAppPassword } from '@sync-in-server/backend/src/applications/users/interfaces/user-secrets.interface'
import { WEBDAV_BASE_PATH } from '@sync-in-server/backend/src/applications/webdav/constants/routes'
import { TWO_FA_HEADER_CODE, TWO_FA_HEADER_PASSWORD } from '@sync-in-server/backend/src/authentication/constants/auth'
import { TwoFaSetup } from '@sync-in-server/backend/src/authentication/interfaces/two-fa-setup.interface'
-import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe, L10nTranslationService } from 'angular-l10n'
+import type { FileEditorProvider } from '@sync-in-server/backend/src/configuration/config.interfaces'
+import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'
import { BsModalRef } from 'ngx-bootstrap/modal'
import { ClipboardService } from 'ngx-clipboard'
import { Subscription } from 'rxjs'
@@ -27,6 +31,7 @@ import { AutoResizeDirective } from '../../../common/directives/auto-resize.dire
import { CapitalizePipe } from '../../../common/pipes/capitalize.pipe'
import { TimeAgoPipe } from '../../../common/pipes/time-ago.pipe'
import { TimeDateFormatPipe } from '../../../common/pipes/time-date-format.pipe'
+import { originalOrderKeyValue } from '../../../common/utils/functions'
import { LayoutService } from '../../../layout/layout.service'
import { StoreService } from '../../../store/store.service'
import { UserType } from '../interfaces/user.interface'
@@ -48,7 +53,8 @@ import { UserAuthManageAppPasswordsDialogComponent } from './dialogs/user-auth-m
L10nTranslateDirective,
FaIconComponent,
StorageUsageComponent,
- InputPasswordComponent
+ InputPasswordComponent,
+ KeyValuePipe
],
templateUrl: 'user-account.component.html'
})
@@ -59,6 +65,10 @@ export class UserAccountComponent implements OnDestroy {
protected readonly allOnlineStatus = USER_ONLINE_STATUS_LIST
protected readonly passwordMinLength = USER_PASSWORD_MIN_LENGTH
protected readonly icons = { faCopy, faKey }
+ protected readonly editors: Record<string, keyof FileEditorProvider> = {
+ [COLLABORA_OWNER_LOCK]: 'collabora',
+ [ONLY_OFFICE_OWNER_LOCK]: 'onlyoffice'
+ }
protected user: UserType
protected userAvatar: string = null
protected webdavUrl = `${window.location.origin}/${WEBDAV_BASE_PATH}`
@@ -66,7 +76,9 @@ export class UserAccountComponent implements OnDestroy {
protected oldPassword: string
protected newPassword: string
protected readonly store = inject(StoreService)
- protected readonly l10nTranslationService = inject(L10nTranslationService)
+ protected showEditorPreference = false
+ protected userEditorPreference: keyof FileEditorProvider
+ protected readonly originalOrderKeyValue = originalOrderKeyValue
private readonly layout = inject(LayoutService)
protected languages = this.layout.getLanguages(true)
private readonly userService = inject(UserService)
@@ -83,6 +95,10 @@ export class UserAccountComponent implements OnDestroy {
translating: true,
sameLink: true
})
+ this.showEditorPreference = this.store.server().fileEditors.collabora && this.store.server().fileEditors.onlyoffice
+ if (this.showEditorPreference) {
+ this.userEditorPreference = this.userService.getEditorProviderPreference()
+ }
}
get language() {
@@ -172,6 +188,10 @@ export class UserAccountComponent implements OnDestroy {
this.layout.sendNotification('info', 'Link copied', this.webdavUrl)
}
+ updateEditorPreference(preference: keyof FileEditorProvider | null) {
+ this.userService.setEditorProviderPreference(preference)
+ }
+
async enable2Fa() {
this.userService.init2Fa().subscribe({
next: (init: TwoFaSetup) => {
diff --git a/frontend/src/app/applications/users/user.service.ts b/frontend/src/app/applications/users/user.service.ts
index 39f6157b..b08616d2 100644
--- a/frontend/src/app/applications/users/user.service.ts
+++ b/frontend/src/app/applications/users/user.service.ts
@@ -52,6 +52,7 @@ import type {
import { API_TWO_FA_ADMIN_RESET_USER, API_TWO_FA_DISABLE, API_TWO_FA_ENABLE } from '@sync-in-server/backend/src/authentication/constants/routes'
import type { TwoFaVerifyWithPasswordDto } from '@sync-in-server/backend/src/authentication/dto/two-fa-verify.dto'
import type { TwoFaEnableResult, TwoFaSetup, TwoFaVerifyResult } from '@sync-in-server/backend/src/authentication/interfaces/two-fa-setup.interface'
+import type { FileEditorProvider } from '@sync-in-server/backend/src/configuration/config.interfaces'
import { BsModalRef } from 'ngx-bootstrap/modal'
import { Socket } from 'ngx-socket-io'
import { catchError, map, Observable } from 'rxjs'
@@ -285,6 +286,18 @@ export class UserService {
})
}
+ getEditorProviderPreference(): keyof FileEditorProvider {
+ return localStorage.getItem('editorPreference') as keyof FileEditorProvider
+ }
+
+ setEditorProviderPreference(editorProvider: keyof FileEditorProvider) {
+ if (editorProvider === null) {
+ localStorage.removeItem('editorPreference')
+ } else {
+ localStorage.setItem('editorPreference', editorProvider)
+ }
+ }
+
listAppPasswords(twoFaHeaders: HttpHeaders): Observable<Omit<UserAppPassword, 'password'>[]> {
return this.http.get<Omit<UserAppPassword, 'password'>[]>(API_USERS_MY_APP_PASSWORDS, { headers: twoFaHeaders })
}
diff --git a/frontend/src/app/store/store.service.ts b/frontend/src/app/store/store.service.ts
index c3695d21..d56fde4c 100644
--- a/frontend/src/app/store/store.service.ts
+++ b/frontend/src/app/store/store.service.ts
@@ -35,7 +35,7 @@ export class StoreService {
public server: WritableSignal<ServerConfig> = signal<ServerConfig>({
twoFaEnabled: false,
mailServerEnabled: false,
- applications: { files: { collaboraOnline: false, onlyOffice: false } }
+ fileEditors: { collabora: false, onlyoffice: false }
})
public user = new BehaviorSubject<UserType>(null)
public userAvatarUrl = new BehaviorSubject<string>(myAvatarUrl())
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index a30c990d..af23ea32 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -55,7 +55,6 @@
"File": "Datei",
"Files": "Dateien",
"Personal files": "Persönliche Dateien",
- "for personal files": "für persönliche Dateien",
"Personal": "Persönlich",
"External": "Extern",
"Share status": "Freigabestatus",
@@ -265,7 +264,7 @@
"Download failed": "Download fehlgeschlagen",
"Upload done": "Upload abgeschlossen",
"Upload failed": "Upload fehlgeschlagen",
- "Copy/Move": "Kopieren/Verschieben",
+ "Copy · Move": "Kopieren · Verschieben",
"Move": "Verschieben",
"Move done": "Verschieben abgeschlossen",
"Move failed": "Verschieben fehlgeschlagen",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "Initialisierung des OnlyOffice‑Editors ist fehlgeschlagen",
"DocsAPI not available": "DocsAPI ist nicht verfügbar",
"Unknown OnlyOffice error": "Unbekannter OnlyOffice‑Fehler",
- "No editor found": "Kein Editor gefunden"
+ "No editor found": "Kein Editor gefunden",
+ "Choose which editor you want to use to open this document.": "Wählen Sie den Editor aus, mit dem Sie dieses Dokument öffnen möchten.",
+ "Open-source office suite built on LibreOffice.": "Open-Source-Office-Suite basierend auf LibreOffice.",
+ "Open-source office suite for Microsoft Office.": "Open-Source-Office-Suite für Microsoft Office.",
+ "Remember my choice for next time": "Meine Wahl für das nächste Mal merken",
+ "Document editor": "Dokumenteditor",
+ "Ask Me": "Mich fragen",
+ "Used when both editors support the file type.": "Wird verwendet, wenn beide Editoren den Dateityp unterstützen.",
+ "Enable content indexation for personal files.": "Inhaltsindexierung für persönliche Dateien aktivieren.",
+ "Preferences": "Einstellungen"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json
index fc665523..e2a3613b 100644
--- a/frontend/src/i18n/es.json
+++ b/frontend/src/i18n/es.json
@@ -55,7 +55,6 @@
"File": "Archivo",
"Files": "Archivos",
"Personal files": "Archivos personales",
- "for personal files": "para los archivos personales",
"Personal": "Personales",
"External": "Externo",
"Share status": "Estado del recurso compartido",
@@ -265,7 +264,7 @@
"Download failed": "Descarga fallida",
"Upload done": "Envío completado",
"Upload failed": "Envío fallido",
- "Copy/Move": "Copiar/Mover",
+ "Copy · Move": "Copiar · Mover",
"Move": "Mover",
"Move done": "Movimiento realizado",
"Move failed": "Movimiento fallido",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "No se pudo inicializar el editor de OnlyOffice",
"DocsAPI not available": "DocsAPI no está disponible",
"Unknown OnlyOffice error": "Error desconocido de OnlyOffice",
- "No editor found": "No se encontró un editor"
+ "No editor found": "No se encontró un editor",
+ "Choose which editor you want to use to open this document.": "Elija qué editor desea utilizar para abrir este documento.",
+ "Open-source office suite built on LibreOffice.": "Suite ofimática de código abierto basada en LibreOffice.",
+ "Open-source office suite for Microsoft Office.": "Suite ofimática de código abierto para Microsoft Office.",
+ "Remember my choice for next time": "Recordar mi elección para la próxima vez",
+ "Document editor": "Editor de documentos",
+ "Ask Me": "Preguntarme",
+ "Used when both editors support the file type.": "Se usa cuando ambos editores admiten el tipo de archivo.",
+ "Enable content indexation for personal files.": "Habilitar la indexación de contenido para archivos personales.",
+ "Preferences": "Preferencias"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json
index 721d520e..c5f29036 100644
--- a/frontend/src/i18n/fr.json
+++ b/frontend/src/i18n/fr.json
@@ -55,7 +55,6 @@
"File": "Fichier",
"Files": "Fichiers",
"Personal files": "Fichiers personnels",
- "for personal files": "pour les fichiers personnels",
"Personal": "Personnels",
"External": "Externe",
"Share status": "État du partage",
@@ -265,7 +264,7 @@
"Download failed": "Téléchargement échoué",
"Upload done": "Envoi terminé",
"Upload failed": "Envoi échoué",
- "Copy/Move": "Copier/Déplacer",
+ "Copy · Move": "Copier · Déplacer",
"Move": "Déplacer",
"Move done": "Déplacement effectué",
"Move failed": "Déplacement échoué",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "Échec de l’initialisation de l’éditeur OnlyOffice",
"DocsAPI not available": "DocsAPI n’est pas disponible",
"Unknown OnlyOffice error": "Erreur OnlyOffice inconnue",
- "No editor found": "Aucun éditeur trouvé"
+ "No editor found": "Aucun éditeur trouvé",
+ "Choose which editor you want to use to open this document.": "Choisissez l'éditeur que vous souhaitez utiliser pour ouvrir ce document.",
+ "Open-source office suite built on LibreOffice.": "Suite bureautique open-source basée sur LibreOffice.",
+ "Open-source office suite for Microsoft Office.": "Suite bureautique open-source pour Microsoft Office.",
+ "Remember my choice for next time": "Se souvenir de mon choix pour la prochaine fois",
+ "Document editor": "Éditeur de documents",
+ "Ask Me": "Me demander",
+ "Used when both editors support the file type.": "Utilisé lorsque les deux éditeurs prennent en charge le type de fichier.",
+ "Enable content indexation for personal files.": "Activer l'indexation du contenu pour les fichiers personnels.",
+ "Preferences": "Préférences"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.json
index 1cc2396c..356e961f 100644
--- a/frontend/src/i18n/hi.json
+++ b/frontend/src/i18n/hi.json
@@ -55,7 +55,6 @@
"File": "फ़ाइल",
"Files": "फ़ाइलें",
"Personal files": "व्यक्तिगत फ़ाइलें",
- "for personal files": "व्यक्तिगत फ़ाइलों के लिए",
"Personal": "व्यक्तिगत",
"External": "बाह्य",
"Share status": "साझाकरण स्थिति",
@@ -265,7 +264,7 @@
"Download failed": "डाउनलोड विफल",
"Upload done": "अपलोड पूर्ण",
"Upload failed": "अपलोड विफल",
- "Copy/Move": "कॉपी/स्थानांतरित",
+ "Copy · Move": "कॉपी · स्थानांतरित",
"Move": "स्थानांतरित करें",
"Move done": "स्थानांतरण पूर्ण",
"Move failed": "स्थानांतरण विफल",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "OnlyOffice संपादक प्रारंभ करने में विफल रहा",
"DocsAPI not available": "DocsAPI उपलब्ध नहीं है",
"Unknown OnlyOffice error": "अज्ञात OnlyOffice त्रुटि",
- "No editor found": "संपादक नहीं मिला"
+ "No editor found": "संपादक नहीं मिला",
+ "Choose which editor you want to use to open this document.": "इस दस्तावेज़ को खोलने के लिए आप कौन सा संपादक उपयोग करना चाहते हैं, चुनें।",
+ "Open-source office suite built on LibreOffice.": "LibreOffice पर आधारित ओपन-सोर्स ऑफिस सुइट।",
+ "Open-source office suite for Microsoft Office.": "Microsoft Office के लिए ओपन-सोर्स ऑफिस सुइट।",
+ "Remember my choice for next time": "अगली बार के लिए मेरी पसंद याद रखें",
+ "Document editor": "दस्तावेज़ संपादक",
+ "Ask Me": "मुझसे पूछें",
+ "Used when both editors support the file type.": "जब दोनों संपादक फ़ाइल प्रकार का समर्थन करते हैं तो उपयोग किया जाता है।",
+ "Enable content indexation for personal files.": "व्यक्तिगत फ़ाइलों के लिए सामग्री अनुक्रमण सक्षम करें।",
+ "Preferences": "वरीयताएँ"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json
index 3bec73c7..0ae8797f 100644
--- a/frontend/src/i18n/it.json
+++ b/frontend/src/i18n/it.json
@@ -55,7 +55,6 @@
"File": "File",
"Files": "File",
"Personal files": "File personali",
- "for personal files": "per i file personali",
"Personal": "Personali",
"External": "Esterno",
"Share status": "Stato della condivisione",
@@ -265,7 +264,7 @@
"Download failed": "Download non riuscito",
"Upload done": "Caricamento completato",
"Upload failed": "Caricamento non riuscito",
- "Copy/Move": "Copia/Sposta",
+ "Copy · Move": "Copia · Sposta",
"Move": "Sposta",
"Move done": "Spostamento completato",
"Move failed": "Spostamento non riuscito",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "Impossibile inizializzare l’editor OnlyOffice",
"DocsAPI not available": "DocsAPI non è disponibile",
"Unknown OnlyOffice error": "Errore sconosciuto di OnlyOffice",
- "No editor found": "Nessun editor trovato"
+ "No editor found": "Nessun editor trovato",
+ "Choose which editor you want to use to open this document.": "Scegli quale editor desideri utilizzare per aprire questo documento.",
+ "Open-source office suite built on LibreOffice.": "Suite per ufficio open-source basata su LibreOffice.",
+ "Open-source office suite for Microsoft Office.": "Suite per ufficio open-source per Microsoft Office.",
+ "Remember my choice for next time": "Ricorda la mia scelta per la prossima volta",
+ "Document editor": "Editor di documenti",
+ "Ask Me": "Chiedimelo",
+ "Used when both editors support the file type.": "Usato quando entrambi gli editor supportano il tipo di file.",
+ "Enable content indexation for personal files.": "Abilita l'indicizzazione dei contenuti per i file personali.",
+ "Preferences": "Preferenze"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json
index 71ec8b95..f2d7e6d6 100644
--- a/frontend/src/i18n/ja.json
+++ b/frontend/src/i18n/ja.json
@@ -55,7 +55,6 @@
"File": "ファイル",
"Files": "ファイル",
"Personal files": "個人ファイル",
- "for personal files": "個人ファイル用",
"Personal": "個人",
"External": "外部",
"Share status": "共有状況",
@@ -265,7 +264,7 @@
"Download failed": "ダウンロード失敗",
"Upload done": "アップロード完了",
"Upload failed": "アップロード失敗",
- "Copy/Move": "コピー/移動",
+ "Copy · Move": "コピー · 移動",
"Move": "移動",
"Move done": "移動完了",
"Move failed": "移動失敗",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "OnlyOffice エディタの初期化に失敗しました",
"DocsAPI not available": "DocsAPI を利用できません",
"Unknown OnlyOffice error": "不明な OnlyOffice エラーです",
- "No editor found": "エディタが見つかりません"
+ "No editor found": "エディタが見つかりません",
+ "Choose which editor you want to use to open this document.": "このドキュメントを開くために使用するエディタを選択してください。",
+ "Open-source office suite built on LibreOffice.": "LibreOffice をベースにしたオープンソースのオフィススイート。",
+ "Open-source office suite for Microsoft Office.": "Microsoft Office 用のオープンソースのオフィススイート。",
+ "Remember my choice for next time": "次回もこの選択を使用する",
+ "Document editor": "ドキュメントエディタ",
+ "Ask Me": "毎回確認",
+ "Used when both editors support the file type.": "両方のエディタがファイルタイプをサポートしている場合に使用されます。",
+ "Enable content indexation for personal files.": "個人ファイルのコンテンツインデックス作成を有効にする。",
+ "Preferences": "環境設定"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json
index ff07fcf0..3b072852 100644
--- a/frontend/src/i18n/ko.json
+++ b/frontend/src/i18n/ko.json
@@ -55,7 +55,6 @@
"File": "파일",
"Files": "파일",
"Personal files": "개인 파일",
- "for personal files": "개인 파일용",
"Personal": "개인",
"External": "외부",
"Share status": "공유 상태",
@@ -265,7 +264,7 @@
"Download failed": "다운로드 실패",
"Upload done": "업로드 완료",
"Upload failed": "업로드 실패",
- "Copy/Move": "복사/이동",
+ "Copy · Move": "복사 · 이동",
"Move": "이동",
"Move done": "이동 완료",
"Move failed": "이동 실패",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "OnlyOffice 편집기 초기화에 실패했습니다",
"DocsAPI not available": "DocsAPI 를 사용할 수 없습니다",
"Unknown OnlyOffice error": "알 수 없는 OnlyOffice 오류",
- "No editor found": "편집기를 찾을 수 없습니다"
+ "No editor found": "편집기를 찾을 수 없습니다",
+ "Choose which editor you want to use to open this document.": "이 문서를 열 때 사용할 편집기를 선택하세요.",
+ "Open-source office suite built on LibreOffice.": "LibreOffice 기반의 오픈소스 오피스 스위트.",
+ "Open-source office suite for Microsoft Office.": "Microsoft Office용 오픈소스 오피스 스위트.",
+ "Remember my choice for next time": "다음에도 이 선택 기억하기",
+ "Document editor": "문서 편집기",
+ "Ask Me": "매번 물어보기",
+ "Used when both editors support the file type.": "두 편집기 모두 파일 유형을 지원할 때 사용됩니다.",
+ "Enable content indexation for personal files.": "개인 파일에 대한 콘텐츠 인덱싱을 활성화합니다.",
+ "Preferences": "환경 설정"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json
index 57e3edda..658e40d2 100644
--- a/frontend/src/i18n/pl.json
+++ b/frontend/src/i18n/pl.json
@@ -55,7 +55,6 @@
"File": "Plik",
"Files": "Pliki",
"Personal files": "Pliki osobiste",
- "for personal files": "dla plików osobistych",
"Personal": "Osobiste",
"External": "Zewnętrzne",
"Share status": "Status udostępnienia",
@@ -265,7 +264,7 @@
"Download failed": "Błąd pobierania",
"Upload done": "Przesyłanie zakończone",
"Upload failed": "Błąd przesyłania",
- "Copy/Move": "Kopiuj/Przenieś",
+ "Copy · Move": "Kopiuj · Przenieś",
"Move": "Przenieś",
"Move done": "Przenoszenie zakończone",
"Move failed": "Błąd przenoszenia",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "Nie udało się zainicjować edytora OnlyOffice",
"DocsAPI not available": "DocsAPI jest niedostępne",
"Unknown OnlyOffice error": "Nieznany błąd OnlyOffice",
- "No editor found": "Nie znaleziono edytora"
+ "No editor found": "Nie znaleziono edytora",
+ "Choose which editor you want to use to open this document.": "Wybierz, którego edytora chcesz użyć do otwarcia tego dokumentu.",
+ "Open-source office suite built on LibreOffice.": "Otwarty pakiet biurowy oparty na LibreOffice.",
+ "Open-source office suite for Microsoft Office.": "Otwarty pakiet biurowy dla Microsoft Office.",
+ "Remember my choice for next time": "Zapamiętaj mój wybór na następny raz",
+ "Document editor": "Edytor dokumentów",
+ "Ask Me": "Pytaj mnie",
+ "Used when both editors support the file type.": "Używane, gdy oba edytory obsługują typ pliku.",
+ "Enable content indexation for personal files.": "Włącz indeksowanie treści dla plików osobistych.",
+ "Preferences": "Preferencje"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/pt-BR.json b/frontend/src/i18n/pt-BR.json
index 93f2729a..ffa3955d 100644
--- a/frontend/src/i18n/pt-BR.json
+++ b/frontend/src/i18n/pt-BR.json
@@ -55,7 +55,6 @@
"File": "Arquivo",
"Files": "Arquivos",
"Personal files": "Arquivos pessoais",
- "for personal files": "para arquivos pessoais",
"Personal": "Pessoal",
"External": "Externo",
"Share status": "Status do compartilhamento",
@@ -265,7 +264,7 @@
"Download failed": "Falha no download",
"Upload done": "Envio concluído",
"Upload failed": "Falha no envio",
- "Copy/Move": "Copiar/Mover",
+ "Copy · Move": "Copiar · Mover",
"Move": "Mover",
"Move done": "Movimentação concluída",
"Move failed": "Falha na movimentação",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "Falha ao inicializar o editor OnlyOffice",
"DocsAPI not available": "DocsAPI não está disponível",
"Unknown OnlyOffice error": "Erro desconhecido do OnlyOffice",
- "No editor found": "Nenhum editor encontrado"
+ "No editor found": "Nenhum editor encontrado",
+ "Choose which editor you want to use to open this document.": "Escolha qual editor você deseja usar para abrir este documento.",
+ "Open-source office suite built on LibreOffice.": "Suíte de escritório de código aberto baseada no LibreOffice.",
+ "Open-source office suite for Microsoft Office.": "Suíte de escritório de código aberto para Microsoft Office.",
+ "Remember my choice for next time": "Lembrar minha escolha para a próxima vez",
+ "Document editor": "Editor de documentos",
+ "Ask Me": "Perguntar sempre",
+ "Used when both editors support the file type.": "Usado quando ambos os editores suportam o tipo de arquivo.",
+ "Enable content indexation for personal files.": "Ativar indexação de conteúdo para arquivos pessoais.",
+ "Preferences": "Preferências"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json
index 8a21e900..71e5687c 100644
--- a/frontend/src/i18n/pt.json
+++ b/frontend/src/i18n/pt.json
@@ -55,7 +55,6 @@
"File": "Arquivo",
"Files": "Arquivos",
"Personal files": "Arquivos pessoais",
- "for personal files": "para os arquivos pessoais",
"Personal": "Pessoais",
"External": "Externo",
"Share status": "Status do compartilhamento",
@@ -265,7 +264,7 @@
"Download failed": "Falha no download",
"Upload done": "Envio concluído",
"Upload failed": "Falha no envio",
- "Copy/Move": "Copiar/Mover",
+ "Copy · Move": "Copiar · Mover",
"Move": "Mover",
"Move done": "Movimentação concluída",
"Move failed": "Falha na movimentação",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "Falha ao inicializar o editor OnlyOffice",
"DocsAPI not available": "DocsAPI não está disponível",
"Unknown OnlyOffice error": "Erro desconhecido do OnlyOffice",
- "No editor found": "Nenhum editor encontrado"
+ "No editor found": "Nenhum editor encontrado",
+ "Choose which editor you want to use to open this document.": "Escolha qual editor deseja usar para abrir este documento.",
+ "Open-source office suite built on LibreOffice.": "Suíte de escritório de código aberto baseada no LibreOffice.",
+ "Open-source office suite for Microsoft Office.": "Suíte de escritório de código aberto para Microsoft Office.",
+ "Remember my choice for next time": "Lembrar minha escolha para a próxima vez",
+ "Document editor": "Editor de documentos",
+ "Ask Me": "Perguntar sempre",
+ "Used when both editors support the file type.": "Usado quando ambos os editores suportam o tipo de arquivo.",
+ "Enable content indexation for personal files.": "Ativar indexação de conteúdo para ficheiros pessoais.",
+ "Preferences": "Preferências"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json
index ea5ca2e4..88639a00 100644
--- a/frontend/src/i18n/ru.json
+++ b/frontend/src/i18n/ru.json
@@ -55,7 +55,6 @@
"File": "Файл",
"Files": "Файлы",
"Personal files": "Личные файлы",
- "for personal files": "для личных файлов",
"Personal": "Личное",
"External": "Внешнее",
"Share status": "Статус общего доступа",
@@ -265,7 +264,7 @@
"Download failed": "Ошибка загрузки",
"Upload done": "Загрузка завершена",
"Upload failed": "Ошибка отправки",
- "Copy/Move": "Копировать/Переместить",
+ "Copy · Move": "Копировать · Переместить",
"Move": "Переместить",
"Move done": "Перемещение завершено",
"Move failed": "Ошибка перемещения",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "Не удалось инициализировать редактор OnlyOffice",
"DocsAPI not available": "DocsAPI недоступен",
"Unknown OnlyOffice error": "Неизвестная ошибка OnlyOffice",
- "No editor found": "Редактор не найден"
+ "No editor found": "Редактор не найден",
+ "Choose which editor you want to use to open this document.": "Выберите редактор, который вы хотите использовать для открытия этого документа.",
+ "Open-source office suite built on LibreOffice.": "Офисный пакет с открытым исходным кодом на основе LibreOffice.",
+ "Open-source office suite for Microsoft Office.": "Офисный пакет с открытым исходным кодом для Microsoft Office.",
+ "Remember my choice for next time": "Запомнить мой выбор на следующий раз",
+ "Document editor": "Редактор документов",
+ "Ask Me": "Спрашивать каждый раз",
+ "Used when both editors support the file type.": "Используется, когда оба редактора поддерживают тип файла.",
+ "Enable content indexation for personal files.": "Включить индексацию содержимого для личных файлов.",
+ "Preferences": "Настройки"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json
index 56107f71..42cfe760 100644
--- a/frontend/src/i18n/tr.json
+++ b/frontend/src/i18n/tr.json
@@ -55,7 +55,6 @@
"File": "Dosya",
"Files": "Dosyalar",
"Personal files": "Kişisel dosyalar",
- "for personal files": "kişisel dosyalar için",
"Personal": "Kişisel",
"External": "Harici",
"Share status": "Paylaşım durumu",
@@ -265,7 +264,7 @@
"Download failed": "İndirme başarısız",
"Upload done": "Yükleme tamamlandı",
"Upload failed": "Yükleme başarısız",
- "Copy/Move": "Kopyala/Taşı",
+ "Copy · Move": "Kopyala · Taşı",
"Move": "Taşı",
"Move done": "Taşıma tamamlandı",
"Move failed": "Taşıma başarısız",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "OnlyOffice düzenleyici başlatılamadı",
"DocsAPI not available": "DocsAPI kullanılamıyor",
"Unknown OnlyOffice error": "Bilinmeyen OnlyOffice hatası",
- "No editor found": "Düzenleyici bulunamadı"
+ "No editor found": "Düzenleyici bulunamadı",
+ "Choose which editor you want to use to open this document.": "Bu belgeyi açmak için hangi düzenleyiciyi kullanmak istediğinizi seçin.",
+ "Open-source office suite built on LibreOffice.": "LibreOffice tabanlı açık kaynak ofis paketi.",
+ "Open-source office suite for Microsoft Office.": "Microsoft Office için açık kaynak ofis paketi.",
+ "Remember my choice for next time": "Seçimimi bir dahaki sefere hatırla",
+ "Document editor": "Belge düzenleyici",
+ "Ask Me": "Bana sor",
+ "Used when both editors support the file type.": "Her iki editör de dosya türünü desteklediğinde kullanılır.",
+ "Enable content indexation for personal files.": "Kişisel dosyalar için içerik indekslemeyi etkinleştir.",
+ "Preferences": "Tercihler"
}
\ No newline at end of file
diff --git a/frontend/src/i18n/zh.json b/frontend/src/i18n/zh.json
index 882e8586..356e153d 100644
--- a/frontend/src/i18n/zh.json
+++ b/frontend/src/i18n/zh.json
@@ -55,7 +55,6 @@
"File": "文件",
"Files": "文件",
"Personal files": "个人文件",
- "for personal files": "用于个人文件",
"Personal": "个人",
"External": "外部",
"Share status": "共享状态",
@@ -265,7 +264,7 @@
"Download failed": "下载失败",
"Upload done": "上传完成",
"Upload failed": "上传失败",
- "Copy/Move": "复制/移动",
+ "Copy · Move": "复制 · 移动",
"Move": "移动",
"Move done": "移动完成",
"Move failed": "移动失败",
@@ -624,5 +623,14 @@
"OnlyOffice editor failed to initialize": "OnlyOffice 编辑器初始化失败",
"DocsAPI not available": "DocsAPI 不可用",
"Unknown OnlyOffice error": "未知的 OnlyOffice 错误",
- "No editor found": "未找到编辑器"
+ "No editor found": "未找到编辑器",
+ "Choose which editor you want to use to open this document.": "选择您要使用哪个编辑器来打开此文档。",
+ "Open-source office suite built on LibreOffice.": "基于 LibreOffice 的开源办公套件。",
+ "Open-source office suite for Microsoft Office.": "适用于 Microsoft Office 的开源办公套件。",
+ "Remember my choice for next time": "记住我的选择以便下次使用",
+ "Document editor": "文档编辑器",
+ "Ask Me": "询问我",
+ "Used when both editors support the file type.": "当两个编辑器都支持该文件类型时使用。",
+ "Enable content indexation for personal files.": "启用个人文件内容索引。",
+ "Preferences": "偏好设置"
}
\ No newline at end of file
diff --git a/frontend/src/styles/components/_fixes.scss b/frontend/src/styles/components/_fixes.scss
index 4930c11b..cb54728b 100755
--- a/frontend/src/styles/components/_fixes.scss
+++ b/frontend/src/styles/components/_fixes.scss
@@ -16,6 +16,7 @@ select:focus, .form-select:focus {
hr {
border-top: .5px solid;
color: $gray;
+ opacity: 0.5;
}
.progress-bar {
diff --git a/frontend/src/styles/components/_modal.scss b/frontend/src/styles/components/_modal.scss
index 2f73bc54..c7eca730 100644
--- a/frontend/src/styles/components/_modal.scss
+++ b/frontend/src/styles/components/_modal.scss
@@ -81,7 +81,7 @@
--bs-backdrop-zindex: 0 !important;
}
-.modal-auth-verify-2fa {
+.modal-auth-verify-2fa, .modal-viewer-select {
border-bottom-left-radius: var(--bs-modal-inner-border-radius);
border-bottom-right-radius: var(--bs-modal-inner-border-radius);
}
diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scss
index f74f3a17..1167ffb2 100755
--- a/frontend/src/styles/components/_theme_dark.scss
+++ b/frontend/src/styles/components/_theme_dark.scss
@@ -448,7 +448,7 @@
border-top-color: $sidebar-dark-apps-menu-title-bg;
}
- .modal-auth-verify-2fa {
+ .modal-auth-verify-2fa, .modal-viewer-select {
.card {
color: $gray-light;
background-color: $sidebar-dark-icons-menu-bg;
@@ -604,6 +604,10 @@
border-color: lighten($sidebar-dark-icons-menu-bg, 4%)
}
+ .text-muted {
+ color: #8a8f94 !important;
+ }
+
.text-bg-light {
color: $gray-light !important;
background-color: lighten($sidebar-dark-apps-menu-title-bg, 8%) !important;
diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss
index d7689e33..1c56e43c 100644
--- a/frontend/src/styles/variables.scss
+++ b/frontend/src/styles/variables.scss
@@ -48,7 +48,7 @@ $info: $aqua;
$warning: $orange;
$danger: $red;
$mark-bg: $light-green;
-$muted: #777;
+$muted: #6d7278;
// Options
//--------------------------------------------------------
//Body background (Affects main content background only)
@@ -57,7 +57,7 @@ $body-color: #333;
$custom-color: #212529;
$custom-dark-color: #28353b;
$list-group-color: $custom-color;
-$placeholder-color: #8c8c8c;
+$placeholder-color: $muted;
// Quickly modify global styling by enabling or disabling optional features.
$enable-transitions: true;
$enable-rounded: true;