Commit 126da53b authored by spf's avatar spf
Browse files

Merge branch 'en-entreelibre' into 'master'

[EN] améliorations contribatelier entrée libre

See merge request !63
parents d2cca27e efff4e39
Pipeline #437616 passed with stage
in 12 seconds
......@@ -2,7 +2,7 @@
Chaque événement possède un bouton **Actions**. Les options dépendent de vos permissions sur cet événement.
## Partage l'événement
## Partager l'événement
!!! note
Cette action est disponible pour tout le monde.
......@@ -11,10 +11,10 @@ Pour partager un événement vous devez :
1. aller sur sa page et cliquer sur le bouton **Actions <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z" />
</svg>**&nbsp;:
</svg>**
* cliquer sur **Partager l'événement** <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M21,12L14,5V9C7,10 4,15 3,20C5.5,16.5 9,14.9 14,14.9V19L21,12Z" /></svg>
* cliqier sur <svg style="width:24px;height:24px" viewBox="0 0 24 24">
* cliquer sur <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M19,20H5V4H7V7H17V4H19M12,2A1,1 0 0,1 13,3A1,1 0 0,1 12,4A1,1 0 0,1 11,3A1,1 0 0,1 12,2M19,2H14.82C14.4,0.84 13.3,0 12,0C10.7,0 9.6,0.84 9.18,2H5A2,2 0 0,0 3,4V20A2,2 0 0,0 5,22H19A2,2 0 0,0 21,20V4A2,2 0 0,0 19,2Z" />
</svg> pour copier le lien vers l'événement ou sur l'icône de la plateforme sur laquelle vous souhaitez le partager
......
......@@ -24,7 +24,7 @@ Les groupes sont des espaces de coordination et de préparation. Ils peuvent êt
### Public
=== "Comment faire"
Vous pouvez accéder aux paramètres de votre compte en&nbsp;:
Vous pouvez accéder aux paramètres de votre groupe en&nbsp;:
1. cliquant sur **Mes groupes** dans le menu supérieur
* cliquant sur le groupe souhaité
......@@ -40,6 +40,7 @@ Les groupes sont des espaces de coordination et de préparation. Ils peuvent êt
* **Inviter des nouveaux·elles membres manuellement**&nbsp;: la seule manière pour votre groupe d'obtenir de nouveaux·elles membres sera si un·e administrateur·ice les invite.
* approuver manuellement les nouvelles demandes de suivis (les abonnée⋅s recevront les nouveaux événements et billets publics)
* ajouter l'**adresse du groupe**
* supprimer le groupe
=== "Capture d'écran"
![modification des paramètres du groupe](../../images/group-creation-settings-FR.png)
......
# Gérer les invitations dans un groupe
# Invitations
## Gérer les invitations dans un groupe
Pour inviter quelqu'un à votre groupe vous devez&nbsp;:
......
docs/images/en/event-share-EN.png

5.97 KB | W: | H:

docs/images/en/event-share-EN.png

6.81 KB | W: | H:

