diff --git a/app/src/lang/en-US/index.json b/app/src/lang/en-US/index.json index cc022e7c17..fda0fdd7fa 100644 --- a/app/src/lang/en-US/index.json +++ b/app/src/lang/en-US/index.json @@ -760,19 +760,19 @@ "keep_editing": "Keep Editing", "page_help_collections_overview": "**Collections Overview** — Lists of all collections you have access to.", - "page_help_collections_browse": "**Browse Items** — Lists all {collection} items you have access to. Customize layout, filters, and sorting to tailor your view, and even save bookmarks of these different configurations for quick access.

Learn More", + "page_help_collections_browse": "**Browse Items** — Lists all {collection} items you have access to. Customize layout, filters, and sorting to tailor your view, and even save bookmarks of these different configurations for quick access.", "page_help_collections_detail": "**Item Detail** — A form for viewing and managing this item. This sidebar also contains a full history of revisions, and embedded comments.", "page_help_activity_browse": "**Browse Activity** — A comprehensive listing of all your user's system and content activity.", "page_help_activity_detail": "**Activity Detail** — Shows accountability info, revision data, and the update message for this activity record.", "page_help_files_browse": "**File Library** — Lists all file assets uploaded to this project. Customize layout, filters, and sorting to tailor your view, and even save bookmarks of these different configurations for quick access.", "page_help_files_detail": "**File Detail** — A form for managing file metadata, editing the original asset, and updating access settings.", - "page_help_settings_project": "**Project Settings** — Your project's global configuration options.

Learn More", + "page_help_settings_project": "**Project Settings** — Your project's global configuration options.", "page_help_settings_datamodel_collections": "**Data Model: Collections** — Lists all collections available. This includes visible, hidden, and system collections, as well as unmanaged database tables that can be added.", "page_help_settings_datamodel_fields": "**Data Model: Collection** — A form for managing this collection and its fields.", "page_help_settings_roles_browse": "**Browse Roles** — Lists the Admin, Public and custom User Roles.", "page_help_settings_roles_detail": "**Role Detail** — Manage a role's permissions and other settings.", "page_help_settings_presets_browse": "**Browse Presets** — Lists all presets in the project, including: user, role, and global bookmarks, as well as default views.", - "page_help_settings_presets_detail": "**Preset Detail** — A form for managing bookmarks and default collection presets.

