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
feat(frontend): harmonize dropdown and context menus
johavenab7cffe22d5f
diff --git a/frontend/src/app/applications/admin/components/admin-spaces.component.html b/frontend/src/app/applications/admin/components/admin-spaces.component.htmlindex 7744155c..6bd647ea 100644--- a/frontend/src/app/applications/admin/components/admin-spaces.component.html+++ b/frontend/src/app/applications/admin/components/admin-spaces.component.html@@ -142,9 +142,5 @@<span l10nTranslate><fa-icon [icon]="icons.SHARES"></fa-icon>Edit children shares</span></ng-template>}- <ng-template [divider]="true" contextMenuItem></ng-template>- <ng-template (execute)="layout.showRSideBarTab(TAB_MENU.SELECTION)" contextMenuItem>- <span l10nTranslate><fa-icon [icon]="icons.faCircleInfo"></fa-icon>Info</span>- </ng-template></context-menu><!--End Context Menu-->diff --git a/frontend/src/app/applications/admin/components/admin-spaces.component.ts b/frontend/src/app/applications/admin/components/admin-spaces.component.tsindex 97938c42..f139b91b 100644--- a/frontend/src/app/applications/admin/components/admin-spaces.component.ts+++ b/frontend/src/app/applications/admin/components/admin-spaces.component.ts@@ -3,7 +3,7 @@ import { HttpErrorResponse } from '@angular/common/http'import { Component, ElementRef, inject, ViewChild } from '@angular/core'import { ActivatedRoute } from '@angular/router'import { FaIconComponent } from '@fortawesome/angular-fontawesome'-import { faArrowDown, faArrowRotateRight, faArrowUp, faCircleInfo, faPen, faPlus, faRotate, faUpload } from '@fortawesome/free-solid-svg-icons'+import { faArrowDown, faArrowRotateRight, faArrowUp, faPen, faPlus, faRotate, faUpload } from '@fortawesome/free-solid-svg-icons'import { ContextMenuComponent, ContextMenuModule } from '@perfectmemory/ngx-contextmenu'import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'import { BsModalRef } from 'ngx-bootstrap/modal'@@ -18,7 +18,6 @@ import { TableHeaderConfig } from '../../../common/interfaces/table.interface'import { SearchFilterPipe } from '../../../common/pipes/search.pipe'import { originalOrderKeyValue } from '../../../common/utils/functions'import { SortSettings, SortTable } from '../../../common/utils/sort-table'-import { TAB_MENU } from '../../../layout/layout.interfaces'import { LayoutService } from '../../../layout/layout.service'import { SharedChildrenDialogComponent } from '../../shares/components/dialogs/shared-children-dialog.component'import { SpaceDialogComponent } from '../../spaces/components/dialogs/space-dialog.component'@@ -58,7 +57,6 @@ export class AdminSpacesComponent {protected readonly locale = inject<L10nLocale>(L10N_LOCALE)protected readonly layout = inject(LayoutService)protected readonly originalOrderKeyValue = originalOrderKeyValue- protected readonly TAB_MENU = TAB_MENUprotected readonly icons = {SPACES: ADMIN_ICON.SPACES,SHARES: SPACES_ICON.SHARES,@@ -68,8 +66,7 @@ export class AdminSpacesComponent {faArrowRotateRight,faUpload,faPlus,- faPen,- faCircleInfo+ faPen}// Sortprotected tableHeaders: Record<'name' | 'managers' | 'storage' | 'members' | 'info' | 'modified', TableHeaderConfig> = {diff --git a/frontend/src/app/applications/files/components/sidebar/files-selection.component.html b/frontend/src/app/applications/files/components/sidebar/files-selection.component.htmlindex 43852ab9..3a3e5a64 100644--- a/frontend/src/app/applications/files/components/sidebar/files-selection.component.html+++ b/frontend/src/app/applications/files/components/sidebar/files-selection.component.html@@ -5,7 +5,7 @@<div class="d-flex"><select [(ngModel)]="selectedAction" class="form-select form-select-sm"><option value="clipboard" l10nTranslate>Clipboard</option>- <option value="copyMove" l10nTranslate>Copy · Move</option>+ <option value="copyMove" l10nTranslate>Copy • Move</option><option value="download" l10nTranslate>Download</option><option value="compress" l10nTranslate>Compress</option></select>diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.html b/frontend/src/app/applications/spaces/components/spaces-browser.component.htmlindex c4a40498..5760c933 100644--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html@@ -26,11 +26,7 @@<span l10nTranslate><fa-icon [icon]="icons.faFileAlt"></fa-icon>New document</span></a></li>- <li role="menuitem">- <a (click)="openNewDialog('download')" class="dropdown-item">- <span l10nTranslate><fa-icon [icon]="icons.faGlobe"></fa-icon>Download from URL</span>- </a>- </li>+ <li class="dropdown-divider"></li><li role="menuitem"><a appUploadFiles [options]="{isMultiple: true}" (uploadFiles)="onUploadFiles($event)" class="dropdown-item" id="uploadFilesButton"><span l10nTranslate><fa-icon [icon]="icons.faUpload"></fa-icon>Upload files</span>@@ -45,6 +41,11 @@</a>}</li>+ <li role="menuitem">+ <a (click)="openNewDialog('download')" class="dropdown-item">+ <span l10nTranslate><fa-icon [icon]="icons.faGlobe"></fa-icon>Download from URL</span>+ </a>+ </li></ul></div>}@@ -120,10 +121,16 @@</li>}}+ <li role="menuitem">+ <a (click)="layout.showRSideBarTab(TAB_MENU.SELECTION)" class="dropdown-item">+ <span l10nTranslate><fa-icon [icon]="icons.faSquareCheck"></fa-icon>Selection</span>+ </a>+ </li>+ <li class="dropdown-divider"></li>@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>}@@ -134,17 +141,6 @@</a></li>}- @if (selection.length === 1 && canManageFavorite) {- <li role="menuitem">- <a (click)="toggleFavorite(selection[0])" class="dropdown-item">- @if (selection[0].isFavorite) {- <span l10nTranslate><fa-icon [icon]="icons.FAVORITES"></fa-icon>Remove from favorites</span>- } @else {- <span l10nTranslate><fa-icon [icon]="icons.FAVORITES"></fa-icon>Add to favorites</span>- }- </a>- </li>- }@if (!isTrashRepo && canCompress) {<li role="menuitem"><a (click)="openCompressionDialog()" class="dropdown-item">@@ -159,6 +155,9 @@</a></li>}+ @if (!hasDisabledItemsInSelection || selection.length === 1 && !isTrashRepo && !inSharesList || !isTrashRepo && canCompress) {+ <li class="dropdown-divider"></li>+ }<li role="menuitem"><a (click)="addToClipboard()" class="dropdown-item"><span l10nTranslate><fa-icon [icon]="icons.faClipboardList"></fa-icon>Clipboard</span>@@ -178,21 +177,27 @@</a></li>}- <li role="menuitem">- <a (click)="layout.showRSideBarTab(TAB_MENU.SELECTION)" class="dropdown-item">- <span l10nTranslate><fa-icon [icon]="icons.faCircleInfo"></fa-icon>Info</span>- </a>- </li>+ @if (selection.length === 1 && canManageFavorite) {+ <li role="menuitem">+ <a (click)="toggleFavorite(selection[0])" class="dropdown-item">+ @if (selection[0].isFavorite) {+ <span l10nTranslate><fa-icon [icon]="icons.FAVORITES"></fa-icon>Remove from favorites</span>+ } @else {+ <span l10nTranslate><fa-icon [icon]="icons.FAVORITES"></fa-icon>Add to favorites</span>+ }+ </a>+ </li>+ }@if (!inSharesList) {<li class="dropdown-divider"></li><li role="menuitem">@if (isTrashRepo) {<a (click)="openTrashDialog(true)" class="dropdown-item">- <span l10nTranslate><fa-icon [icon]="icons.faBan"></fa-icon>Remove</span>+ <span l10nTranslate><fa-icon [icon]="icons.faBan" class="text-danger"></fa-icon>Remove</span></a>} @else {<a (click)="openTrashDialog()" class="dropdown-item">- <span l10nTranslate><fa-icon [icon]="icons.TRASH"></fa-icon>Trash</span>+ <span l10nTranslate><fa-icon [icon]="icons.TRASH" class="text-danger"></fa-icon>Trash</span></a>}</li>@@ -589,8 +594,13 @@<ng-template (execute)="downloadFiles()" contextMenuItem><span l10nTranslate><fa-icon [icon]="icons.faDownload"></fa-icon>Download</span></ng-template>+ }+ @if (selection.length === 1 && selection[0] || !hasDisabledItemsInSelection) {+ <ng-template [divider]="true" contextMenuItem></ng-template>+ }+ @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 (selection.length === 1 && !isTrashRepo && !inSharesList) {@@ -609,6 +619,11 @@<span l10nTranslate><fa-icon [icon]="icons.faFileArchive"></fa-icon>Decompress</span></ng-template>}+ }+ @if (!hasDisabledItemsInSelection || selection.length === 1 && !isTrashRepo && !inSharesList || !isTrashRepo && canCompress) {+ <ng-template [divider]="true" contextMenuItem></ng-template>+ }+ @if (!isTrashRepo) {@if (canShare.outside || inSharesList && selection[0]?.canBeReShared) {<ng-template [subMenu]="ShareContextMenu" contextMenuItem><span l10nTranslate><fa-icon [icon]="icons.SHARED"></fa-icon>Share</span>@@ -623,6 +638,11 @@<span l10nTranslate><fa-icon [icon]="icons.faRotate"></fa-icon>Synchronize</span></ng-template>}+ @if (selection.length === 1 && !isTrashRepo) {+ <ng-template (execute)="layout.showRSideBarTab(TAB_MENU.COMMENTS, true)" contextMenuItem>+ <span l10nTranslate><fa-icon [icon]="icons.faCommentDots"></fa-icon>Comment</span>+ </ng-template>+ }@if (selection.length === 1 && canManageFavorite) {<ng-template (execute)="toggleFavorite(selection[0])" contextMenuItem>@if (selection[0].isFavorite) {@@ -632,15 +652,10 @@}</ng-template>}- @if (selection.length === 1 && !isTrashRepo) {- <ng-template (execute)="layout.showRSideBarTab(TAB_MENU.COMMENTS, true)" contextMenuItem>- <span l10nTranslate><fa-icon [icon]="icons.faCommentDots"></fa-icon>Comment</span>- </ng-template>- }@if (!inSharesList) {<ng-template [divider]="true" contextMenuItem></ng-template><ng-template (execute)="openTrashDialog(isTrashRepo)" contextMenuItem>- <span l10nTranslate><fa-icon [icon]="isTrashRepo ? icons.faBan : icons.TRASH"></fa-icon>+ <span l10nTranslate><fa-icon [icon]="isTrashRepo ? icons.faBan : icons.TRASH" class="text-danger"></fa-icon>{{ isTrashRepo ? 'Remove' : 'Trash' }}</span></ng-template>}diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts b/frontend/src/app/applications/spaces/components/spaces-browser.component.tsindex 5e98cc11..8a1ec13b 100644--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts@@ -3,6 +3,7 @@ import { HttpErrorResponse } from '@angular/common/http'import { AfterViewInit, Component, ElementRef, inject, NgZone, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'import { ActivatedRoute, Data, Router, UrlSegment } from '@angular/router'import { FaIconComponent } from '@fortawesome/angular-fontawesome'+import { faSquareCheck } from '@fortawesome/free-regular-svg-icons'import {faAnchor,faArrowDown,@@ -11,7 +12,6 @@ import {faArrowUp,faBan,faCheck,- faCircleInfo,faCirclePlus,faClipboardList,faCommentDots,@@ -153,7 +153,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroyfaFileArchive,faSpellCheck,faArrowsAlt,- faCircleInfo,+ faSquareCheck,faBan,faCheck,faArrowUp,diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.jsonindex a6d11b14..6e696371 100644--- a/frontend/src/i18n/de.json+++ b/frontend/src/i18n/de.json@@ -288,7 +288,7 @@"Interrupted": "Unterbrochen","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",diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.jsonindex 2be1f8da..0b3a8606 100644--- a/frontend/src/i18n/es.json+++ b/frontend/src/i18n/es.json@@ -288,7 +288,7 @@"Interrupted": "Interrumpida","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",diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.jsonindex 199692db..74daa9eb 100644--- a/frontend/src/i18n/fr.json+++ b/frontend/src/i18n/fr.json@@ -288,7 +288,7 @@"Interrupted": "Interrompue","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é",diff --git a/frontend/src/i18n/hi.json b/frontend/src/i18n/hi.jsonindex e8bcb27e..d52bb6fa 100644--- a/frontend/src/i18n/hi.json+++ b/frontend/src/i18n/hi.json@@ -288,7 +288,7 @@"Interrupted": "बाधित","Upload done": "अपलोड पूर्ण","Upload failed": "अपलोड विफल",- "Copy · Move": "कॉपी · स्थानांतरित",+ "Copy • Move": "कॉपी • स्थानांतरित","Move": "स्थानांतरित करें","Move done": "स्थानांतरण पूर्ण","Move failed": "स्थानांतरण विफल",diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.jsonindex 84934a4f..70e4f594 100644--- a/frontend/src/i18n/it.json+++ b/frontend/src/i18n/it.json@@ -288,7 +288,7 @@"Interrupted": "Interrotta","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",diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.jsonindex 2f0680c0..aa914969 100644--- a/frontend/src/i18n/ja.json+++ b/frontend/src/i18n/ja.json@@ -288,7 +288,7 @@"Interrupted": "中断済み","Upload done": "アップロード完了","Upload failed": "アップロード失敗",- "Copy · Move": "コピー · 移動",+ "Copy • Move": "コピー • 移動","Move": "移動","Move done": "移動完了","Move failed": "移動失敗",diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.jsonindex 41f986fd..533a8d6f 100644--- a/frontend/src/i18n/ko.json+++ b/frontend/src/i18n/ko.json@@ -288,7 +288,7 @@"Interrupted": "중단됨","Upload done": "업로드 완료","Upload failed": "업로드 실패",- "Copy · Move": "복사 · 이동",+ "Copy • Move": "복사 • 이동","Move": "이동","Move done": "이동 완료","Move failed": "이동 실패",diff --git a/frontend/src/i18n/nl.json b/frontend/src/i18n/nl.jsonindex 27323487..0388c862 100644--- a/frontend/src/i18n/nl.json+++ b/frontend/src/i18n/nl.json@@ -288,7 +288,7 @@"Interrupted": "Onderbroken","Upload done": "Uploaden voltooid","Upload failed": "Uploaden mislukt",- "Copy · Move": "Kopiëren · Verplaatsen",+ "Copy • Move": "Kopiëren • Verplaatsen","Move": "Verplaatsen","Move done": "Verplaatsen voltooid","Move failed": "Verplaatsen mislukt",diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.jsonindex 79db89e5..19aaa4f3 100644--- a/frontend/src/i18n/pl.json+++ b/frontend/src/i18n/pl.json@@ -288,7 +288,7 @@"Interrupted": "Przerwano","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",diff --git a/frontend/src/i18n/pt-BR.json b/frontend/src/i18n/pt-BR.jsonindex 7a4d55dd..ff888827 100644--- a/frontend/src/i18n/pt-BR.json+++ b/frontend/src/i18n/pt-BR.json@@ -288,7 +288,7 @@"Interrupted": "Interrompida","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",diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.jsonindex 861609fb..0b62c65d 100644--- a/frontend/src/i18n/pt.json+++ b/frontend/src/i18n/pt.json@@ -288,7 +288,7 @@"Interrupted": "Interrompida","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",diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.jsonindex 5e3d48a8..c0bb3f92 100644--- a/frontend/src/i18n/ru.json+++ b/frontend/src/i18n/ru.json@@ -288,7 +288,7 @@"Interrupted": "Прервано","Upload done": "Загрузка завершена","Upload failed": "Ошибка отправки",- "Copy · Move": "Копировать · Переместить",+ "Copy • Move": "Копировать • Переместить","Move": "Переместить","Move done": "Перемещение завершено","Move failed": "Ошибка перемещения",diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.jsonindex 3b54ce96..88adabb3 100644--- a/frontend/src/i18n/tr.json+++ b/frontend/src/i18n/tr.json@@ -288,7 +288,7 @@"Interrupted": "Kesintiye uğradı","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",diff --git a/frontend/src/i18n/zh.json b/frontend/src/i18n/zh.jsonindex 1b5eb11f..201b6d9e 100644--- a/frontend/src/i18n/zh.json+++ b/frontend/src/i18n/zh.json@@ -288,7 +288,7 @@"Interrupted": "已中断","Upload done": "上传完成","Upload failed": "上传失败",- "Copy · Move": "复制 · 移动",+ "Copy • Move": "复制 • 移动","Move": "移动","Move done": "移动完成","Move failed": "移动失败",diff --git a/frontend/src/styles/components/_contextmenu.scss b/frontend/src/styles/components/_contextmenu.scssindex fe7eda4d..a5eb5a2b 100644--- a/frontend/src/styles/components/_contextmenu.scss+++ b/frontend/src/styles/components/_contextmenu.scss@@ -10,7 +10,7 @@}.ngx-contextmenu {- padding: $dropdown-item-padding-y !important;+ padding: $dropdown-padding-y !important;font-size: $dropdown-font-size !important;border-width: .5px !important;border-style: solid !important;@@ -32,6 +32,7 @@}> [role='separator'] {border-bottom: none !important;- @include app-menu-divider-structure(.2rem 0, .5px, true);+ opacity: 1 !important;+ @include app-menu-divider-structure($dropdown-divider-margin-y 0, $dropdown-divider-width, true);}}diff --git a/frontend/src/styles/components/_dropdowns.scss b/frontend/src/styles/components/_dropdowns.scssindex 0d5a55fc..a63f80b5 100644--- a/frontend/src/styles/components/_dropdowns.scss+++ b/frontend/src/styles/components/_dropdowns.scss@@ -1,6 +1,6 @@.dropdown-menu {min-width: 0 !important;- @include app-menu-surface-structure($btn-border-radius, .25rem);+ @include app-menu-surface-structure($btn-border-radius, $dropdown-padding-y);> li > a {@include app-menu-item-structure($btn-border-radius, 1px);@@ -21,7 +21,7 @@}.dropdown-divider {- @include app-menu-divider-structure(.2rem 0, .5px);+ @include app-menu-divider-structure($dropdown-divider-margin-y 0, $dropdown-divider-width);}.dropdown-toggle {diff --git a/frontend/src/styles/components/_gallery.scss b/frontend/src/styles/components/_gallery.scssindex c1965eb7..421db6ce 100644--- a/frontend/src/styles/components/_gallery.scss+++ b/frontend/src/styles/components/_gallery.scss@@ -81,6 +81,10 @@}}+ .badge {+ display: inline-flex;+ }+.badge,.card-footer,.card-footer input {diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scssindex 4ae22a56..b171c62e 100644--- a/frontend/src/styles/variables.scss+++ b/frontend/src/styles/variables.scss@@ -176,9 +176,11 @@ $dropdown-link-color: #444;$dropdown-link-active-color: $dropdown-link-color;$dropdown-link-hover-bg: $table-bg-hover !important;$dropdown-link-active-bg: $dropdown-link-hover-bg;-$dropdown-item-padding-y: .3rem;-$dropdown-item-padding-x: .8rem;-$dropdown-padding-y: .2rem;+$dropdown-item-padding-y: .35rem;+$dropdown-item-padding-x: .4rem;+$dropdown-padding-y: .375rem;+$dropdown-divider-margin-y: .25rem;+$dropdown-divider-width: 1px;$dropdown-header-color: #8aa4af;// --------------------------------------------------------