docs/images/en/event-share-EN.png
docs/images/en/event-share-EN.png
docs/images/en/event-share-EN.png
docs/images/en/event-share-EN.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -2,24 +2,37 @@
Every event has an **Actions** button. Options depend on your permissions.
## Share
## Share this event
!!! note
This action is available for everyone
To share or add an event to your calendar, click the **Actions <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z" />
</svg>** button.
To share an event, you have to:
* **Share this event** <svg style="width:24px;height:24px" viewBox="0 0 24 24">
1. go to its page and click the **Actions <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z" />
</svg>** button
* click **Share this event** <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M21,12L14,5V9C7,10 4,15 3,20C5.5,16.5 9,14.9 14,14.9V19L21,12Z" />
</svg> to share it on your social media network or email:
![share modal image](../../images/en/event-share-EN.png)
* **Add to my calendar <svg style="width:24px;height:24px" viewBox="0 0 24 24">
</svg> to share it on your social media network or email
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M19,20H5V4H7V7H17V4H19M12,2A1,1 0 0,1 13,3A1,1 0 0,1 12,4A1,1 0 0,1 11,3A1,1 0 0,1 12,2M19,2H14.82C14.4,0.84 13.3,0 12,0C10.7,0 9.6,0.84 9.18,2H5A2,2 0 0,0 3,4V20A2,2 0 0,0 5,22H19A2,2 0 0,0 21,20V4A2,2 0 0,0 19,2Z" />
</svg> icon to copy the link or select one social media icon to share with
![share modal image](../../images/en/event-share-EN.png)
## Add to my calendar
You can add `.ics` file to your calendar software (Thunderbird for example). To do so, you have to:
1. click **Add to my calendar <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M19 19V8H5V19H19M16 1H18V3H19C20.11 3 21 3.9 21 5V19C21 20.11 20.11 21 19 21H5C3.89 21 3 20.1 3 19V5C3 3.89 3.89 3 5 3H6V1H8V3H16V1M11 9.5H13V12.5H16V14.5H13V17.5H11V14.5H8V12.5H11V9.5Z" />
</svg>** lets you add the `.ics` file in to your calendar software (Thunderbird for example):
</svg>** button
* click **Open with**
* click **OK** button
![share ics modal image](../../images/en/event-share-ics-EN.png)
![share ics modal image](../../images/en/event-share-ics-EN.png)
## Report
......@@ -42,3 +55,17 @@ To **Edit**, **Duplicate** or **Delete** your event, click the **Actions <svg st
* **Edit**: see [Create an event](create-events.md)
* **Duplicate** will open a new event pre-filled with the settings from the current event
* **Delete** will delete your event
## Delete
!!! note
You must have correct the permission to see these actions (admin/moderator)
To delete an event, you have to:
1. click **Actions** button in its page
* click **Delete** button
* fill the field with your event name to confirm
* click red **Delete** button
![delete event popup](../../images/en/delete-event-EN.png)
......@@ -21,6 +21,8 @@
## Settings
### Public
=== "How to"
You can access your group settings by:
......@@ -28,7 +30,7 @@
* clicking the relevant group in the list
* clicking the **Group settings** button in your group banner
In this section you can edit information the was added during the group creation (see above), like group name, description, avatar and banner. You also can:
In this section you can edit information that was added during the group creation (see above), like group name, description, avatar and banner. You also can:
* change **Group visibility**:
* **Visible everywhere on the web**: the group will be publicly listed in search results and may be suggested in the explore section. Only public information will be shown on its page.
......@@ -37,6 +39,17 @@
* **Anyone can join freely**: anyone wanting to be a member of your group will be able to from your group page
* **Manually invite new members**: the only way for your group to get new members is if an admininistrator invites them
* add **Group address** (location)
* manually approved new followers (followers will receive new public events and posts)
* add group address
* delete the group
=== "Screenshot"
![creation settings img](../../images/en/group-creation-settings-EN.png)
### Members
This section allows you to [manage roles](../roles-group).
### Followers
This section allows you to [manage group followers](../group-manage-followers).
......@@ -7,7 +7,7 @@ To invite accounts to your group, you have to:
1. click the **My groups** button on the top bar menu
* click the group you want to invite people to in the list
* click the **Add / Remove…** link in your group banner
* enter the new member ID in the **Invite a new member** field
* enter the new member ID in the **Invite a new member** field (e.g: `someone@instance.org`)
* click the **Invite member** button
The invited account will receive an email notification if [notifications are activated](../../users/account-settings/#email-notifications).
......
......@@ -14,13 +14,13 @@
\* who created the discussion
![](../../images/en/group-members-list-EN.png)
When a person is invited and accepts this invitation to join your group, she is, by default, *only* a **member**.
!!! note
When a person is invited and accepts this invitation to join your group, she is, by default, *only* a **member**.
## Promote
![](../../images/en/group-members-list-EN.png)
You can promote an account to **moderator** or **administrator** by:
1. clicking the **My groups** button on the top bar menu
......
......@@ -13,11 +13,13 @@ Once you've found an instance that suits you, click the **Sign up** button on th
* check the **I agree the instance rules and terms of service** box (**after** reading them of course ;) )
* click the **Register** button.
At this point you will receive an email with a link to activate your account. If you don't, click the **Didn't receive the instructions?** link.
=== "Screenshot"
![sign up page](../../images/en/rose-register-EN.png)
!!! note
At this point you will receive an email with a link to activate your account. If you don't, click the **Didn't receive the instructions?** link.
Once your account activated, you have to click **Log in** button.
## Activation
......@@ -40,6 +42,8 @@ Once you've found an instance that suits you, click the **Sign up** button on th
Mobilizon uses your time zone to make sure you get notifications for an event at the correct time. If the detected time zone isn't correct, you can change it by clicking the **Manage my settings** button.
You always can change this parameter in [your account preferences](../account-settings/#preferences).
**Participation notifications**
Mobilizon will send you an email when the events you are attending have important changes: date and time, address, confirmation or cancellation, etc. If you don't want those notifications: uncheck the **Notification on the day of the event** box.
......
......@@ -53,7 +53,36 @@ You can choose the language of your Mobilizon interface and your timezone. To do
* click the **Preferences** tab on left sidebar
* change the language or/and the time zone.
## Email notifications
## notifications
Here, you have the choice to receive (or not) notifications. To do so, you have to:
1. click your profile picture
* click **My account**
* click **Notifications** from the left sidebar
### Browser notifications
With push notifications, you can view the most important notifications of your Mobilizon account activity in your browser. You don't even have to be logged in to Mobilizon for these notifications to appear. To enable this notification system, simply click on the **<svg style="width:24px;height:24px" viewBox="0 -5 24 24">
<path fill="currentColor" d="M6.18,15.64A2.18,2.18 0 0,1 8.36,17.82C8.36,19 7.38,20 6.18,20C5,20 4,19 4,17.82A2.18,2.18 0 0,1 6.18,15.64M4,4.44A15.56,15.56 0 0,1 19.56,20H16.73A12.73,12.73 0 0,0 4,7.27V4.44M4,10.1A9.9,9.9 0 0,1 13.9,20H11.07A7.07,7.07 0 0,0 4,12.93V10.1Z" />
</svg> Activate browser push notifications** button in the browser.
### Notification settings
Control what you want to be notified by email or/and push:
![](../../images/en/mobilizon-notifications-check-EN.png)
If you choose to receive email notifications, you can set the frequency:
* Do not receive any mail
* Receive one email for each activity
* Hourly email summary
* Daily email summary
* Weekly email summary
!!! note
Announcements and mentions notifications are always sent straight away.
### Participation notifications
......@@ -75,3 +104,8 @@ As an organizer you can receive notifications for manually approved participatio
* Receive one email per request
* Hourly email summary
* Daily email summary
* Weekly email summary
### Personal feeds
These RSS/Atom and ICS/WebCal feeds contain event data for the events for which any of your profiles is a participant or creator. You should keep these private. You can find feeds for specific profiles on each profile edition page.
......@@ -16,3 +16,6 @@ From now on, you can participate in an event, or create one, with one or another
!!! note
You can switch between your different identities from the top bar by clicking your avatar. By default, the one displayed on the top sidebar is the one selected for your actions.
!!! note
You have to refresh the page to see your new profile picture.
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