To create a default preset, choose a role... TK TK", + "page_help_settings_presets_detail": "**Preset Detail** — A form for managing bookmarks and default collection presets.", "page_help_settings_webhooks_browse": "**Browse Webhooks** — Lists all webhooks within the project.", "page_help_settings_webhooks_detail": "**Webhook Detail** — A form for creating and managing project webhooks.", "page_help_users_browse": "**User Directory** — Lists all system users within this project.", diff --git a/app/src/modules/activity/routes/browse/browse.vue b/app/src/modules/activity/routes/browse/browse.vue index 78d4e8bdac..a8b3df8a7f 100644 --- a/app/src/modules/activity/routes/browse/browse.vue +++ b/app/src/modules/activity/routes/browse/browse.vue @@ -34,13 +34,10 @@ diff --git a/app/src/modules/collections/routes/browse/browse.vue b/app/src/modules/collections/routes/browse/browse.vue index 54cb654692..4f055ecb7c 100644 --- a/app/src/modules/collections/routes/browse/browse.vue +++ b/app/src/modules/collections/routes/browse/browse.vue @@ -138,13 +138,8 @@ diff --git a/app/src/modules/collections/routes/detail/detail.vue b/app/src/modules/collections/routes/detail/detail.vue index 155f80896f..e05259d068 100644 --- a/app/src/modules/collections/routes/detail/detail.vue +++ b/app/src/modules/collections/routes/detail/detail.vue @@ -152,7 +152,7 @@ diff --git a/app/src/modules/collections/routes/overview/overview.vue b/app/src/modules/collections/routes/overview/overview.vue index 5266054267..3c334926a3 100644 --- a/app/src/modules/collections/routes/overview/overview.vue +++ b/app/src/modules/collections/routes/overview/overview.vue @@ -30,10 +30,7 @@ diff --git a/app/src/modules/files/routes/browse/browse.vue b/app/src/modules/files/routes/browse/browse.vue index 63816541d9..b6c4cac3ff 100644 --- a/app/src/modules/files/routes/browse/browse.vue +++ b/app/src/modules/files/routes/browse/browse.vue @@ -128,13 +128,10 @@ diff --git a/app/src/modules/files/routes/detail/components/file-info-drawer-detail.vue b/app/src/modules/files/routes/detail/components/file-info-drawer-detail.vue index aca6687207..e4a11cce6f 100644 --- a/app/src/modules/files/routes/detail/components/file-info-drawer-detail.vue +++ b/app/src/modules/files/routes/detail/components/file-info-drawer-detail.vue @@ -86,6 +86,11 @@ + + + +
+ @@ -94,6 +99,7 @@ import { defineComponent, computed, ref, watch } from '@vue/composition-api'; import readableMimeType from '@/utils/readable-mime-type'; import bytes from 'bytes'; import i18n from '@/lang'; +import marked from 'marked'; import localizedFormat from '@/utils/localized-format'; import api from '@/api'; @@ -122,7 +128,7 @@ export default defineComponent({ const { user } = useUser(); const { folder } = useFolder(); - return { readableMimeType, size, creationDate, user, folder }; + return { readableMimeType, size, creationDate, user, folder, marked }; function useCreationDate() { const creationDate = ref(null); diff --git a/app/src/modules/files/routes/detail/detail.vue b/app/src/modules/files/routes/detail/detail.vue index 4360c39bc5..10a4cca7df 100644 --- a/app/src/modules/files/routes/detail/detail.vue +++ b/app/src/modules/files/routes/detail/detail.vue @@ -163,9 +163,6 @@ collection="directus_files" :primary-key="primaryKey" /> - -
- @@ -186,7 +183,6 @@ import FileLightbox from '@/views/private/components/file-lightbox'; import { useFieldsStore } from '@/stores/'; import { Field } from '@/types'; import FileInfoDrawerDetail from './components/file-info-drawer-detail.vue'; -import marked from 'marked'; import useFormFields from '@/composables/use-form-fields'; import FolderPicker from '../../components/folder-picker'; import api from '@/api'; @@ -315,7 +311,6 @@ export default defineComponent({ previewActive, revisionsDrawerDetail, formFields, - marked, confirmLeave, leaveTo, discardAndLeave, diff --git a/app/src/modules/settings/routes/data-model/collections/collections.vue b/app/src/modules/settings/routes/data-model/collections/collections.vue index 951c89afc5..61a4ba2aa4 100644 --- a/app/src/modules/settings/routes/data-model/collections/collections.vue +++ b/app/src/modules/settings/routes/data-model/collections/collections.vue @@ -77,12 +77,9 @@ diff --git a/app/src/modules/settings/routes/data-model/fields/fields.vue b/app/src/modules/settings/routes/data-model/fields/fields.vue index b9bf9f0c0d..d16cdc134f 100644 --- a/app/src/modules/settings/routes/data-model/fields/fields.vue +++ b/app/src/modules/settings/routes/data-model/fields/fields.vue @@ -75,10 +75,7 @@ diff --git a/app/src/modules/settings/routes/presets/browse/browse.vue b/app/src/modules/settings/routes/presets/browse/browse.vue index 914d1dbd25..f8643a1a94 100644 --- a/app/src/modules/settings/routes/presets/browse/browse.vue +++ b/app/src/modules/settings/routes/presets/browse/browse.vue @@ -86,9 +86,6 @@ @@ -105,7 +102,6 @@ import layouts from '@/layouts'; import { TranslateResult } from 'vue-i18n'; import router from '@/router'; import ValueNull from '@/views/private/components/value-null'; -import marked from 'marked'; import PresetsInfoDrawerDetail from './components/presets-info-drawer-detail.vue'; type PresetRaw = { @@ -152,7 +148,6 @@ export default defineComponent({ confirmDelete, deleting, deleteSelection, - marked, }; function useLinks() { diff --git a/app/src/modules/settings/routes/presets/browse/components/presets-info-drawer-detail.vue b/app/src/modules/settings/routes/presets/browse/components/presets-info-drawer-detail.vue index bc68bf1134..b47d0861d6 100644 --- a/app/src/modules/settings/routes/presets/browse/components/presets-info-drawer-detail.vue +++ b/app/src/modules/settings/routes/presets/browse/components/presets-info-drawer-detail.vue @@ -10,12 +10,18 @@
{{ presetsCount }}
+ + + +
+ + + diff --git a/app/src/modules/settings/routes/presets/detail/detail.vue b/app/src/modules/settings/routes/presets/detail/detail.vue index 8072c0e19c..24ddf68dd8 100644 --- a/app/src/modules/settings/routes/presets/detail/detail.vue +++ b/app/src/modules/settings/routes/presets/detail/detail.vue @@ -77,16 +77,12 @@ diff --git a/app/src/modules/settings/routes/project/components/project-info-drawer-detail.vue b/app/src/modules/settings/routes/project/components/project-info-drawer-detail.vue index bd987c26b5..a6c3300f99 100644 --- a/app/src/modules/settings/routes/project/components/project-info-drawer-detail.vue +++ b/app/src/modules/settings/routes/project/components/project-info-drawer-detail.vue @@ -30,12 +30,17 @@
3306
+ + + +
+ + diff --git a/app/src/modules/settings/routes/project/project.vue b/app/src/modules/settings/routes/project/project.vue index 11c5e47413..fbb1c1ceae 100644 --- a/app/src/modules/settings/routes/project/project.vue +++ b/app/src/modules/settings/routes/project/project.vue @@ -23,9 +23,6 @@ @@ -35,7 +32,6 @@ import { defineComponent, ref, computed } from '@vue/composition-api'; import SettingsNavigation from '../../components/navigation/'; import useCollection from '@/composables/use-collection'; import { useSettingsStore } from '@/stores'; -import marked from 'marked'; import ProjectInfoDrawerDetail from './components/project-info-drawer-detail.vue'; import { clone } from 'lodash'; @@ -54,7 +50,7 @@ export default defineComponent({ const saving = ref(false); - return { fields, initialValues, edits, noEdits, saving, save, marked }; + return { fields, initialValues, edits, noEdits, saving, save }; async function save() { if (edits.value === null) return; diff --git a/app/src/modules/settings/routes/roles/browse/browse.vue b/app/src/modules/settings/routes/roles/browse/browse.vue index 6ae5ed3828..83c48504a9 100644 --- a/app/src/modules/settings/routes/roles/browse/browse.vue +++ b/app/src/modules/settings/routes/roles/browse/browse.vue @@ -20,11 +20,7 @@ @@ -159,11 +155,6 @@ export default defineComponent({ --v-button-background-color-disabled: var(--warning-25); } -.subdued { - color: var(--foreground-subdued); - font-style: italic; -} - .roles { padding: var(--content-padding); padding-bottom: var(--content-padding-bottom); diff --git a/app/src/modules/settings/routes/roles/detail/components/role-info-drawer-detail/role-info-drawer-detail.vue b/app/src/modules/settings/routes/roles/detail/components/role-info-drawer-detail/role-info-drawer-detail.vue index 0485d71a40..3c79d73e31 100644 --- a/app/src/modules/settings/routes/roles/detail/components/role-info-drawer-detail/role-info-drawer-detail.vue +++ b/app/src/modules/settings/routes/roles/detail/components/role-info-drawer-detail/role-info-drawer-detail.vue @@ -6,11 +6,16 @@
{{ role.id }}
+ + + +
+ + diff --git a/app/src/modules/settings/routes/roles/detail/detail.vue b/app/src/modules/settings/routes/roles/detail/detail.vue index 57f91802cf..b4c2e4a081 100644 --- a/app/src/modules/settings/routes/roles/detail/detail.vue +++ b/app/src/modules/settings/routes/roles/detail/detail.vue @@ -91,9 +91,6 @@ @@ -106,7 +103,6 @@ import router from '@/router'; import RevisionsDrawerDetail from '@/views/private/components/revisions-drawer-detail'; import useItem from '@/composables/use-item'; import SaveOptions from '@/views/private/components/save-options'; -import marked from 'marked'; import { useUserStore } from '@/stores/'; import RoleInfoDrawerDetail from './components/role-info-drawer-detail'; @@ -153,7 +149,6 @@ export default defineComponent({ saveAndAddNew, saveAsCopyAndNavigate, isBatch, - marked, }; /** diff --git a/app/src/modules/settings/routes/webhooks/browse/browse.vue b/app/src/modules/settings/routes/webhooks/browse/browse.vue index 73df829924..e33a20856b 100644 --- a/app/src/modules/settings/routes/webhooks/browse/browse.vue +++ b/app/src/modules/settings/routes/webhooks/browse/browse.vue @@ -61,13 +61,10 @@ diff --git a/app/src/modules/settings/routes/webhooks/detail/detail.vue b/app/src/modules/settings/routes/webhooks/detail/detail.vue index 6d418737e6..4274fc31fc 100644 --- a/app/src/modules/settings/routes/webhooks/detail/detail.vue +++ b/app/src/modules/settings/routes/webhooks/detail/detail.vue @@ -59,12 +59,9 @@ diff --git a/app/src/modules/users/routes/browse/browse.vue b/app/src/modules/users/routes/browse/browse.vue index f8838d0b3e..54b170f636 100644 --- a/app/src/modules/users/routes/browse/browse.vue +++ b/app/src/modules/users/routes/browse/browse.vue @@ -93,13 +93,10 @@ diff --git a/app/src/modules/users/routes/detail/components/user-info-drawer-detail.vue b/app/src/modules/users/routes/detail/components/user-info-drawer-detail.vue index 8b9980bed8..936ce695ca 100644 --- a/app/src/modules/users/routes/detail/components/user-info-drawer-detail.vue +++ b/app/src/modules/users/routes/detail/components/user-info-drawer-detail.vue @@ -29,14 +29,15 @@
- + + +
+ + diff --git a/app/src/modules/users/routes/detail/detail.vue b/app/src/modules/users/routes/detail/detail.vue index 14af76209a..bd4ac89ad9 100644 --- a/app/src/modules/users/routes/detail/detail.vue +++ b/app/src/modules/users/routes/detail/detail.vue @@ -121,9 +121,6 @@ collection="directus_users" :primary-key="primaryKey" /> - -
- @@ -138,7 +135,6 @@ import RevisionsDrawerDetail from '@/views/private/components/revisions-drawer-d import CommentsDrawerDetail from '@/views/private/components/comments-drawer-detail'; import useItem from '@/composables/use-item'; import SaveOptions from '@/views/private/components/save-options'; -import marked from 'marked'; import api from '@/api'; import { useFieldsStore } from '@/stores/'; import useFormFields from '@/composables/use-form-fields'; @@ -258,7 +254,6 @@ export default defineComponent({ saveAsCopyAndNavigate, isBatch, revisionsDrawerDetail, - marked, previewLoading, avatarSrc, roleName, diff --git a/app/src/views/private/components/drawer-detail/drawer-detail.vue b/app/src/views/private/components/drawer-detail/drawer-detail.vue index 36f0656e0e..d9adffca68 100644 --- a/app/src/views/private/components/drawer-detail/drawer-detail.vue +++ b/app/src/views/private/components/drawer-detail/drawer-detail.vue @@ -151,7 +151,10 @@ body { .content { padding: 16px; ::v-deep { - .format-markdown { + .page-description { + color: var(--foreground-subdued); + margin-bottom: 8px; + a { color: var(--primary); }