Merge branch 'develop' into feature/settings

.github/styles/config/vocabularies/Decidim/accept.txt

@@ -1,5 +1,16 @@
-[Dd]ecidim 
-moderations
-gamification
-favicon
-[Kk]akogawa
+Config
+CSV
+[Dd]ecidim
+[Ee]mail
+[Ff]aq
+[Ff]avicon
+[Gg]amification
+[Kk]akogawa
+[Mm]oderations
+[Nn]ickame
+[Oo]fficialization
+[Oo]fficializing
+[Oo]fficialize
+[Rr]eoffficialize
+[Uu]nreport
+[Uu]nhide

docs/en/modules/ROOT/nav.adoc

@@ -30,7 +30,7 @@
 *** xref:services:smtp.adoc[SMTP]
 *** xref:services:social_providers.adoc[Social Providers]
 
-* Admin
+* xref:admin:index.adoc[Admin]
 ** xref:admin:first_steps.adoc[First steps]
 ** xref:admin:settings.adoc[Settings]
 *** xref:admin:settings/configuration.adoc[Configuration]
@@ -40,14 +40,15 @@
 *** xref:admin:settings/areas.adoc[Areas]
 *** xref:admin:settings/help_sections.adoc[Help sections]
 *** xref:admin:settings/allowed_external_domains.adoc[Allowed external domains]
-** xref:admin:pages.adoc[Pages]
+** xref:admin:pages.adoc[Pages and Topics]
+*** xref:admin:pages/pages.adoc[Pages]
+*** xref:admin:pages/topics.adoc[Topics]
 ** xref:admin:participants.adoc[Participants]
 *** xref:admin:participants/admins.adoc[Admins]
 *** xref:admin:participants/groups.adoc[Groups]
 *** xref:admin:participants/participants.adoc[Participants]
 *** xref:admin:participants/impersonations.adoc[Impersonations]
 **** xref:admin:participants/verifications_conflicts.adoc[Verifications conflicts]
-*** xref:admin:participants/reported_users.adoc[Reported users]
 *** xref:admin:participants/authorizations.adoc[Authorizations]
 **** xref:admin:participants/authorizations/identity_documents.adoc[Identity documents]
 **** xref:admin:participants/authorizations/code_postal_letter.adoc[Code by postal letter]
@@ -133,6 +134,8 @@
 *** xref:admin:features/versions.adoc[Versions]
 ** xref:admin:newsletters.adoc[Newsletters]
 ** xref:admin:global_moderations.adoc[Global moderations]
+*** xref:admin:moderations/reported_users.adoc[Reported users]
+*** xref:admin:moderations/reported_content.adoc[Reported content]
 
 * xref:contribute:index.adoc[Contribute]
 ** xref:contribute:governance.adoc[Governance]

docs/en/modules/admin/pages/global_moderations.adoc

@@ -1,12 +1,12 @@
 = Global moderations
 
+== Understand the basics
+
 The *Global moderations* function allows you to moderate different kind of contents and
-ensure that the dialog in your platform is democratic and constructive. Making
-use of this function, administrators, collaborators and moderators of a space can
-hide the contents/contributions that have been reported, where the complaint is
-deemed appropriate, or delete the complaint.
+ensure that the dialog in your platform is democratic and constructive. 
+It also allows managing participants who infringe the rules of the platform.
 
-NOTE: Looking for how to report users? See xref:participants/reported_users.adoc[Reported users].
+NOTE: Looking for how to report participants or content? See xref:moderations/reported_users.adoc[Reported participants] and xref:moderations/reported_content.adoc[Reported content].
 
 For instance, in the case of https://www.decidim.barcelona/[Decidim Barcelona],
 the https://www.decidim.barcelona/pages/terms-and-conditions[Terms of Service] says:
@@ -35,87 +35,23 @@ offensive meaning or character;
 process and the framework for discussion, and
 > * to create multiple users by pretending to be different people (astroturfing).
 
