Verified Commit d42e8661 authored by Eliot Berriot's avatar Eliot Berriot 💬

Updated guides to Loomio

parent a3201522
Pipeline #3730 passed with stages
in 3 minutes and 17 seconds
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -4,9 +4,7 @@
<li>
<router-link to="/">
<icon name="arrow-left"></icon>
<translate translate-context="Sidebar link">
Return home
</translate>
<translate translate-context="Sidebar link">Return home</translate>
</router-link>
</li>
</ul>
......@@ -14,110 +12,99 @@
<div class="field">
<div class="label">
<icon name="clock-o"></icon>&nbsp;
<translate translate-context="Sidebar label">
Duration:
</translate>
<translate translate-context="Sidebar label">Duration:</translate>
</div>
<div class="value">
<template v-if="metadata.duration === 5">
<translate translate-context="Task duration" :key="metadata.duration">
5 minutes
</translate>
<translate translate-context="Task duration" :key="metadata.duration">5 minutes</translate>
</template>
<template v-else-if="metadata.duration === 15">
<translate translate-context="Task duration" :key="metadata.duration">
15 minutes
</translate>
<translate translate-context="Task duration" :key="metadata.duration">15 minutes</translate>
</template>
<template v-else-if="metadata.duration === 30">
<translate translate-context="Task duration" :key="metadata.duration">
30 minutes
</translate>
<translate translate-context="Task duration" :key="metadata.duration">30 minutes</translate>
</template>
<template v-else-if="metadata.duration === 60">
<translate translate-context="Task duration" :key="metadata.duration">
One hour
</translate>
<translate translate-context="Task duration" :key="metadata.duration">One hour</translate>
</template>
<template v-else-if="metadata.duration === 120">
<translate translate-context="Task duration" :key="metadata.duration">
2 hours
</translate>
<translate translate-context="Task duration" :key="metadata.duration">2 hours</translate>
</template>
<template v-else-if="metadata.duration === 9999">
<translate translate-context="Task duration" :key="metadata.duration">
More than two hours
</translate>
<translate translate-context="Task duration" :key="metadata.duration">More than two hours</translate>
</template>
</div>
</div>
<div class="field skills" v-if="metadata.skills && metadata.skills.length > 0 ">
<div class="label">
<icon name="wrench"></icon>&nbsp;
<translate translate-context="Sidebar label">
Required skills:
</translate>
<translate translate-context="Sidebar label">Required skills:</translate>
</div>
<div class="value">
<ul>
<li v-for="skill in metadata.skills" :key="skill.name" :title="skill.summary">
{{ skill.name }} <icon class="right floated" name="question-circle-o"></icon>
{{ skill.name }}
<icon class="right floated" name="question-circle-o"></icon>
</li>
</ul>
</div>
</div>
<hr>
<p class="menu-label">
<translate translate-context="Sidebar label">
Steps
</translate>
<translate translate-context="Sidebar label">Steps</translate>
</p>
<ul class="menu-list">
<li v-for="(step, i) in metadata.steps" :key="step.title">
<a
@click.prevent="$emit('step-changed', i + 1)"
:href="'#step-' + (i + 1)"
:class="[{'is-active': current === 'step-' + (i + 1)}]">
{{ i+1 }}. {{ step.title }}</a>
:class="[{'is-active': current === 'step-' + (i + 1)}]"
>{{ i+1 }}. {{ step.title }}</a>
</li>
</ul>
<hr>
<p class="menu-label">
<translate translate-context="Sidebar label">
Do you need some help?
</translate>
<translate translate-context="Sidebar label">Do you need some help?</translate>
</p>
<ul class="menu-list">
<li>
<a rel="noopener noreferrer" href="https://matrix.to/#/!SwDTmjceJHHroSEIPP:matrix.org" target="_blank">
<a
rel="noopener noreferrer"
href="https://matrix.to/#/!SwDTmjceJHHroSEIPP:matrix.org"
target="_blank"
>
<icon name="matrix-org"></icon>
<translate translate-context="Sidebar link to get help">
Chat with us on #Funkwhale:Matrix.org
</translate>
<translate
translate-context="Sidebar link to get help"
>Chat with us on #Funkwhale:Matrix.org</translate>
</a>
</li>
<li>
<a rel="noopener noreferrer" href="https://socialhub.network/c/funkwhale/support" target="_blank">
<a
rel="noopener noreferrer"
href="https://governance.funkwhale.audio/g/246YOJ1m/funkwhale-support"
target="_blank"
>
<icon name="comment"></icon>
<translate translate-context="Sidebar link to get help">
Ask your question on Socialhub.network
</translate>
<translate translate-context="Sidebar link to get help">Ask your question on Loomio</translate>
</a>
</li>
<li>
<a rel="noopener noreferrer" href="https://mastodon.eliotberriot.com/@funkwhale" target="_blank">
<a
rel="noopener noreferrer"
href="https://mastodon.eliotberriot.com/@funkwhale"
target="_blank"
>
<icon name="mastodon"></icon>
<translate translate-context="Sidebar link to get help">
Drop us a toot on Mastodon
</translate>
<translate translate-context="Sidebar link to get help">Drop us a toot on Mastodon</translate>
</a>
</li>
</ul>
<hr class="small hidden">
<p>
<translate translate-context="Sidebar text to get help">
Include a link to this page and the number of the step that's giving you trouble.
</translate>
<translate
translate-context="Sidebar text to get help"
>Include a link to this page and the number of the step that's giving you trouble.</translate>
</p>
</aside>
</template>
......@@ -129,7 +116,8 @@ export default {
</script>
<style lang="scss" scoped>
.field {
.label, .value {
.label,
.value {
display: inline;
}
&.skills ul {
......
......@@ -119,7 +119,7 @@ export function getTasks (v) {
{
icon: 'comment',
text: v.$pgettext("Text for link in guide step", 'Share your feedback on Discourse (forum)'),
to: {name: 'guide', params: {slug: 'discourse-account'}},
to: {name: 'guide', params: {slug: 'loomio-account'}},
},
{
icon: 'mastodon',
......@@ -159,45 +159,23 @@ export function getTasks (v) {
summary: v.$pgettext("Task summary", 'Help the Funkwhale whale go in the right direction.'),
steps: [
{
title: v.$pgettext("Guide step title", 'Create your Discourse account'),
content: [v.$pgettext("Guide step content", 'Project discussions take place at SocialHub.network, which uses Discourse. Browse without an account, and get one to stop people from being wrong on the Internet.'),],
title: v.$pgettext("Guide step title", 'Create your Loomio account'),
content: [v.$pgettext("Guide step content", 'Project discussions take place at governance.funkwhale.audio, which uses Loomio. Browse without an account, or get one to contribute to the discussions.'),],
links: [
{
icon: 'comment',
text: v.$pgettext("Text for link in guide step", 'Create your Discourse account'),
to: {name: 'guide', params: {slug: 'discourse-account'}},
text: v.$pgettext("Text for link in guide step", 'Create your Loomio account'),
to: {name: 'guide', params: {slug: 'loomio-account'}},
}
]
},
{
title: v.$pgettext("Guide step title", 'Visit the Funkwhale section'),
content: [v.$pgettext("Guide step content", 'Since we share the forum with other projects, visit the /c/funkwhale part the forum.'),],
title: v.$pgettext("Guide step title", 'Read the Code of Conduct'),
content: [v.$pgettext("Guide step content", 'Our Code of Conduct applies to all the community spaces, including Loomio.'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Go to the "Funkwhale" section'),
url: 'https://socialhub.network/c/funkwhale',
}
],
media: [
{
type: 'image',
url: '/assets/guides/join-discussion/top-categories-widget.png',
caption: v.$pgettext("Task image caption", 'A list of top-level categories is to be found on the homepage')
},
{
type: 'image',
url: '/assets/guides/join-discussion/menu-categories.png',
caption: v.$pgettext("Task image caption", 'Navigation between the categories using the corresponding menu is also possible')
},
]
},
{
title: v.$pgettext("Guide step title", 'Read the forum guidelines'),
content: [v.$pgettext("Guide step content", 'We know you don\'t read forum guidelines. Ours are not the reason you don\'t.'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Read the forum guidelines'),
url: 'https://socialhub.network/t/read-this-before-posting/27',
text: v.$pgettext("Text for link in guide step", 'Read the Code of Conduct'),
url: 'https://funkwhale.audio/code-of-conduct/',
}
],
},
......@@ -207,7 +185,7 @@ export function getTasks (v) {
links: [
{
text: v.$pgettext("Text for link in guide step", 'New posts from the forum'),
url: 'https://socialhub.network/c/funkwhale/l/latest',
url: 'https://governance.funkwhale.audio/g/kQgxNq15/funkwhale',
}
],
}
......@@ -523,55 +501,55 @@ export function getTasks (v) {
]
},
{
name: v.$pgettext('Task name', "Create a Discourse account"),
name: v.$pgettext('Task name', "Create a Loomio account"),
icon: "comment",
duration: 5,
unlisted: true,
slug: 'discourse-account',
summary: v.$pgettext("Task summary", "Create your Discourse account on socialhub.network to start discussing with the Funkwhale community."),
slug: 'loomio-account',
summary: v.$pgettext("Task summary", "Create your Loomio account on governance.funkwhale.audio to start discussing with the Funkwhale community."),
steps: [
{
title: v.$pgettext("Guide step title", 'Create your account on socialhub.network'),
content: [v.$pgettext("Guide step content", 'Our forum runs on Discourse, hosted at socialhub.network. It is shared with other projects such as Prismo and PixelFed. Click on the "Sign Up" button in the top bar and fill in your info.'),],
title: v.$pgettext("Guide step title", 'Create your account on governance.funkwhale.audio'),
content: [v.$pgettext("Guide step content", 'Our forum runs on Loomio, hosted at governance.funkwhale.audio. Click on the "Sign Up" button in the top bar and fill in your info.'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Signup on socialhub.network'),
url: 'https://socialhub.network/signup',
text: v.$pgettext("Text for link in guide step", 'Signup on governance.funkwhale.audio'),
url: 'https://governance.funkwhale.audio/dashboard',
},
],
media: [
{
type: 'image',
url: '/assets/guides/discourse-account/signup-button.png',
caption: v.$pgettext("Task image caption", 'The Sign Up button is located in the top bar')
url: '/assets/guides/loomio-account/signup-modal-1.png',
caption: v.$pgettext("Task image caption", 'The Sign Up modal will ask for your email address')
},
{
type: 'image',
url: '/assets/guides/discourse-account/signup-form.png',
caption: v.$pgettext("Task image caption", 'Sign-up form')
url: '/assets/guides/loomio-account/signup-modal-2.png',
caption: v.$pgettext("Task image caption", 'Then, the Sign Up modal will ask for your username')
},
]
},
{
title: v.$pgettext("Guide step title", 'Verify your e-mail address'),
content: [v.$pgettext("Guide step content", "Shortly after signup, you should receive a confirmation e-mail containing an activation link. Click it to activate your account. Request another one if you did not receive the e-mail within a few minutes."),],
title: v.$pgettext("Guide step title", 'Verify your e-mail inbox'),
content: [v.$pgettext("Guide step content", "Shortly after signup, you should receive a confirmation e-mail containing a login link. Click it to log into your account. Request another one if you did not receive the e-mail within a few minutes."),],
},
{
title: v.$pgettext("Guide step title", 'Log in using your new account'),
content: [v.$pgettext("Guide step content", "Log in on your new account to ensure everything works properly."),],
title: v.$pgettext("Guide step title", 'Join the Funkwhale group'),
content: [v.$pgettext("Guide step content", 'Discussions on Loomio belong to groups. Join the Funkwhale group if you want to publish messages in that group.'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Login form'),
url: 'https://socialhub.network/login',
}
text: v.$pgettext("Text for link in guide step", 'Visit the Funkwhale Group page'),
url: 'https://governance.funkwhale.audio/g/kQgxNq15/funkwhale',
},
],
media: [
{
type: 'image',
url: '/assets/guides/discourse-account/login-form.png',
caption: v.$pgettext("Task image caption", 'Login form')
url: '/assets/guides/loomio-account/join-group.png',
caption: v.$pgettext("Task image caption", 'The "Join Group" button')
},
],
]
},
{
title: v.$pgettext("Guide step title", 'Customize your profile'),
......@@ -580,18 +558,18 @@ export function getTasks (v) {
links: [
{
text: v.$pgettext("Text for link in guide step", 'Profile form'),
url: 'https://socialhub.network/u/eliotberriot/preferences/account',
url: 'https://governance.funkwhale.audio/profile',
}
],
media: [
{
type: 'image',
url: '/assets/guides/discourse-account/user-dropdown.png',
url: '/assets/guides/loomio-account/user-dropdown.png',
caption: v.$pgettext("Task image caption", 'Settings dropdown to access the profile form')
},
{
type: 'image',
url: '/assets/guides/discourse-account/profile-form.png',
url: '/assets/guides/loomio-account/profile-form.png',
caption: v.$pgettext("Task image caption", 'The profile form')
},
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment