diff --git a/js/src/common.scss b/js/src/common.scss index 4db69a4c1..7c0434564 100644 --- a/js/src/common.scss +++ b/js/src/common.scss @@ -147,6 +147,7 @@ a.list-item { .columns{ background: white; } +.setting-menu-item .router-link-active, .router-link-active{ - background-color: $background-color-darker; + background-color: $purple-1; } diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json index d03b83648..76d676bda 100644 --- a/js/src/i18n/en_US.json +++ b/js/src/i18n/en_US.json @@ -800,5 +800,6 @@ "Mobilizon is a federated software, meaning you can interact - depending on your admin's federation settings - with content from other instances, such as joining groups or events that were created elsewhere.": "Mobilizon is a federated software, meaning you can interact - depending on your admin federation settings - with content from other instances, such as joining groups or events that were created elsewhere.", "This instance, {instanceName} ({domain}), hosts your profile, so remember its name.": "This instance, {instanceName} ({domain}), hosts your profile, so remember its name.", "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:": "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:", - "Uploaded media size": "Uploaded media size" + "Uploaded media size": "Uploaded media size", + "chapril services description": "gather your Chapril tools in this place", } diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json index 1e52c9b99..46f0da0bf 100644 --- a/js/src/i18n/fr_FR.json +++ b/js/src/i18n/fr_FR.json @@ -888,5 +888,6 @@ "Mobilizon is a federated software, meaning you can interact - depending on your admin's federation settings - with content from other instances, such as joining groups or events that were created elsewhere.": "Mobilizon est un logiciel fédéré, ce qui signifie que vous pouvez interagir - en fonction des paramètres de fédération de votre administrateur·ice - avec du contenu d'autres instances, comme par exemple rejoindre des groupes ou des événements ayant été créés ailleurs.", "This instance, {instanceName} ({domain}), hosts your profile, so remember its name.": "Cette instance, {instanceName} ({domain}), héberge votre profil, donc notez bien son nom.", "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:": "Si l'on vous demande votre identité fédérée, elle est composée de votre nom d'utilisateur·ice et de votre instance. Par exemple, l'identité fédérée de votre premier profil est :", - "Uploaded media size": "Taille des médias téléversés" + "Uploaded media size": "Taille des médias téléversés", + "chapril services description": "utilisez les outils du Chapril pour votre groupe, et regroupez les liens dans cet espace de partage" } diff --git a/js/src/views/Resources/ResourceFolder.vue b/js/src/views/Resources/ResourceFolder.vue index 3c3b3972d..dfccc3d18 100644 --- a/js/src/views/Resources/ResourceFolder.vue +++ b/js/src/views/Resources/ResourceFolder.vue @@ -8,8 +8,8 @@ name: RouteName.GROUP, params: { preferredUsername: usernameWithDomain(resource.actor) }, }" - >{{ resource.actor.name }} + >{{ resource.actor.name }} +
  • {{ $t("Resources") }} + >{{ $t("Resources") }} +
  • {{ pathFragment }} + >{{ pathFragment }} +
  • - + + + @@ -67,6 +67,52 @@

    {{ $t("A place to store links to documents or resources of any type.") }}

    +
    +

    Services Chapril

    +

    + {{ $t("chapril services descriptions") }} +

    + +
    +
    @@ -83,8 +129,8 @@ icon-right="delete" size="is-small" @click="deleteMultipleResources" - >{{ $t("Delete") }} + >{{ $t("Delete") }} +
    @@ -205,12 +251,12 @@ import { RefetchQueryDescription } from "apollo-client/core/watchQueryOptions"; import { CURRENT_ACTOR_CLIENT } from "../../graphql/actor"; import { IActor, usernameWithDomain } from "../../types/actor"; import RouteName from "../../router/name"; -import { IResource, mapServiceTypeToIcon, IProvider } from "../../types/resource"; +import { IProvider, IResource, mapServiceTypeToIcon } from "../../types/resource"; import { CREATE_RESOURCE, DELETE_RESOURCE, - PREVIEW_RESOURCE_LINK, GET_RESOURCE, + PREVIEW_RESOURCE_LINK, UPDATE_RESOURCE, } from "../../graphql/resources"; import { CONFIG } from "../../graphql/config"; @@ -612,4 +658,7 @@ nav.breadcrumb ul { opacity: 1; } } +.services-chapril ul { + list-style-type: none; +}