OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
[#66708] replace icons in attachments section
Eric Schuberta00ed2ee3a18
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/files-tab/op-files-tab.component.html b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/files-tab/op-files-tab.component.htmlindex ae007c7afac..3b7a37a7cbf 100644--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/files-tab/op-files-tab.component.html+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/files-tab/op-files-tab.component.html@@ -11,7 +11,8 @@*ngIf="showAttachmentHeader$ | async"class="op-tab-content--header">- <span class="spot-icon spot-icon_attachment op-tab-content--header-icon op-files-tab--icon_clip"></span>++ <svg class="op-tab-content--header-icon op-files-tab--icon" paperclip-icon size="small"></svg><span class="op-tab-content--header-text" [textContent]="text.attachments.label"></span></div>diff --git a/frontend/src/app/shared/components/attachments/attachments.component.html b/frontend/src/app/shared/components/attachments/attachments.component.htmlindex 9d233ae740a..bedb980a7b5 100644--- a/frontend/src/app/shared/components/attachments/attachments.component.html+++ b/frontend/src/app/shared/components/attachments/attachments.component.html@@ -1,71 +1,65 @@-<op-attachment-list- [ngClass]="{- 'op-file-section--list': true,- 'op-file-section--list_dragging': dragging > 0- }"- *ngIf="(attachments$ | async).length"- [attachments]="attachments$ | async"- [collectionKey]="collectionKey"- [showTimestamp]="showTimestamp"- [showDelete]="allowRemoval"- (attachmentRemoved)="attachmentRemoved.emit()"-></op-attachment-list>+@if ((attachments$ | async).length > 0) {+ <op-attachment-list+ [ngClass]="{+ 'op-file-section--list': true,+ 'op-file-section--list_dragging': dragging > 0+ }"+ [attachments]="attachments$ | async"+ [collectionKey]="collectionKey"+ [showTimestamp]="showTimestamp"+ [showDelete]="allowRemoval"+ (attachmentRemoved)="attachmentRemoved.emit()"+ ></op-attachment-list>+}+-<input- *ngIf="allowUploading && resource.canAddAttachments"- #hiddenFileInput- type="file"- id="attachment_files"- name="attachment_files"- (change)="onFilePickerChanged()"- hidden- multiple-/>+@if (allowUploading && resource.canAddAttachments) {+ <input+ #hiddenFileInput+ type="file"+ id="attachment_files"+ name="attachment_files"+ (change)="onFilePickerChanged()"+ hidden+ multiple+ />-<button- *ngIf="allowUploading && resource.canAddAttachments"- [attr.aria-label]="text.uploadLabel"- data-test-selector="op-attachments--drop-box"- [ngClass]="{+ <button+ [attr.aria-label]="text.uploadLabel"+ data-test-selector="op-attachments--drop-box"+ [ngClass]="{'hide-when-print': true,'op-file-section--drop-box': true,'op-file-section--drop-box_dragging': dragging > 0,'op-file-section--drop-box_dragging-over': draggingOverDropZone,'op-file-section--drop-box_float': (attachments$ | async).length}"- type="button"- (click)="triggerFileInput()"- (dragover)="onDragOver($event)"- (dragleave)="onDragLeave($event)"- (drop)="onDropFiles($event)"->- <span- class="spot-icon spot-icon_add-attachment op-file-section--drop-box-icon"- ></span>- <span- *ngIf="(attachments$ | async).length > 0"- class="op-file-section--drop-box-text"- [textContent]="text.dropFiles"- ></span>- <span- *ngIf="(attachments$ | async).length === 0"- class="op-file-section--drop-box-text"- [textContent]="text.dropClickFiles"- ></span>-</button>--<div- *ngIf="allowUploading && resource.canAddAttachments"- class="op-file-section--actions hide-when-print"->- <button- *ngIf="!externalUploadButton"type="button"- class="spot-link"(click)="triggerFileInput()"- data-test-selector="op-attachments--upload-button"+ (dragover)="onDragOver($event)"+ (dragleave)="onDragLeave($event)"+ (drop)="onDropFiles($event)">- <span class="spot-icon spot-icon_add-attachment"></span>- <span [textContent]="text.uploadLabel"></span>+ <svg op-add-attachment-icon size="small"></svg>++ @if ((attachments$ | async).length === 0) {+ <span class="op-file-section--drop-box-text" [textContent]="text.dropClickFiles"></span>+ } @else {+ <span class="op-file-section--drop-box-text" [textContent]="text.dropFiles"></span>+ }</button>-</div>++ <div class="op-file-section--actions hide-when-print">+ @if (!externalUploadButton) {+ <button+ type="button"+ class="spot-link"+ (click)="triggerFileInput()"+ data-test-selector="op-attachments--upload-button"+ >+ <svg op-add-attachment-icon size="small"></svg>+ <span [textContent]="text.uploadLabel"></span>+ </button>+ }+ </div>+}diff --git a/frontend/src/app/shared/components/icon/icon.module.ts b/frontend/src/app/shared/components/icon/icon.module.tsindex ea2003fe97d..f4cd721a1eb 100644--- a/frontend/src/app/shared/components/icon/icon.module.ts+++ b/frontend/src/app/shared/components/icon/icon.module.ts@@ -81,6 +81,9 @@ import {AlertFillIconComponent,BugIconComponent,TrashIconComponent,+ PaperclipIconComponent,+ OpAddAttachmentIconComponent,+ TriangleRightIconComponent,} from '@openproject/octicons-angular';@NgModule({@@ -102,6 +105,7 @@ import {InfoIconComponent,LinkIconComponent,LinkExternalIconComponent,+ OpAddAttachmentIconComponent,OpAlarmIconComponent,OpAlarmSetIconComponent,OpCursorRectangleSelectIconComponent,@@ -128,6 +132,7 @@ import {OpViewModalIconComponent,OpViewThreedIconComponent,PackageIconComponent,+ PaperclipIconComponent,PersonIconComponent,QuestionIconComponent,ScreenFullIconComponent,@@ -137,6 +142,7 @@ import {StarIconComponent,TasklistIconComponent,TrashIconComponent,+ TriangleRightIconComponent,UploadIconComponent,UnlinkIconComponent,XIconComponent,@@ -192,6 +198,7 @@ import {InfoIconComponent,LinkIconComponent,LinkExternalIconComponent,+ OpAddAttachmentIconComponent,OpAlarmIconComponent,OpAlarmSetIconComponent,OpCursorRectangleSelectIconComponent,@@ -218,6 +225,7 @@ import {OpViewModalIconComponent,OpViewThreedIconComponent,PackageIconComponent,+ PaperclipIconComponent,PersonIconComponent,QuestionIconComponent,ScreenFullIconComponent,@@ -227,6 +235,7 @@ import {StarIconComponent,TasklistIconComponent,TrashIconComponent,+ TriangleRightIconComponent,UploadIconComponent,UnlinkIconComponent,XIconComponent,diff --git a/frontend/src/app/shared/components/storages/storage-information/storage-information.html b/frontend/src/app/shared/components/storages/storage-information/storage-information.htmlindex 254b7adf232..9d1e32e3c1c 100644--- a/frontend/src/app/shared/components/storages/storage-information/storage-information.html+++ b/frontend/src/app/shared/components/storages/storage-information/storage-information.html@@ -1,12 +1,12 @@@switch (content.iconClass) {@case ('warning') {- <svg alert-fill-icon size="small" class="info-icon-box"></svg>+ <svg alert-fill-icon class="info-icon-box"></svg>}@case ('info') {- <svg info-icon size="small" class="info-icon-box"></svg>+ <svg info-icon class="info-icon-box"></svg>}@default {- <svg question-icon size="small" class="info-icon-box"></svg>+ <svg question-icon class="info-icon-box"></svg>}}diff --git a/frontend/src/app/shared/components/storages/storage/storage.component.html b/frontend/src/app/shared/components/storages/storage/storage.component.htmlindex 917c2c84cef..3dd7a2bdf02 100644--- a/frontend/src/app/shared/components/storages/storage/storage.component.html+++ b/frontend/src/app/shared/components/storages/storage/storage.component.html@@ -1,10 +1,11 @@@if (resource) {<div class=op-tab-content--header>- <svg- class="op-tab-content--header-icon op-files-tab--icon op-files-tab--icon_primary"- cloud-icon- size="small"- ></svg>+ @if ((storage | async)?._links.type.href === nextcloud) {+ <svg class="op-tab-content--header-icon op-files-tab--icon" op-mark-nextcloud-icon size="small"></svg>+ } @else {+ <svg class="op-tab-content--header-icon op-files-tab--icon" cloud-icon size="small"></svg>+ }+<span class="op-tab-content--header-text" [textContent]="(storage | async)?.name"></span>@if (openStorageLink) {@@ -38,16 +39,17 @@}"data-test-selector="file-list">- <li- *ngFor="let fileLink of fileLinks | async; let i = index;"- class="spot-list--item op-file-list--item"- data-test-selector="file-list--item"- op-file-link-list-item- [fileLink]="fileLink"- [disabled]="disabled | async"- [allowEditing]="allowLinking"- (removeFileLink)="removeFileLink(fileLink)"- ></li>+ @for (fileLink of fileLinks | async; track fileLink.id) {+ <li+ class="spot-list--item op-file-list--item"+ data-test-selector="file-list--item"+ op-file-link-list-item+ [fileLink]="fileLink"+ [disabled]="disabled | async"+ [allowEditing]="allowLinking"+ (removeFileLink)="removeFileLink(fileLink)"+ ></li>+ }</ul>}diff --git a/frontend/src/app/shared/components/storages/storage/storage.component.ts b/frontend/src/app/shared/components/storages/storage/storage.component.tsindex 48a60436d78..fe3d4c4c241 100644--- a/frontend/src/app/shared/components/storages/storage/storage.component.ts+++ b/frontend/src/app/shared/components/storages/storage/storage.component.ts@@ -317,7 +317,7 @@ export class StorageComponent extends UntilDestroyedMixin implements OnInit, OnD.subscribe(([storage, fileLinks, collectionKey]) => {const locals = {addFileLinksHref: this.addFileLinksHref,- projectFolderHref: this.projectStorage._links.projectFolder?.href || null,+ projectFolderHref: this.projectStorage._links.projectFolder?.href ?? null,projectFolderMode: this.projectStorage.projectFolderMode,storage,collectionKey,@@ -431,7 +431,7 @@ export class StorageComponent extends UntilDestroyedMixin implements OnInit, OnDif (isUploadError) {this.handleUploadError(error as HttpErrorResponse, data.file.name);} else {- this.toastService.addError(this.text.toast.linkingAfterUploadFailed(data.file.name, this.resource.id as string));+ this.toastService.addError(this.text.toast.linkingAfterUploadFailed(data.file.name, this.resource.id!));}console.error(error);@@ -473,7 +473,7 @@ export class StorageComponent extends UntilDestroyedMixin implements OnInit, OnDprivate uploadAndNotify(link:IUploadLink, file:File, overwrite:boolean|null):Observable<IStorageFileUploadResponse> {const { href } = link._links.destination;- const uploadFiles:IUploadFile[] = [{ file, overwrite: overwrite !== null ? overwrite : undefined }];+ const uploadFiles:IUploadFile[] = [{ file, overwrite: overwrite ?? undefined }];const observable = this.uploadService.upload<IStorageFileUploadResponse>(href, uploadFiles)[0];this.toastService.addUpload(this.text.toast.uploadingLabel, [[file, observable]]);@@ -576,10 +576,9 @@ export class StorageComponent extends UntilDestroyedMixin implements OnInit, OnD}public onDragOver(event:DragEvent):void {- const containsFiles = (dataTransfer:DataTransfer):boolean => dataTransfer.types.indexOf('Files') >= 0;+ const containsFiles = (dataTransfer:DataTransfer):boolean => dataTransfer.types.includes('Files');if (event.dataTransfer !== null && containsFiles(event.dataTransfer)) {- // eslint-disable-next-line no-param-reassignevent.dataTransfer.dropEffect = 'copy';this.draggingOverDropZone = true;}@@ -588,4 +587,6 @@ export class StorageComponent extends UntilDestroyedMixin implements OnInit, OnDpublic onDragLeave(_event:DragEvent):void {this.draggingOverDropZone = false;}++ protected readonly nextcloud = nextcloud;}diff --git a/frontend/src/app/spot/components/breadcrumbs/breadcrumbs.component.html b/frontend/src/app/spot/components/breadcrumbs/breadcrumbs.component.htmlindex 2da746fd12b..dddaafd0505 100644--- a/frontend/src/app/spot/components/breadcrumbs/breadcrumbs.component.html+++ b/frontend/src/app/spot/components/breadcrumbs/breadcrumbs.component.html@@ -16,27 +16,27 @@(click)="crumb.navigate()">@if (crumb.icon) {- <ng-container [ngTemplateOutlet]="storageIcon" [ngTemplateOutletContext]="{icon:crumb.icon}"></ng-container>+ <ng-container [ngTemplateOutlet]="crumbIcon" [ngTemplateOutletContext]="{icon:crumb.icon}"></ng-container>}<span [textContent]="crumb.text" class="spot-breadcrumbs--crumb-action-item-text"></span><span class="spot-breadcrumbs--crumb-action-item-dots"></span></button>- <span class="spot-breadcrumbs--crumb-divider spot-icon spot-icon_arrow-right5"></span>+ <svg triangle-right-icon size="small" class="spot-breadcrumbs--crumb-divider"></svg></div>}@if (i === 1 && content.crumbs.length > 4) {<div class="spot-breadcrumbs--crumb spot-breadcrumbs--crumb_collapsed">- <span class="spot-breadcrumbs--crumb-divider spot-icon spot-icon_arrow-right5"></span>+ <svg triangle-right-icon size="small" class="spot-breadcrumbs--crumb-divider"></svg></div>}@if (last) {<div class="spot-breadcrumbs--crumb spot-breadcrumbs--crumb_last" data-test-selector="op-breadcrumb">@if (crumb.icon) {- <ng-container [ngTemplateOutlet]="storageIcon" [ngTemplateOutletContext]="{icon:crumb.icon}"></ng-container>+ <ng-container [ngTemplateOutlet]="crumbIcon" [ngTemplateOutletContext]="{icon:crumb.icon}"></ng-container>}<span class="spot-breadcrumbs--crumb-action-item-text" [textContent]="crumb.text"></span>@@ -44,13 +44,13 @@}}-<ng-template #storageIcon let-iconClass="icon">+<ng-template #crumbIcon let-iconClass="icon">@switch (iconClass) {@case ('nextcloud-circle') {- <svg op-mark-nextcloud-icon size="small" class="octicon"></svg>+ <svg op-mark-nextcloud-icon size="small"></svg>}@default {- <svg cloud-icon size="small" class="octicon"></svg>+ <svg cloud-icon size="small"></svg>}}</ng-template>diff --git a/frontend/src/global_styles/content/work_packages/tabs/_files_tab.sass b/frontend/src/global_styles/content/work_packages/tabs/_files_tab.sassindex bc8e78b9b48..b950766576e 100644--- a/frontend/src/global_styles/content/work_packages/tabs/_files_tab.sass+++ b/frontend/src/global_styles/content/work_packages/tabs/_files_tab.sass@@ -40,7 +40,9 @@color: var(--fgColor-muted)grid-area: iconfont-size: 3.375rem- margin-right: $spot-spacing-0_5++ &.octicon+ margin-right: $spot-spacing-0_5.text-boxgrid-area: textdiff --git a/frontend/src/global_styles/content/work_packages/tabs/_tab_content.sass b/frontend/src/global_styles/content/work_packages/tabs/_tab_content.sassindex de364a7c19f..c9c672f4c79 100644--- a/frontend/src/global_styles/content/work_packages/tabs/_tab_content.sass+++ b/frontend/src/global_styles/content/work_packages/tabs/_tab_content.sass@@ -54,7 +54,7 @@@include spot-subheader-extra-small()text-transform: uppercase- &-icon+ &-icon.octiconmargin-right: $spot-spacing-0_5&-action