-Anyone can propose a moderation in Decidim, through the "Flag" icon in the participant
-profile. After a participant has clicked in this action then they need to provide a
-reason why they are making this report:
-
-* Contains clickbait, advertising, scams or script bots.
-* Contains racism, sexism, slurs, personal attacks, death threats, suicide requests or any form of hate speech.
-* Contains illegal activity, suicide threats, personal information, or something else you think doesn't belong on [This organization].
-
-Participants can also add extra information regarding their report.
-
-image:moderation_modal.png[Give reason for moderation modal]
-
-After a participant has reported a content, it'll be shown in two sections of the
-administration panel:
-
-* Global moderations panel
-* Participatory space moderation panel
-
-To go to the Global moderations panel, you need to:
-
-. Sign in as administrator
-. Go to administration panel
-. Click in Global moderations in the sidebar
-
-There you'll find first all the unprocessed reports if there's any:
-
-image:global_moderations_list_unhidden.png[Show all the moderated content list]
-
-It's also possible to filter by the type of content that was moderated and the
-state of the reported content (if it was hidden or not).
-
-* *Id*: unique identificator of the reported content.
-* *Type*: which kind of content it was reported, for instance a *Proposal* or a *Comment*.
-* *Participatory Space*: which space this content belongs to.
-* *Count*: Number of times it has been reported by different users.
-* *Reported content URL*: link for seeing the content reported and see the context of the complaint.
-* *Reports*: why it has been reported. If the participant that made the report has given extra
-information it's possible to see it by hovering it.
-* *Creation date*: when it was originally reported.
-* *Actions*: you can *Expand*, *Unreport* or *Hide*.
-
-== Actions (when the report wasn't accepted yet)
-
-|===
-|Icon |Name |Definition
-
-|image:action_expand.png[Expand icon]
-|Expand
-|To see the full metadata of the reported content.
-
-|image:action_hide.png[Hide icon]
-|Hide
-|Allows an admin or moderator to hide this content (accepting the report).
-
-|image:action_unreport.png[Unreport icon]
-|Unreport
-|Allows an admin or moderator to keep showing this content (rejecting the report).
-|===
+== Configuration
 
-== Actions (after the content is hidden)
+To access the Global moderations panel, go in the administration panel and click in the "Global moderations" item in 
+the administrator navigation bar.
 
-|===
-|Icon |Name |Definition
+image::moderations/moderations_menu.png[Global moderations menu]
 
-|image:action_expand.png[Expand icon]
-|Expand
-|To see the full metadata of the reported content.
+The Global moderations panel allows to manage reported contents as well as reported participants. 
 
-|image:action_unhide.png[Unhide icon]
-|Unhide
-|Allows an admin or moderator to unhide this content (showing it publicly again).
-|===
+image:moderations/moderations_backend_list_content.png[Global moderations panel for content]
 
-If the report was "Unreported" and it was a mistake, meaning that for instance the
-content was spam but it was a mistake not accepting the report, then you'll need
-to find that again in the public view and report it yourself so you can moderate it.
+== Examples
 
-== Expand
+=== Report content
 
-To see all the metadata of a report, you can see it Expanded.
+You can report and hide a comment containing private information, or a link to a commercial platform posted by a user. 
 
-image:global_moderations_report01.png[Expanded moderation 01]
+=== Report user
 
-image:global_moderations_report02.png[Expanded moderation 02]
+You can report and block participants who are constantly violating the participation chart, or spamming and trolling the platform. 

docs/en/modules/admin/pages/index.adoc

@@ -1,27 +1,55 @@
 = Introduction
 
-Deploying Decidim means taking account of all the activities that play a part in the configuration of the platform and the deployment of the participatory processes. Acquiring knowledge in administering Decidim enables control over fundamental matters such as:
+== Understand the basics
 
-* configuring a participatory process
-* activating a consultation and receiving votes
-* moderating the platform
-* managing associated legal texts (as the privacy policy)
-* managing authorization from the administrators
-* monitoring and verifying organizations
+Deploying Decidim means taking account of all the activities that play a part in the configuration of the platform and the deployment 
+of the participatory processes. Acquiring knowledge in administering Decidim enables control over fundamental matters such as:
 
-None of these aspects are strictly technical but they do involve a series of political decisions over how we want Decidim to be, what messages and contents it has to contain, what the moderation policy for comments and debates has to be and, above all, how a specific participatory platform has to be, and what functions it has to have active. This is why it is essential to understand the socio-technical implications of the Decidim platform’s administration and management when it comes to deploying the platform.
+* configuring a participatory process
+* creating an assembly and managing its members
+* opening an initiative space
+* moderating the contents of the platform
+* managing associated legal texts, such as the privacy policy
+* managing access rights of administrators
+* monitoring and verifying participants and their organizations
 
-To understand how Decidim works, we need to distinguish between xref:spaces.adoc[*spaces*] and xref:components.adoc[*components*].  The participatory spaces are the channels that citizens can participate through when public decisions are being taken. These are participatory processes, initiatives, consultations and assemblies.
-Whereas participatory components are mechanisms that enable interaction between users of the platform and the various participatory spaces. These include meetings, pages, proposals and surveys.
+None of these aspects are strictly technical but they do involve a series of political decisions over how you want your instance to work, 
+what messages and contents it contains, what the moderation policy should be, and overall how you want your participatory 
+platform to function. This is why it's essential to understand the socio-technical implications of the Decidim platform’s 
+administration and management.
 
-image:introduction.png[Spaces and components]
+To understand how Decidim works, you first need to distinguish between xref:spaces.adoc[*spaces*] and xref:components.adoc[*components*]. 
 
-Therefore, a participatory space as a participatory process, in the various stages, can incorporate several components such as face-to-face meetings, proposals, surveys and results and the monitoring of these.
+* *Participatory spaces* are the channels that citizens can participate through: participatory processes, assemblies, initiatives and conferences. 
+* *Participatory components* are mechanisms that enable interaction between participants and the participatory spaces: meetings, pages, proposals, surveys, etc.
 
-image:introduction_process.png[Components in a participatory process]
+Therefore, all participatory spaces can incorporate several components, such as meetings, proposals, surveys, or results.
 
-So, participatory spaces are configured by defining (and configuring) the components they are going to have. It is important to bear in mind that these participatory components and the various functions are repeated in the various spaces, offering many opportunities when it comes to configuring the various spaces. This simplifies learning as once a space has been configured, it is then easier to configure another.
-
-This section provides a full description of how to configure the Decidim platform for any kind of organization and how to configure, manage and administer the various participatory processes. A description has been given in tutorial format, to help with understanding administration tasks, following Decidim’s literal fields and enclosing screenshots to facilitate their interpretation.
+image:introduction.png[Spaces and components]
 
-Managing (administering) the Decidim platform is relatively simple and intuitive and no specific IT knowledge is required. The administrators of a Decidim platform, in other words, those with the necessary authorization for managing the platform, can configure the platform in a general way (images, information pages, etc.,) and manage the various participatory processes (configuring, editing, analysing and concluding).
+So, administrators configure participatory spaces by defining and configuring the components they're going to need. 
+It's important to bear in mind that these participatory components and the various functions are repeated in the various spaces, 
+offering many opportunities when it comes to configuring the various spaces. 
+This simplifies learning as once a space is configured, it's then easier to configure others.
+
+This documentation section provides a full description of how to configure the Decidim platform for any kind of organization 
+and how to configure, manage and administer your various participatory processes. A description has been given in tutorial format, 
+to help with understanding administration tasks, following Decidim’s literal fields and enclosing screenshots to facilitate their 
+interpretation.
+
+Administering the Decidim platform is quite intuitive and don't require specific IT knowledge. 
+The administrators of a Decidim platform, in other words, those with the necessary authorization for managing the platform, 
+can configure the platform in a general way (images, information pages, etc.,) and manage the various participatory processes 
+(configuring, editing, analysing and concluding).
+
+== Get started
+
+* xref:admin:.adoc[Getting started]
+* xref:admin:.adoc[Settings]
+* xref:admin:pages.adoc[Pages and topics]
+* xref:admin:participants.adoc[Participants]
+* xref:admin:.adoc[Global moderation]
+* xref:admin:spaces.adoc[Spaces]
+* xref:admin:components.adoc[Components]
+* xref:admin:.adoc[Features]
+* xref:admin:.adoc[Templates]

docs/en/modules/admin/pages/moderations/reported_content.adoc

@@ -0,0 +1,80 @@
+= Reported content
+
+When writing the Terms and Conditions of your platform, or your participation chart, you want to make sure that the 
+participants respect the participation rules in the contents they're writing. 
+All participants are able to report comments, proposals, debates, etc. 
+
+== Report a content
+
+Any logged in participant can report content, clicking on the "Report" button available next to the resource. 
+
+image:moderations/moderations_reported_content_flag.png[Report flag in content]
+
+image:moderations/moderations_reported_comment_flag.png[Report flag in comment]
+
+Participants have to select a reason for the report, and can add extra information if needed. 
+
+image:moderations/moderation_modal.png[Give reason for moderation modal]
+
+== Manage reported content
+
+After a participant has reported a content, it appears in two sections of the administration panel:
+
+* Global moderations panel
+* Participatory space moderation panel
+
+image:moderations/moderations_backend_list_content.png[Global moderations panel for content]
+
+There you'll find first all the unprocessed reports if there's any, with: 
+* *Id*: unique identifier of the reported content.
+* *Type*: the kind of content reported, for instance comment, proposal, debate, etc.
+* *Participatory Space*: which space this content belongs to.
+* *Reported content URL*: link for seeing the content reported and see the context of the complaint.
+* *Reason*: why the content is reported. If the participant that made the report has given extra
+information it's possible to see it by hovering it.
+* *Reported at*: when it was originally reported.
+* *Count*: number of reports by different users.
+* *Actions*: you can *Expand*, *Unreport* or *Hide*.
+
+Once you moderate a content, it appears in the "Hidden" contents list, accessible at the top right of the page. 
+
+=== Actions
+
+|===
+|Icon |Name |Definition |Condition
+
+|image:icons/action_expand.png[Expand icon]
+|Expand
+|To see the full details of the reported content and reports.
+|Always available.
+
+|image:icons/action_unreport.png[Unreport icon]
+|Unreport
+|Allows an administrator or moderator to keep showing this content and cancel the report.
+|Available when the content isn't yet hidden.
+
+|image:icons/action_hide.png[Hide icon]
+|Hide
+|Allows an administrator or moderator to hide this content and accept the report.
+|Available when the content isn't yet hidden.
+
+|image:icons/action_hide.png[Unhide icon]
+|Unhide
+|Allows an administrator or moderator to Unhide this content (showing it publicly again).
+|Available when the content is hidden.
+|===
+
+If a content has been mistakenly "Unreported" then you'll need to find it again in the public platform 
+and report it again so you can moderate it.
+
+=== Expand
+
+To review the details of a content, and the different reports made by participants, you can click the "Expand" button. 
+see all the metadata of a report, you can see it Expanded.
+
+image:moderations/moderations_backend_report_content.png[Global moderations panel for content]
+
+This view allow you to assess quickly if it's necessary to hide or not the content. 
+At the bottom of the report, you can also review the different reports made by other participants, and expand them as well. 
+
+image:moderations/moderations_backend_report_details.png[Global moderations panel for content]