Merge branch 'main' of https://github.com/VedaWebProject/Tekst

Author: bkis

Tekst-Web/i18n/ui/deDE.yml

@@ -966,6 +966,7 @@ admin:
     newPage: Neue Seite
     phSelectPage: Seite auswählen
     noPage: Bitte wählen Sie eine Info-Seite aus oder erstellen Sie eine neue!
+    editPage: Diese Seite bearbeiten
 
 search:
   quickSearch:

Tekst-Web/i18n/ui/enUS.yml

@@ -941,6 +941,7 @@ admin:
     newPage: New Page
     phSelectPage: Select page
     noPage: Please select an info page or create a new one!
+    editPage: Edit this page
 
 search:
   quickSearch:

Tekst-Web/src/components/browse/BrowseArchiveWidget.vue

@@ -40,16 +40,18 @@ function handleSubmit() {
 
 <template>
   <n-button
+    v-bind="$attrs"
+    circle
     secondary
     size="tiny"
+    color="var(--primary-color)"
     :focusable="false"
     :title="$t('contents.archive.widgetTip')"
     @click.stop.prevent="handleWidgetClick"
   >
     <template #icon>
       <n-icon :component="ArchiveIcon" />
     </template>
-    {{ $t('contents.archive.widgetTitle') }}
   </n-button>
 
   <generic-modal

Tekst-Web/src/components/content/TextAnnotationContent.vue

@@ -4,21 +4,21 @@ import CopyToClipboardButton from '@/components/generic/CopyToClipboardButton.vu
 import GenericModal from '@/components/generic/GenericModal.vue';
 import { $t } from '@/i18n';
 import {
-    CheckIcon,
-    ClearIcon,
-    ColorIcon,
-    ColorOffIcon,
-    CommentIcon,
-    CopyIcon,
-    LabelIcon,
+  CheckIcon,
+  ClearIcon,
+  ColorIcon,
+  ColorOffIcon,
+  CommentIcon,
+  CopyIcon,
+  LabelIcon,
 } from '@/icons';
 import { useBrowseStore, useStateStore, useThemeStore } from '@/stores';
 import {
-    getFullLocationLabel,
-    groupAndSortItems,
-    hashCode,
-    pickTranslation,
-    renderIcon,
+  getFullLocationLabel,
+  groupAndSortItems,
+  hashCode,
+  pickTranslation,
+  renderIcon,
 } from '@/utils';
 import { useClipboard, useStorage } from '@vueuse/core';
 import { adjustHue, saturate, toRgba, transparentize } from 'color2k';

Tekst-Web/src/components/resource/ResourceInfoTags.vue

@@ -2,13 +2,13 @@
 import type { AnyResourceRead } from '@/api';
 import { $t } from '@/i18n';
 import {
-    CommunityIcon,
-    LevelsIcon,
-    PatchIcon,
-    ProposedIcon,
-    PublicIcon,
-    PublicOffIcon,
-    ResourceIcon,
+  CommunityIcon,
+  LevelsIcon,
+  PatchIcon,
+  ProposedIcon,
+  PublicIcon,
+  PublicOffIcon,
+  ResourceIcon,
 } from '@/icons';
 import { useAuthStore, useResourcesStore, useStateStore } from '@/stores';
 import { pickTranslation } from '@/utils';

Tekst-Web/src/components/resource/ResourceListItem.vue

@@ -8,32 +8,32 @@ import ResourceInfoTags from '@/components/resource/ResourceInfoTags.vue';
 import env from '@/env';
 import { $t } from '@/i18n';
 import {
-    BookIcon,
-    CorrectionNoteIcon,
-    DeleteIcon,
-    DownloadIcon,
-    EditIcon,
-    MoreIcon,
-    PatchIcon,
-    ProposedIcon,
-    PublicIcon,
-    PublicOffIcon,
-    ReviewIcon,
-    SettingsIcon,
-    UnproposedIcon,
-    UploadIcon,
-    UserIcon,
+  BookIcon,
+  CorrectionNoteIcon,
+  DeleteIcon,
+  DownloadIcon,
+  EditIcon,
+  MoreIcon,
+  PatchIcon,
+  ProposedIcon,
+  PublicIcon,
+  PublicOffIcon,
+  ReviewIcon,
+  SettingsIcon,
+  UnproposedIcon,
+  UploadIcon,
+  UserIcon,
 } from '@/icons';
 import { useResourcesStore, useStateStore } from '@/stores';
 import { pickTranslation, renderIcon } from '@/utils';
 import {
-    NBadge,
-    NButton,
-    NCollapseItem,
-    NFlex,
-    NIcon,
-    type ButtonType,
-    type DropdownOption,
+  NBadge,
+  NButton,
+  NCollapseItem,
+  NFlex,
+  NIcon,
+  type ButtonType,
+  type DropdownOption,
 } from 'naive-ui';
 import { computed, ref } from 'vue';
 import { useRouter } from 'vue-router';
@@ -229,8 +229,7 @@ const actionOptions = computed<DropdownOption[]>(() => [
                       resources.all
                         .find((r) => r.id === props.resource.patchFor)
                         ?.ownerIds.includes(props.user.id) ||
-                      !resources.all.find((r) => r.id === props.resource.patchFor)?.ownerIds
-                        .length,
+                      !resources.all.find((r) => r.id === props.resource.patchFor)?.ownerIds.length,
                     action: () => emit('reqPatchIntegrationClick', props.resource),
                     statusType: 'success',
                   },

Tekst-Web/src/views/BrowseView.vue

@@ -129,6 +129,7 @@ onMounted(() => {
   <icon-heading v-if="!!browse.locationPath.length" level="1" :icon="BookIcon">
     <location-label />
     <help-button-widget help-key="browseView" data-tour-key="helpButtons" />
+    <browse-archive-widget :default="archiveTs" @submit="handleArchiveToggle" />
   </icon-heading>
 
   <n-flex class="my-lg">
@@ -140,7 +141,6 @@ onMounted(() => {
       :text-slug="state.textSlug || undefined"
       :explode="state.pf?.state.showLocationAliases"
     />
-    <browse-archive-widget :default="archiveTs" @submit="handleArchiveToggle" />
   </n-flex>
 
   <browse-toolbar v-if="browse.locationPath.length" />

Tekst-Web/src/views/ContentsView.vue

@@ -121,8 +121,7 @@ const compareResourceOptions = computed(() =>
     .filter((r) => r.id !== resource.value?.id && r.level === resource.value?.level)
     .sort(
       (a, b) =>
-        (a.patchFor === resource.value?.id ? 1 : 0) +
-        (b.patchFor === resource.value?.id ? 1 : 0)
+        (a.patchFor === resource.value?.id ? 1 : 0) + (b.patchFor === resource.value?.id ? 1 : 0)
     )
     .map((r) => ({
       label: pickTranslation(r.title, state.locale),

Tekst-Web/src/views/InfoPageView.vue

@@ -3,8 +3,9 @@ import type { ClientSegmentRead } from '@/api';
 import HydratedHtml from '@/components/generic/HydratedHtml.vue';
 import IconHeading from '@/components/generic/IconHeading.vue';
 import { usePlatformData } from '@/composables/platformData';
-import { useStateStore } from '@/stores';
-import { NSpin } from 'naive-ui';
+import { EditIcon } from '@/icons';
+import { useAuthStore, useStateStore } from '@/stores';
+import { NButton, NIcon, NSpin } from 'naive-ui';
 import { ref, watchEffect, type Component } from 'vue';
 import { useRouter } from 'vue-router';
 
@@ -14,12 +15,17 @@ const props = defineProps<{
 }>();
 
 const state = useStateStore();
+const auth = useAuthStore();
 const loading = ref(false);
 const { getSegment } = usePlatformData();
 const router = useRouter();
 
 const page = ref<ClientSegmentRead>();
 
+function handleEditClick() {
+  router.push({ name: 'adminInfoPages', hash: page.value ? `#page=${page.value.id}` : undefined });
+}
+
 watchEffect(async () => {
   loading.value = true;
   page.value = await getSegment(props.pageKey, state.locale);
@@ -35,6 +41,18 @@ watchEffect(async () => {
   <template v-else-if="page">
     <icon-heading v-if="page.title" level="1" :icon="icon">
       {{ page.title }}
+      <n-button
+        v-if="!!auth.user?.isSuperuser"
+        circle
+        quaternary
+        size="small"
+        :title="$t('admin.infoPages.editPage')"
+        @click="handleEditClick"
+      >
+        <template #icon>
+          <n-icon :component="EditIcon" />
+        </template>
+      </n-button>
     </icon-heading>
     <div class="content-block" style="padding: 1.2rem">
       <hydrated-html :html="page.html" />

Tekst-Web/src/views/ResourcesView.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import {
-    DELETE,
-    downloadData,
-    GET,
-    PATCH,
-    POST,
-    withSelectedFile,
-    type AnyResourceRead,
+  DELETE,
+  downloadData,
+  GET,
+  PATCH,
+  POST,
+  withSelectedFile,
+  type AnyResourceRead,
 } from '@/api';
 import { commonDialogOptions } from '@/common';
 import ButtonShelf from '@/components/generic/ButtonShelf.vue';
@@ -21,11 +21,11 @@ import { useTasks } from '@/composables/tasks';
 import { $t } from '@/i18n';
 import { AddIcon, JumpBackIcon, NoContentIcon, ResourceIcon, SearchIcon, UserIcon } from '@/icons';
 import {
-    useAuthStore,
-    useBrowseStore,
-    useResourcesStore,
-    useStateStore,
-    useUserMessagesStore,
+  useAuthStore,
+  useBrowseStore,
+  useResourcesStore,
+  useStateStore,
+  useUserMessagesStore,
 } from '@/stores';
 import { pickTranslation } from '@/utils';
 import { refDebounced, useUrlSearchParams } from '@vueuse/core';