Skip to content
This repository has been archived by the owner on Nov 7, 2019. It is now read-only.

Commit

Permalink
Merge 5eff241 into cd7fb06
Browse files Browse the repository at this point in the history
  • Loading branch information
philli-m committed Jun 3, 2019
2 parents cd7fb06 + 5eff241 commit c43ecc0
Show file tree
Hide file tree
Showing 13 changed files with 595 additions and 354 deletions.
3 changes: 1 addition & 2 deletions apps/activities/phases.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ class FaceToFacePhase(phases.PhaseContent):
view = views.ActivityView

name = _('Face to face phase')
description = _('Provide information about face-to-face participation '
'events.')
description = _('Show information about the face-to-face event/phase.')
module_name = _('facetoface')

features = {}
Expand Down
6 changes: 4 additions & 2 deletions apps/budgeting/phases.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ class RequestPhase(phases.PhaseContent):
view = views.ProposalListView

name = _('Request phase')
description = _('Request budgeting and get feedback through rates and '
'comments.')
description = _(
'Post ideas with budget proposals, comment on them and'
' rate them.'
)
module_name = _('participatory budgeting')

features = {
Expand Down
34 changes: 16 additions & 18 deletions apps/dashboard/blueprints.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ProjectBlueprint(
title=_('Brainstorming'),
description=_(
'Collect first ideas for a specific topic and comment on them.'
'Collect ideas and let participants comment on them.'
),
content=[
ideas_phases.CollectPhase(),
Expand All @@ -25,7 +25,8 @@
ProjectBlueprint(
title=_('Spatial Brainstorming'),
description=_(
'Collect location specific ideas for a topic and comment on them.'
'Collect ideas associated with a location within a pre-defined '
'area on a map.'
),
content=[
mapideas_phases.CollectPhase(),
Expand All @@ -35,9 +36,10 @@
)),
('map-idea-collection',
ProjectBlueprint(
title=_('Spatial Idea Collection'),
title=_('Spatial Idea Challenge'),
description=_(
'Collect location specific ideas that can be rated and commented.'
'Collect ideas on a pre-defined area on a map and let '
'participants rate them in a second step.'
),
content=[
mapideas_phases.CollectPhase(),
Expand All @@ -48,11 +50,10 @@
)),
('agenda-setting',
ProjectBlueprint(
title=_('Agenda Setting'),
title=_('Idea Challenge'),
description=_(
'With Agenda-Setting it’s possible to identify topics and to '
'define mission statements. Afterwards anyone can comment and '
'rate on different topics.'
'Collect ideas and let participants rate and comment on them in'
' a second step.'
),
content=[
ideas_phases.CollectPhase(),
Expand All @@ -65,8 +66,7 @@
ProjectBlueprint(
title=_('Text Review'),
description=_(
'In the text-review it’s possible to structure draft texts '
'that can be commented.'
'Let participants comment on paragraphs of a pre-defined text.'
),
content=[
documents_phases.CommentPhase(),
Expand All @@ -78,8 +78,8 @@
ProjectBlueprint(
title=_('Poll'),
description=_(
'Create a poll with multiple questions and possible answers. '
'Anyone can cast votes and comment on the poll.'
'Let participants answer a poll of pre-defined multiple choice '
'questions.'
),
content=[
poll_phases.VotingPhase(),
Expand All @@ -91,9 +91,8 @@
ProjectBlueprint(
title=_('Participatory budgeting'),
description=_(
'With participatory-budgeting it’s possible to make proposals '
'with budget specifications and locate them. Anyone can comment '
'and rate on different proposals.'),
'Collect ideas with a budget proposal from participants. The '
'ideas can be located on a pre-defined map.'),
content=[
budgeting_phases.RequestPhase()],
image='images/participatory-budgeting.svg',
Expand All @@ -103,9 +102,8 @@
ProjectBlueprint(
title=_('Face-to-Face Participation'),
description=_(
'With this module you can provide information about events or '
'phases for face-to-face participation. No online participation '
'is possible in this module.'
'Inform your participants about events and phases of your '
'participation process that take place offline.'
),
content=[
activities_phases.FaceToFacePhase(),
Expand Down
2 changes: 1 addition & 1 deletion apps/documents/phases.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class CommentPhase(phases.PhaseContent):

name = _('Comment phase')
module_name = _('commenting text')
description = _('Collect comments for the text.')
description = _('Post comments on the paragraphs of the text')

features = {
'comment': (models.Paragraph, models.Chapter),
Expand Down
4 changes: 2 additions & 2 deletions apps/ideas/phases.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class CollectPhase(phases.PhaseContent):
view = views.IdeaListView

name = _('Collect phase')
description = _('Create and comment new ideas.')
description = _('Create and comment on new ideas.')
module_name = _('ideas collection')

features = {
Expand All @@ -42,7 +42,7 @@ class RatingPhase(phases.PhaseContent):
view = views.IdeaListView

name = _('Rating phase')
description = _('Get quantative feeback by rating the collected ideas.')
description = _('Rate the previously collected ideas.')
module_name = _('ideas collection')

features = {
Expand Down
6 changes: 4 additions & 2 deletions apps/mapideas/phases.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ class IssuePhase(phases.PhaseContent):
view = views.MapIdeaListView

name = _('Issue phase')
description = _('Create new ideas located on a map.')
description = _('Create new ideas, locate them on a map and comment on'
' them.')
module_name = _('ideas collection')

features = {
Expand Down Expand Up @@ -42,7 +43,8 @@ class RatingPhase(phases.PhaseContent):
view = views.MapIdeaListView

name = _('Rating phase')
description = _('Get quantative feeback by rating the collected ideas.')
description = _('Rate the previously collected ideas to get quantitative '
'feedback.')
module_name = _('ideas collection')

features = {
Expand Down
2 changes: 1 addition & 1 deletion apps/polls/phases.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class VotingPhase(phases.PhaseContent):
view = views.PollDetailView

name = _('Voting phase')
description = _('Cast votes and discuss the poll.')
description = _('Answer the questions and comment on the poll.')
module_name = _('polls')

features = {
Expand Down
2 changes: 1 addition & 1 deletion liqd_product/templates/a4dashboard/base_project_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{% if user_may_change_partner %}
<a href="{% url 'partner-settings' partner_slug=view.organisation.partner.slug %}"
class="btn btn--light btn--full">
{% trans 'Organisation settings' %}
{% trans 'Edit your organisation' %}
</a>
{% endif %}
</nav>
Expand Down
2 changes: 1 addition & 1 deletion liqd_product/templates/a4dashboard/blueprint_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

{% block dashboard_content %}
<div class="l-center-8">
<h1>{% trans "New Project" %}</h1>
<h1>{% trans "Create a new Project" %}</h1>

<ul class="l-tiles-3">
{% for blueprint_slug, blueprint in view.blueprints %}
Expand Down
Loading

0 comments on commit c43ecc0

Please sign in to comment.