potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'add-back-feeds-on-public-group-page' into 'master'

Browse source 
Add back RSS/ical links on public group pages

Closes #782

See merge request framasoft/mobilizon!989
This commit is contained in:
Thomas Citharel 2021-07-21 10:23:22 +00:00
parent c6098b33e3 3d9ed58fa4
commit aa81d7952c
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/src/i18n/en_US.json
View file

@ -1063,5 +1063,9 @@
"Ask your instance admin to {enable_feature}.": "Ask your instance admin to {enable_feature}.", "Ask your instance admin to {enable_feature}.": "Ask your instance admin to {enable_feature}.",
"Event URL": "Event URL", "Event URL": "Event URL",
"Copy URL to clipboard": "Copy URL to clipboard", "Copy URL to clipboard": "Copy URL to clipboard",
"Group URL": "Group URL" "Group URL": "Group URL",
"View less": "View less",
"View more": "View more",
"Breadcrumbs": "Breadcrumbs",
"Other actions": "Other actions"
} }

6
js/src/i18n/fr_FR.json
View file

@ -1154,5 +1154,9 @@
"Ask your instance admin to {enable_feature}.": "Demandez à l'administrateur⋅ice de votre instance d'{enable_feature}.", "Ask your instance admin to {enable_feature}.": "Demandez à l'administrateur⋅ice de votre instance d'{enable_feature}.",
"Event URL": "URL de l'événement", "Event URL": "URL de l'événement",
"Copy URL to clipboard": "Copier l'URL dans le presse-papiers", "Copy URL to clipboard": "Copier l'URL dans le presse-papiers",
"Group URL": "URL du groupe" "Group URL": "URL du groupe",
"View less": "Voir moins",
"View more": "Voir plus",
"Breadcrumbs": "Fil d'Ariane",
"Other actions": "Autres actions"
} }

13
js/src/views/Group/Group.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div class="container is-widescreen"> <div class="container is-widescreen">
<div class="header"> <div class="header">
<nav class="breadcrumb" aria-label="breadcrumbs"> <nav class="breadcrumb" :aria-label="$t('Breadcrumbs')">
<ul> <ul>
<li> <li>
<router-link :to="{ name: RouteName.MY_GROUPS }">{{ <router-link :to="{ name: RouteName.MY_GROUPS }">{{
@ -10,6 +10,7 @@
</li> </li>
<li class="is-active"> <li class="is-active">
<router-link <router-link
aria-current-value="location"
v-if="group && group.preferredUsername" v-if="group && group.preferredUsername"
:to="{ :to="{
name: RouteName.GROUP, name: RouteName.GROUP,
@ -172,7 +173,6 @@
</b-button> </b-button>
<b-dropdown <b-dropdown
class="menu-dropdown" class="menu-dropdown"
v-if="isCurrentActorAGroupMember || previewPublic"
position="is-bottom-left" position="is-bottom-left"
aria-role="menu" aria-role="menu"
> >
@ -181,15 +181,18 @@
outlined outlined
role="button" role="button"
icon-left="dots-horizontal" icon-left="dots-horizontal"
aria-label="Other actions" :aria-label="$t('Other actions')"
/> />
<b-dropdown-item aria-role="menuitem"> <b-dropdown-item
aria-role="menuitem"
v-if="isCurrentActorAGroupMember || previewPublic"
>
<b-switch v-model="previewPublic">{{ <b-switch v-model="previewPublic">{{
$t("Public preview") $t("Public preview")
}}</b-switch> }}</b-switch>
</b-dropdown-item> </b-dropdown-item>
<b-dropdown-item <b-dropdown-item
v-if="!previewPublic" v-if="!previewPublic && isCurrentActorAGroupMember"
aria-role="menuitem" aria-role="menuitem"
@click="triggerShare()" @click="triggerShare()"
> >