diff --git a/models/chunter/src/index.ts b/models/chunter/src/index.ts index d0470aa9ea..1b441e6715 100644 --- a/models/chunter/src/index.ts +++ b/models/chunter/src/index.ts @@ -308,7 +308,7 @@ export function createModel (builder: Builder): void { { id: 'spaceBrowser', component: workbench.component.SpaceBrowser, - icon: chunter.icon.Hashtag, + icon: chunter.icon.ChannelBrowser, label: chunter.string.ChannelBrowser, position: 'top', spaceClass: chunter.class.Channel, diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts index f6ef3ea74f..8750aa1b08 100644 --- a/models/contact/src/index.ts +++ b/models/contact/src/index.ts @@ -167,7 +167,7 @@ export function createModel (builder: Builder): void { core.space.Model, { label: contact.string.Contacts, - icon: contact.icon.Person, + icon: contact.icon.ContactApplication, hidden: false, component: contact.component.Contacts }, diff --git a/models/lead/src/index.ts b/models/lead/src/index.ts index c9786211e1..d5e7e236a6 100644 --- a/models/lead/src/index.ts +++ b/models/lead/src/index.ts @@ -91,7 +91,7 @@ export function createModel (builder: Builder): void { { id: 'spaceBrowser', component: workbench.component.SpaceBrowser, - icon: workbench.icon.Search, + icon: lead.icon.FunnelBrowser, label: lead.string.FunnelBrowser, position: 'top', spaceClass: lead.class.Funnel, diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts index a9d3b3c60a..3d0b554a0f 100644 --- a/models/recruit/src/index.ts +++ b/models/recruit/src/index.ts @@ -223,7 +223,7 @@ export function createModel (builder: Builder): void { { id: assignedId, label: task.string.Assigned, - icon: task.icon.Task, + icon: recruit.icon.AssignedToMe, component: task.component.AssignedTasks, position: 'event', componentProps: { @@ -243,7 +243,7 @@ export function createModel (builder: Builder): void { createLabel: recruit.string.ReviewCreateLabel, createComponent: recruit.component.CreateReview }, - icon: calendar.icon.Calendar, + icon: recruit.icon.Reviews, label: recruit.string.Reviews, position: 'event' } diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts index 6b08ee6348..06700c9ce7 100644 --- a/models/tracker/src/index.ts +++ b/models/tracker/src/index.ts @@ -414,7 +414,7 @@ export function createModel (builder: Builder): void { core.space.Model, { label: tracker.string.TrackerApplication, - icon: tracker.icon.Issue, + icon: tracker.icon.TrackerApplication, hidden: false, navigatorModel: { specials: [ diff --git a/packages/presentation/src/components/icons/Download.svelte b/packages/presentation/src/components/icons/Download.svelte index bcbc0523a4..3a679267e4 100644 --- a/packages/presentation/src/components/icons/Download.svelte +++ b/packages/presentation/src/components/icons/Download.svelte @@ -18,11 +18,11 @@ const fill: string = 'currentColor' - + diff --git a/plugins/attachment-assets/assets/icons.svg b/plugins/attachment-assets/assets/icons.svg index 4483c9e96d..4291cb688e 100644 --- a/plugins/attachment-assets/assets/icons.svg +++ b/plugins/attachment-assets/assets/icons.svg @@ -9,7 +9,10 @@ - - + + + + + diff --git a/plugins/board-assets/assets/icons.svg b/plugins/board-assets/assets/icons.svg index 05febc1975..4b80b5010d 100644 --- a/plugins/board-assets/assets/icons.svg +++ b/plugins/board-assets/assets/icons.svg @@ -1,7 +1,10 @@ - - + + + + + diff --git a/plugins/calendar-assets/assets/icons.svg b/plugins/calendar-assets/assets/icons.svg index 41c0f0143d..71edd83dd1 100644 --- a/plugins/calendar-assets/assets/icons.svg +++ b/plugins/calendar-assets/assets/icons.svg @@ -1,6 +1,15 @@ - + + + + + + + + + + diff --git a/plugins/chunter-assets/assets/icons.svg b/plugins/chunter-assets/assets/icons.svg index c1ba10b437..fd91e305ea 100644 --- a/plugins/chunter-assets/assets/icons.svg +++ b/plugins/chunter-assets/assets/icons.svg @@ -1,17 +1,22 @@ - + - - + + - - + + - - + + + + + + + diff --git a/plugins/chunter-assets/src/index.ts b/plugins/chunter-assets/src/index.ts index 417e6eae9a..b06e7f64d2 100644 --- a/plugins/chunter-assets/src/index.ts +++ b/plugins/chunter-assets/src/index.ts @@ -22,7 +22,8 @@ loadMetadata(chunter.icon, { Hashtag: `${icons}#hashtag`, Thread: `${icons}#thread`, Lock: `${icons}#lock`, - Bookmark: `${icons}#bookmark` + Bookmark: `${icons}#bookmark`, + ChannelBrowser: `${icons}#channelbrowser` }) addStringsLoader(chunterId, async (lang: string) => await import(`../lang/${lang}.json`)) diff --git a/plugins/chunter/src/index.ts b/plugins/chunter/src/index.ts index 3ee2ffe6c5..5a2a87659e 100644 --- a/plugins/chunter/src/index.ts +++ b/plugins/chunter/src/index.ts @@ -112,7 +112,8 @@ export default plugin(chunterId, { Hashtag: '' as Asset, Thread: '' as Asset, Lock: '' as Asset, - Bookmark: '' as Asset + Bookmark: '' as Asset, + ChannelBrowser: '' as Asset }, component: { CommentInput: '' as AnyComponent, diff --git a/plugins/contact-assets/assets/icons.svg b/plugins/contact-assets/assets/icons.svg index b86ce97576..cd0ff49629 100644 --- a/plugins/contact-assets/assets/icons.svg +++ b/plugins/contact-assets/assets/icons.svg @@ -1,4 +1,12 @@ + + + + + + + + @@ -47,13 +55,12 @@ - - - + + - - + + diff --git a/plugins/contact-assets/src/index.ts b/plugins/contact-assets/src/index.ts index fada080487..82e40cd7f7 100644 --- a/plugins/contact-assets/src/index.ts +++ b/plugins/contact-assets/src/index.ts @@ -18,6 +18,7 @@ import contact, { contactId } from '@anticrm/contact' const icons = require('../assets/icons.svg') as string // eslint-disable-line loadMetadata(contact.icon, { + ContactApplication: `${icons}#contactapplication`, Phone: `${icons}#phone`, Email: `${icons}#email`, Discord: `${icons}#discord`, diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts index 42843caa30..df4662c362 100644 --- a/plugins/contact/src/index.ts +++ b/plugins/contact/src/index.ts @@ -184,6 +184,7 @@ const contactPlugin = plugin(contactId, { Homepage: '' as Ref }, icon: { + ContactApplication: '' as Asset, Phone: '' as Asset, Email: '' as Asset, Discord: '' as Asset, diff --git a/plugins/devmodel-resources/src/index.ts b/plugins/devmodel-resources/src/index.ts index 1854084ffa..7dc2a838a4 100644 --- a/plugins/devmodel-resources/src/index.ts +++ b/plugins/devmodel-resources/src/index.ts @@ -154,7 +154,7 @@ export async function Hook (client: Client): Promise { core.space.Model, { label: 'DevModel' as IntlString, - icon: view.icon.Table, + icon: view.icon.Model, hidden: false, navigatorModel: { spaces: [], diff --git a/plugins/inventory-assets/assets/icons.svg b/plugins/inventory-assets/assets/icons.svg index b944f924c2..753578d844 100644 --- a/plugins/inventory-assets/assets/icons.svg +++ b/plugins/inventory-assets/assets/icons.svg @@ -1,6 +1,6 @@ - + diff --git a/plugins/lead-assets/assets/icons.svg b/plugins/lead-assets/assets/icons.svg index 8db72bc3f0..5fb5966c23 100644 --- a/plugins/lead-assets/assets/icons.svg +++ b/plugins/lead-assets/assets/icons.svg @@ -1,13 +1,26 @@ - - + + - - + + + + + - - + + + + + + + + + + + + diff --git a/plugins/lead-assets/src/index.ts b/plugins/lead-assets/src/index.ts index 4043282244..542e83849d 100644 --- a/plugins/lead-assets/src/index.ts +++ b/plugins/lead-assets/src/index.ts @@ -22,6 +22,7 @@ loadMetadata(lead.icon, { Funnel: `${icons}#funnel`, Lead: `${icons}#lead`, LeadApplication: `${icons}#leadapplication`, + FunnelBrowser: `${icons}#funnelBrowser`, CreateCustomer: `${icons}#new-customer` }) diff --git a/plugins/lead/src/index.ts b/plugins/lead/src/index.ts index 61cc1b75d2..c9edc1c5b6 100644 --- a/plugins/lead/src/index.ts +++ b/plugins/lead/src/index.ts @@ -71,6 +71,7 @@ const lead = plugin(leadId, { Funnel: '' as Asset, Lead: '' as Asset, LeadApplication: '' as Asset, + FunnelBrowser: '' as Asset, CreateCustomer: '' as Asset }, space: { diff --git a/plugins/notification-assets/assets/icons.svg b/plugins/notification-assets/assets/icons.svg index 4205e4ce24..2c9291539d 100644 --- a/plugins/notification-assets/assets/icons.svg +++ b/plugins/notification-assets/assets/icons.svg @@ -1,6 +1,7 @@ - + + diff --git a/plugins/recruit-assets/assets/icons.svg b/plugins/recruit-assets/assets/icons.svg index f0a0aa5127..a1f123b8c3 100644 --- a/plugins/recruit-assets/assets/icons.svg +++ b/plugins/recruit-assets/assets/icons.svg @@ -1,11 +1,9 @@ - - - - - - + + + + @@ -23,8 +21,9 @@ - - + + + @@ -32,7 +31,26 @@ - + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/recruit-assets/src/index.ts b/plugins/recruit-assets/src/index.ts index b72427d4a3..72b99b83ed 100644 --- a/plugins/recruit-assets/src/index.ts +++ b/plugins/recruit-assets/src/index.ts @@ -24,9 +24,11 @@ loadMetadata(recruit.icon, { Calendar: `${icons}#calendar`, Create: `${icons}#create`, Application: `${icons}#application`, - Review: `${icons}#application`, - Opinion: `${icons}#application`, + Review: `${icons}#review`, + Opinion: `${icons}#opinion`, CreateCandidate: `${icons}#new-candidate`, + AssignedToMe: `${icons}#assignedToMe`, + Reviews: `${icons}#reviews`, Skills: `${icons}#skills` }) diff --git a/plugins/recruit-resources/src/components/review/OpinionPresenter.svelte b/plugins/recruit-resources/src/components/review/OpinionPresenter.svelte index cfa3951c89..684d58e895 100644 --- a/plugins/recruit-resources/src/components/review/OpinionPresenter.svelte +++ b/plugins/recruit-resources/src/components/review/OpinionPresenter.svelte @@ -44,7 +44,7 @@ {#if value}
- +   {#if value && shortLabel} {shortLabel}-{value.number} diff --git a/plugins/recruit-resources/src/components/review/ReviewPresenter.svelte b/plugins/recruit-resources/src/components/review/ReviewPresenter.svelte index 64b2f22650..6ad0bc889e 100644 --- a/plugins/recruit-resources/src/components/review/ReviewPresenter.svelte +++ b/plugins/recruit-resources/src/components/review/ReviewPresenter.svelte @@ -43,7 +43,7 @@ href="#{getPanelURI(view.component.EditDoc, value._id, value._class, 'content')}" >
- +
{shortLabel}-{value.number} diff --git a/plugins/recruit/src/index.ts b/plugins/recruit/src/index.ts index 78d86ac226..d12ce8e6b1 100644 --- a/plugins/recruit/src/index.ts +++ b/plugins/recruit/src/index.ts @@ -120,6 +120,8 @@ const recruit = plugin(recruitId, { Review: '' as Asset, Opinion: '' as Asset, CreateCandidate: '' as Asset, + AssignedToMe: '' as Asset, + Reviews: '' as Asset, Skills: '' as Asset }, space: { diff --git a/plugins/tracker-assets/assets/icons.svg b/plugins/tracker-assets/assets/icons.svg index 60eadf80d0..ffb94f33fa 100644 --- a/plugins/tracker-assets/assets/icons.svg +++ b/plugins/tracker-assets/assets/icons.svg @@ -1,9 +1,7 @@ - - - - + + @@ -145,4 +143,19 @@ + + + + + + + + + + + + + + + diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json index f6f747b7a3..52116da60d 100644 --- a/plugins/tracker-assets/lang/en.json +++ b/plugins/tracker-assets/lang/en.json @@ -138,7 +138,7 @@ "Save": "Save", "IncludeItemsThatMatch": "Include items that match", "AnyFilter": "any filter", - "AllFilters": "all filters", + "AllFilters": "all filters", "NoDescription": "No description", "SearchIssue": "Search for task..." }, diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json index 1b86749db8..d5dc11653f 100644 --- a/plugins/tracker-assets/lang/ru.json +++ b/plugins/tracker-assets/lang/ru.json @@ -75,6 +75,9 @@ "Rank": "", "IssueTitlePlaceholder": "Имя задачи", "IssueDescriptionPlaceholder": "Описание задачи", + "CopyIssueUrl": "Копировать URL-адрес задачи в буфер обмена", + "CopyIssueId": "Копировать ID задачи в буфер обмена", + "CopyIssueBranch": "Копировать имя ветки Git в буфер обмена", "GotoIssues": "Перейти к задачам", "GotoActive": "Перейти к активным задачам", diff --git a/plugins/tracker-assets/src/index.ts b/plugins/tracker-assets/src/index.ts index f15f096a90..49fe1757e9 100644 --- a/plugins/tracker-assets/src/index.ts +++ b/plugins/tracker-assets/src/index.ts @@ -55,7 +55,11 @@ loadMetadata(tracker.icon, { ProjectStatusInProgress: `${icons}#project-status-in-progress`, ProjectStatusPaused: `${icons}#project-status-paused`, ProjectStatusCompleted: `${icons}#project-status-completed`, - ProjectStatusCanceled: `${icons}#project-status-canceled` + ProjectStatusCanceled: `${icons}#project-status-canceled`, + + CopyID: `${icons}#copyID`, + CopyURL: `${icons}#copyURL`, + CopyBranch: `${icons}#copyBranch` }) addStringsLoader(trackerId, async (lang: string) => await import(`../lang/${lang}.json`)) diff --git a/plugins/tracker-resources/src/components/issues/edit/CopyToClipboard.svelte b/plugins/tracker-resources/src/components/issues/edit/CopyToClipboard.svelte index 8d23777356..c53b78495a 100644 --- a/plugins/tracker-resources/src/components/issues/edit/CopyToClipboard.svelte +++ b/plugins/tracker-resources/src/components/issues/edit/CopyToClipboard.svelte @@ -22,17 +22,13 @@ {#if issueUrl} - + {/if} {#if issueId} - + {/if} {#if issueBranch} - + {/if} diff --git a/plugins/tracker-resources/src/components/issues/edit/CopyToClipboardButton.svelte b/plugins/tracker-resources/src/components/issues/edit/CopyToClipboardButton.svelte index cd29cd4500..5a38897033 100644 --- a/plugins/tracker-resources/src/components/issues/edit/CopyToClipboardButton.svelte +++ b/plugins/tracker-resources/src/components/issues/edit/CopyToClipboardButton.svelte @@ -22,11 +22,5 @@ -
{/if} - {#if label}