decidim-participatory_processes 0.10.1 → 0.11.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/assets/javascripts/decidim/participatory_processes/admin/participatory_processes.js.es6 +4 -4
- data/app/assets/javascripts/decidim/participatory_processes/filters.js.es6 +8 -8
- data/app/commands/decidim/participatory_processes/admin/activate_participatory_process_step.rb +8 -8
- data/app/commands/decidim/participatory_processes/admin/copy_participatory_process.rb +9 -9
- data/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb +11 -0
- data/app/commands/decidim/participatory_processes/admin/create_participatory_process_admin.rb +4 -4
- data/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb +1 -0
- data/app/constraints/decidim/participatory_processes/{current_feature.rb → current_component.rb} +7 -7
- data/app/controllers/decidim/participatory_processes/admin/{feature_permissions_controller.rb → component_permissions_controller.rb} +2 -2
- data/app/controllers/decidim/participatory_processes/admin/{features_controller.rb → components_controller.rb} +2 -2
- data/app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_controller.rb +25 -0
- data/app/controllers/decidim/participatory_processes/participatory_process_groups_controller.rb +5 -1
- data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb +5 -3
- data/app/forms/decidim/participatory_processes/admin/participatory_process_copy_form.rb +1 -1
- data/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb +3 -2
- data/app/models/decidim/participatory_process.rb +8 -2
- data/app/models/decidim/participatory_process_step.rb +1 -1
- data/app/models/decidim/participatory_processes/abilities/admin/admin_ability.rb +1 -0
- data/app/presenters/decidim/participatory_processes/participatory_process_stats_presenter.rb +9 -9
- data/app/queries/decidim/participatory_processes/organization_prioritized_participatory_processes.rb +3 -2
- data/app/queries/decidim/participatory_processes/organization_published_participatory_processes.rb +3 -1
- data/app/queries/decidim/participatory_processes/visible_participatory_processes.rb +22 -0
- data/app/types/decidim/participatory_processes/participatory_process_type.rb +4 -1
- data/app/views/decidim/participatory_process_groups/_participatory_process_group.html.erb +1 -1
- data/app/views/decidim/participatory_processes/_participatory_process.html.erb +4 -4
- data/app/views/decidim/participatory_processes/admin/participatory_process_copies/_form.html.erb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_process_copies/new.html.erb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_process_groups/edit.html.erb +2 -2
- data/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb +3 -3
- data/app/views/decidim/participatory_processes/admin/participatory_process_groups/new.html.erb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_process_groups/show.html.erb +1 -2
- data/app/views/decidim/participatory_processes/admin/participatory_process_steps/edit.html.erb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb +3 -3
- data/app/views/decidim/participatory_processes/admin/participatory_process_steps/new.html.erb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_process_steps/show.html.erb +1 -2
- data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/edit.html.erb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/new.html.erb +1 -1
- data/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb +4 -0
- data/app/views/decidim/participatory_processes/admin/participatory_processes/edit.html.erb +2 -3
- data/app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb +12 -4
- data/app/views/decidim/participatory_processes/admin/participatory_processes/new.html.erb +1 -1
- data/app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb +1 -1
- data/app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb +2 -2
- data/app/views/decidim/participatory_processes/participatory_process_widgets/show.html.erb +1 -1
- data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb +1 -1
- data/app/views/decidim/participatory_processes/participatory_processes/_statistics.html.erb +1 -1
- data/app/views/decidim/participatory_processes/participatory_processes/index.html.erb +2 -2
- data/app/views/decidim/participatory_processes/participatory_processes/show.html.erb +6 -2
- data/app/views/layouts/decidim/_process_header.html.erb +13 -13
- data/app/views/layouts/decidim/_process_header_steps.html.erb +1 -1
- data/app/views/layouts/decidim/admin/participatory_process.html.erb +15 -10
- data/app/views/layouts/decidim/admin/participatory_process_groups.html.erb +1 -1
- data/app/views/layouts/decidim/admin/participatory_processes.html.erb +1 -1
- data/app/views/layouts/decidim/participatory_process.html.erb +2 -2
- data/config/locales/ca.yml +8 -2
- data/config/locales/en.yml +8 -2
- data/config/locales/es.yml +8 -2
- data/config/locales/eu.yml +8 -2
- data/config/locales/fi.yml +8 -2
- data/config/locales/fr.yml +13 -7
- data/config/locales/gl.yml +8 -2
- data/config/locales/it.yml +8 -2
- data/config/locales/nl.yml +58 -52
- data/config/locales/pl.yml +8 -2
- data/config/locales/pt-BR.yml +8 -2
- data/config/locales/pt.yml +8 -2
- data/config/locales/ru.yml +0 -2
- data/config/locales/sv.yml +8 -2
- data/config/locales/uk.yml +0 -2
- data/db/migrate/20170720120135_make_features_polymorphic.rb +8 -8
- data/db/migrate/20180122110007_add_private_to_participatory_processes.rb +7 -0
- data/lib/decidim/participatory_processes/admin_engine.rb +10 -5
- data/lib/decidim/participatory_processes/engine.rb +6 -6
- data/lib/decidim/participatory_processes/participatory_space.rb +1 -1
- data/lib/decidim/participatory_processes/test/factories.rb +4 -3
- data/lib/decidim/participatory_processes/version.rb +1 -1
- metadata +16 -13
data/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
<div class="card-divider">
|
3
3
|
<h2 class="card-title">
|
4
4
|
<%= t "decidim.admin.titles.participatory_process_groups" %>
|
5
|
-
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_group.name", scope: "decidim.admin")), [
|
5
|
+
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_group.name", scope: "decidim.admin")), ["new", "participatory_process_group"], class: "button tiny button--title new" if can? :create, Decidim::ParticipatoryProcessGroup %>
|
6
6
|
</h2>
|
7
7
|
</div>
|
8
8
|
<div class="card-section">
|
@@ -19,14 +19,14 @@
|
|
19
19
|
<tr>
|
20
20
|
<td>
|
21
21
|
<% if can? :update, group %>
|
22
|
-
<%= link_to translated_attribute(group.name), [
|
22
|
+
<%= link_to translated_attribute(group.name), ["edit", group] %><br />
|
23
23
|
<% else %>
|
24
24
|
<%= translated_attribute(group.name) %>
|
25
25
|
<% end %>
|
26
26
|
</td>
|
27
27
|
<td class="table-list__actions">
|
28
28
|
<% if can? :update, group %>
|
29
|
-
<%= icon_link_to "pencil", [
|
29
|
+
<%= icon_link_to "pencil", ["edit", group], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
|
30
30
|
<% end %>
|
31
31
|
|
32
32
|
<%= icon_link_to "eye", decidim_participatory_processes.participatory_process_group_path(group), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview" %>
|
data/app/views/decidim/participatory_processes/admin/participatory_process_groups/new.html.erb
CHANGED
@@ -4,7 +4,7 @@
|
|
4
4
|
<h2 class="card-title"><%= t "participatory_process_groups.new.title", scope: "decidim.admin" %></h2>
|
5
5
|
</div>
|
6
6
|
<div class="card-section">
|
7
|
-
<%= render partial:
|
7
|
+
<%= render partial: "form", object: f %>
|
8
8
|
</div>
|
9
9
|
</div>
|
10
10
|
<div class="button--double form-general-submit">
|
data/app/views/decidim/participatory_processes/admin/participatory_process_steps/edit.html.erb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
|
2
2
|
<%= decidim_form_for(@form, url: participatory_process_step_path(@participatory_process_step.participatory_process, @participatory_process_step), html: { class: "form edit_participatory_process_step" }) do |f| %>
|
3
|
-
<%= render partial:
|
3
|
+
<%= render partial: "form", object: f, locals: { title: t("participatory_process_steps.edit.title", scope: "decidim.admin") } %>
|
4
4
|
|
5
5
|
<div class="button--double form-general-submit">
|
6
6
|
<%= f.submit t("participatory_process_steps.edit.update", scope: "decidim.admin") %>
|
data/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
<h2 class="card-title">
|
4
4
|
<%= t("participatory_process_steps.index.steps_title", scope: "decidim.admin") %>
|
5
5
|
<% if can? :create, Decidim::ParticipatoryProcessStep %>
|
6
|
-
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_step.name", scope: "decidim.admin")), new_participatory_process_step_path(current_participatory_process), class:
|
6
|
+
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_step.name", scope: "decidim.admin")), new_participatory_process_step_path(current_participatory_process), class: "button tiny button--title" %>
|
7
7
|
<% end %>
|
8
8
|
</h2>
|
9
9
|
</div>
|
@@ -33,12 +33,12 @@
|
|
33
33
|
<td>
|
34
34
|
<% if step.start_date %>
|
35
35
|
<%= l step.start_date.to_date, format: :long %>
|
36
|
-
<%
|
36
|
+
<% end %>
|
37
37
|
</td>
|
38
38
|
<td>
|
39
39
|
<% if step.end_date %>
|
40
40
|
<%= l step.end_date.to_date, format: :long %>
|
41
|
-
<%
|
41
|
+
<% end %>
|
42
42
|
</td>
|
43
43
|
<td class="table-list__actions">
|
44
44
|
<% if can?(:activate, step) && !step.active? %>
|
data/app/views/decidim/participatory_processes/admin/participatory_process_steps/new.html.erb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
<%= decidim_form_for(@form, html: { class: "form new_participatory_process_step" }) do |f| %>
|
2
|
-
<%= render partial:
|
2
|
+
<%= render partial: "form", object: f, locals: { title: t("participatory_process_steps.new.title", scope: "decidim.admin") } %>
|
3
3
|
|
4
4
|
<div class="button--double form-general-submit">
|
5
5
|
<%= f.submit t("participatory_process_steps.new.create", scope: "decidim.admin") %>
|
data/app/views/decidim/participatory_processes/admin/participatory_process_steps/show.html.erb
CHANGED
@@ -9,8 +9,7 @@
|
|
9
9
|
<dl>
|
10
10
|
<%= display_for @participatory_process_step,
|
11
11
|
:title,
|
12
|
-
:description
|
13
|
-
%>
|
12
|
+
:description %>
|
14
13
|
<dt><%= display_label(@participatory_process_step, :start_date) %></dt>
|
15
14
|
<dd><%= l @participatory_process_step.start_date, format: :short if @participatory_process_step.start_date.present? %></dd>
|
16
15
|
<dt><%= display_label(@participatory_process_step, :end_date) %></dt>
|
data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/edit.html.erb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
<%= decidim_form_for(@form, url: participatory_process_user_role_path(@user_role.participatory_process, @user_role), html: { class: "form edit_participatory_process_user_roles" }) do |f| %>
|
2
|
-
<%= render partial:
|
2
|
+
<%= render partial: "form", object: f, locals: { title: t("participatory_process_user_roles.edit.title", scope: "decidim.admin") } %>
|
3
3
|
|
4
4
|
<div class="button--double form-general-submit">
|
5
5
|
<%= f.submit t("participatory_process_user_roles.edit.update", scope: "decidim.admin") %>
|
data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
<h2 class="card-title">
|
4
4
|
<%= t("participatory_process_user_roles.index.process_admins_title", scope: "decidim.admin") %>
|
5
5
|
<% if can? :create, Decidim::ParticipatoryProcessUserRole %>
|
6
|
-
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_user_role.name", scope: "decidim.admin")), new_participatory_process_user_role_path(current_participatory_process), class:
|
6
|
+
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_user_role.name", scope: "decidim.admin")), new_participatory_process_user_role_path(current_participatory_process), class: "button tiny button--title new" %>
|
7
7
|
<% end %>
|
8
8
|
</h2>
|
9
9
|
</div>
|
data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/new.html.erb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
<%= decidim_form_for(@form, html: { class: "form new_participatory_process_user_role" }) do |f| %>
|
2
|
-
<%= render partial:
|
2
|
+
<%= render partial: "form", object: f, locals: { title: t("participatory_process_user_roles.new.title", scope: "decidim.admin") } %>
|
3
3
|
|
4
4
|
<div class="button--double form-general-submit">
|
5
5
|
<%= f.submit t("participatory_process_user_roles.new.create", scope: "decidim.admin") %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<%= decidim_form_for(@form, html: { class: "form edit_participatory_process" }) do |f| %>
|
2
|
-
<%= render partial:
|
2
|
+
<%= render partial: "form", object: f %>
|
3
3
|
<div class="button--double form-general-submit">
|
4
|
-
<%= f.submit t("participatory_processes.edit.update", scope: "decidim.admin"), class: "button"
|
4
|
+
<%= f.submit t("participatory_processes.edit.update", scope: "decidim.admin"), class: "button" %>
|
5
5
|
|
6
6
|
<% if can? :publish, current_participatory_process %>
|
7
7
|
<% if current_participatory_process.published? %>
|
@@ -16,4 +16,3 @@
|
|
16
16
|
<% end %>
|
17
17
|
</div>
|
18
18
|
<% end %>
|
19
|
-
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div class="card" id="processes">
|
2
2
|
<div class="card-divider">
|
3
3
|
<h2 class="card-title">
|
4
|
-
<%= t "decidim.admin.titles.participatory_processes" %><%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process.name", scope: "decidim.admin")), [
|
4
|
+
<%= t "decidim.admin.titles.participatory_processes" %><%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process.name", scope: "decidim.admin")), ["new", "participatory_process"], class: "button tiny button--title" if can? :create, Decidim::ParticipatoryProcess %>
|
5
5
|
</h2>
|
6
6
|
</div>
|
7
7
|
<div class="card-section">
|
@@ -11,6 +11,7 @@
|
|
11
11
|
<tr>
|
12
12
|
<th><%= t("models.participatory_process.fields.title", scope: "decidim.admin") %></th>
|
13
13
|
<th><%= t("models.participatory_process.fields.created_at", scope: "decidim.admin") %></th>
|
14
|
+
<th><%= t("models.participatory_process.fields.private", scope: "decidim.admin") %></th>
|
14
15
|
<th class="table-list__actions"><%= t("models.participatory_process.fields.published", scope: "decidim.admin") %></th>
|
15
16
|
<th></th>
|
16
17
|
</tr>
|
@@ -20,7 +21,7 @@
|
|
20
21
|
<tr>
|
21
22
|
<td>
|
22
23
|
<% if process.promoted? %>
|
23
|
-
<span data-tooltip class="icon-state icon-highlight" aria-haspopup="true"
|
24
|
+
<span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.participatory_process.fields.promoted", scope: "decidim.admin") %>">
|
24
25
|
<%= icon "star" %>
|
25
26
|
</span>
|
26
27
|
<% end %>
|
@@ -37,11 +38,18 @@
|
|
37
38
|
<td>
|
38
39
|
<%= l process.created_at, format: :short %>
|
39
40
|
</td>
|
41
|
+
<td class="table-list__state">
|
42
|
+
<% if process.private_space? %>
|
43
|
+
<strong class="text-alert"><%= t("participatory_processes.index.private", scope: "decidim.admin") %></strong>
|
44
|
+
<% else %>
|
45
|
+
<strong class="text-success"><%= t("participatory_processes.index.public", scope: "decidim.admin") %></strong>
|
46
|
+
<% end %>
|
47
|
+
</td>
|
40
48
|
<td class="table-list__state">
|
41
49
|
<% if process.published? %>
|
42
|
-
<strong class="text-success"><%= t(
|
50
|
+
<strong class="text-success"><%= t("participatory_processes.index.published", scope: "decidim.admin") %></strong>
|
43
51
|
<% else %>
|
44
|
-
<strong class="text-alert"><%= t(
|
52
|
+
<strong class="text-alert"><%= t("participatory_processes.index.not_published", scope: "decidim.admin") %></strong>
|
45
53
|
<% end %>
|
46
54
|
</td>
|
47
55
|
<td class="table-list__actions">
|
@@ -3,7 +3,7 @@
|
|
3
3
|
</h2>
|
4
4
|
|
5
5
|
<%= decidim_form_for(@form, html: { class: "form new_participatory_process" }) do |f| %>
|
6
|
-
<%= render partial:
|
6
|
+
<%= render partial: "form", object: f %>
|
7
7
|
|
8
8
|
<div class="button--double form-general-submit">
|
9
9
|
<%= f.submit t("participatory_processes.new.create", scope: "decidim.admin") %>
|
data/app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
<ol class="timeline">
|
2
2
|
<% past_step = true %>
|
3
3
|
<% current_participatory_space.steps.each do |step| %>
|
4
|
-
<%= render step, step_status_class: step_class(step, past_step)
|
4
|
+
<%= render step, step_status_class: step_class(step, past_step) %>
|
5
5
|
<% past_step = false if step.active? %>
|
6
6
|
<% end %>
|
7
7
|
</ol>
|
@@ -5,8 +5,8 @@
|
|
5
5
|
<div class="row">
|
6
6
|
<div class="columns mediumlarge-9 large-7">
|
7
7
|
<div class="section">
|
8
|
-
<h4 class="section-heading"><%= t(
|
9
|
-
<%= render partial:
|
8
|
+
<h4 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h4>
|
9
|
+
<%= render partial: "timeline" %>
|
10
10
|
</div>
|
11
11
|
</div>
|
12
12
|
</div>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<% content_for(:header, "false") %>
|
2
2
|
<% content_for(:title, translated_attribute(model.title)) %>
|
3
|
-
<p class="card__desc"><%= decidim_sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator:
|
3
|
+
<p class="card__desc"><%= decidim_sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator: "...") %></p>
|
4
4
|
<% content_for(:footer) do %>
|
5
5
|
<div class="card__support">
|
6
6
|
<% if model.active_step %>
|
data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
<%= link_to participatory_process_path(promoted_process), class: "card__link" do %>
|
6
6
|
<h2 class="card__title"><%= translated_attribute promoted_process.title %></h2>
|
7
7
|
<% end %>
|
8
|
-
<%= decidim_sanitize html_truncate(translated_attribute(promoted_process.short_description), length: 630, separator:
|
8
|
+
<%= decidim_sanitize html_truncate(translated_attribute(promoted_process.short_description), length: 630, separator: "...") %>
|
9
9
|
<%= link_to participatory_process_path(promoted_process), class: "button secondary small hollow card__button" do %>
|
10
10
|
<%= t("participatory_processes.promoted_process.more_info", scope: "layouts.decidim") %>
|
11
11
|
<% end %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<section class="extended" id="participatory_process-statistics" class="statistics">
|
2
2
|
<div class="row column">
|
3
|
-
<h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.participatory_processes"
|
3
|
+
<h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.participatory_processes") %></h3>
|
4
4
|
</div>
|
5
5
|
<div class="row">
|
6
6
|
<div class="columns small-centered mediumlarge-12 large-12 process_stats">
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
<main class="wrapper">
|
4
4
|
<% if promoted_participatory_processes.any? %>
|
5
|
-
<section id
|
5
|
+
<section id="highlighted-processes" class="row section">
|
6
6
|
<h1 class="section-heading"><%= t("participatory_processes.index.promoted_processes", scope: "layouts.decidim") %></h1>
|
7
7
|
<%= render partial: "promoted_process", collection: promoted_participatory_processes, as: :promoted_process %>
|
8
8
|
</section>
|
@@ -12,7 +12,7 @@
|
|
12
12
|
<div class="processes-grid-order-by">
|
13
13
|
<%= render partial: "decidim/participatory_processes/order_by_processes", locals: { include_filter: true } %>
|
14
14
|
</div>
|
15
|
-
<p class="loading"><%= t(
|
15
|
+
<p class="loading"><%= t(".loading") %></p>
|
16
16
|
<div class="row small-up-1 medium-up-2 large-up-3 card-grid">
|
17
17
|
<%= render(collection) %>
|
18
18
|
</div>
|
@@ -6,6 +6,10 @@
|
|
6
6
|
twitter_handler: current_organization.twitter_handler
|
7
7
|
}) %>
|
8
8
|
|
9
|
+
<% if current_participatory_space.private_space? %>
|
10
|
+
<%= render partial: "decidim/shared/private_participatory_space", locals: { text: t("participatory_processes.show.private_space", scope: "decidim") } %>
|
11
|
+
<% end %>
|
12
|
+
|
9
13
|
<% if translated_attribute(current_participatory_space.announcement).present? %>
|
10
14
|
<%= render partial: "decidim/shared/announcement", locals: { announcement: current_participatory_space.announcement } %>
|
11
15
|
<% end %>
|
@@ -19,8 +23,8 @@
|
|
19
23
|
</div>
|
20
24
|
<%= decidim_sanitize translated_attribute(current_participatory_space.description) %>
|
21
25
|
</div>
|
22
|
-
<%= render_hook(:participatory_space_highlighted_elements) %>
|
23
26
|
<%= attachments_for current_participatory_space %>
|
27
|
+
<%= render_hook(:participatory_space_highlighted_elements) %>
|
24
28
|
</div>
|
25
29
|
<div class="section columns medium-5 mediumlarge-4 large-3">
|
26
30
|
<div class="card extra">
|
@@ -91,7 +95,7 @@
|
|
91
95
|
</div>
|
92
96
|
</div>
|
93
97
|
<% if current_participatory_space.show_statistics? %>
|
94
|
-
<%= render partial:
|
98
|
+
<%= render partial: "statistics" %>
|
95
99
|
<% end %>
|
96
100
|
</div>
|
97
101
|
|
@@ -12,7 +12,7 @@
|
|
12
12
|
<h2 class="text-highlight heading-small">
|
13
13
|
<% if current_participatory_space.hashtag.present? %>
|
14
14
|
<span class="process-header__hashtag">
|
15
|
-
<%= link_to "##{current_participatory_space.hashtag}", "https://twitter.com/hashtag/#{current_participatory_space.hashtag}" %>
|
15
|
+
<%= link_to "##{current_participatory_space.hashtag}", "https://twitter.com/hashtag/#{current_participatory_space.hashtag}", target: "_blank" %>
|
16
16
|
</span>
|
17
17
|
<% end %>
|
18
18
|
<%= translated_attribute(current_participatory_space.subtitle) %>
|
@@ -22,15 +22,15 @@
|
|
22
22
|
<%= render partial: "layouts/decidim/process_header_steps", locals: { participatory_process: current_participatory_space } %>
|
23
23
|
</div>
|
24
24
|
</div>
|
25
|
-
<% if current_participatory_space.
|
25
|
+
<% if current_participatory_space.components.any? %>
|
26
26
|
<div class="row column">
|
27
27
|
<div class="process-nav">
|
28
|
-
<button class="process-nav__trigger hide-for-medium"
|
29
|
-
<%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(
|
28
|
+
<button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
|
29
|
+
<%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
|
30
30
|
<div class="process-nav__link">
|
31
|
-
<%
|
32
|
-
<%=
|
33
|
-
<%= translated_attribute(
|
31
|
+
<% if self.try(:current_component) %>
|
32
|
+
<%= component_icon(current_component) %>
|
33
|
+
<%= translated_attribute(current_component.name) %>
|
34
34
|
<% else %>
|
35
35
|
<%= icon "process" %>
|
36
36
|
<%= t ".process_menu_item" %>
|
@@ -46,13 +46,13 @@
|
|
46
46
|
<% end %>
|
47
47
|
</li>
|
48
48
|
|
49
|
-
<% current_participatory_space.
|
50
|
-
<% if
|
51
|
-
<li class="<%= "is-active" if is_active_link?(
|
52
|
-
<%= active_link_to
|
53
|
-
<%=
|
49
|
+
<% current_participatory_space.components.each do |component| %>
|
50
|
+
<% if component.published? || component == self.try(:current_component) %>
|
51
|
+
<li class="<%= "is-active" if is_active_link?(main_component_path(component), :inclusive) %>">
|
52
|
+
<%= active_link_to main_component_path(component), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
|
53
|
+
<%= component_icon(component) %>
|
54
54
|
|
55
|
-
<%= translated_attribute(
|
55
|
+
<%= translated_attribute(component.name) %>
|
56
56
|
<% end %>
|
57
57
|
</li>
|
58
58
|
<% end %>
|
@@ -21,7 +21,7 @@
|
|
21
21
|
<%= participatory_space_helpers.step_dates participatory_process.active_step %>
|
22
22
|
</span>
|
23
23
|
</div>
|
24
|
-
<%= link_to t(
|
24
|
+
<%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space), class: "button tiny hollow" %>
|
25
25
|
</div>
|
26
26
|
</div>
|
27
27
|
<% end %>
|
@@ -11,17 +11,17 @@
|
|
11
11
|
<%= aria_selected_link_to t("steps", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_steps_path(current_participatory_space) %>
|
12
12
|
</li>
|
13
13
|
<% end %>
|
14
|
-
<% if can? :read, Decidim::
|
15
|
-
<li <% if is_active_link?(decidim_admin_participatory_processes.
|
16
|
-
<%= aria_selected_link_to t("
|
14
|
+
<% if can? :read, Decidim::Component %>
|
15
|
+
<li <% if is_active_link?(decidim_admin_participatory_processes.components_path(current_participatory_space)) %> class="is-active" <% end %>>
|
16
|
+
<%= aria_selected_link_to t("components", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.components_path(current_participatory_space) %>
|
17
17
|
<ul>
|
18
|
-
<% current_participatory_space.
|
19
|
-
<% if
|
20
|
-
<li <% if is_active_link?(
|
21
|
-
<%= link_to
|
22
|
-
<%= translated_attribute
|
23
|
-
<% if
|
24
|
-
<span class="component-counter <%= "component-counter--off" if
|
18
|
+
<% current_participatory_space.components.each do |component| %>
|
19
|
+
<% if component.manifest.admin_engine %>
|
20
|
+
<li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_participatory_processes.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_participatory_processes.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
|
21
|
+
<%= link_to manage_component_path(component) do %>
|
22
|
+
<%= translated_attribute component.name %>
|
23
|
+
<% if component.primary_stat.present? %>
|
24
|
+
<span class="component-counter <%= "component-counter--off" if component.primary_stat.zero? %>"><%= component.primary_stat %></span>
|
25
25
|
<% end %>
|
26
26
|
<% end %>
|
27
27
|
</li>
|
@@ -57,6 +57,11 @@
|
|
57
57
|
<%= aria_selected_link_to t("process_admins", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_user_roles_path(current_participatory_space) %>
|
58
58
|
</li>
|
59
59
|
<% end %>
|
60
|
+
<% if can? :read, Decidim::ParticipatorySpacePrivateUser %>
|
61
|
+
<li <% if is_active_link?(decidim_admin_participatory_processes.participatory_space_private_users_path(current_participatory_space)) %> class="is-active" <% end %>>
|
62
|
+
<%= aria_selected_link_to t("private_users", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_space_private_users_path(current_participatory_space) %>
|
63
|
+
</li>
|
64
|
+
<% end %>
|
60
65
|
<% if can? :read, Decidim::Moderation %>
|
61
66
|
<li <% if is_active_link?(decidim_admin_participatory_processes.moderations_path(current_participatory_space)) %> class="is-active" <% end %>>
|
62
67
|
<%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.moderations_path(current_participatory_space) %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<%= t "decidim.admin.titles.participatory_process_groups" %>
|
5
5
|
</div>
|
6
6
|
<div class="secondary-nav__actions">
|
7
|
-
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_group.name", scope: "decidim.admin")), [
|
7
|
+
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_group.name", scope: "decidim.admin")), ["new", "participatory_process_group"], class: "button expanded small new" if can? :create, Decidim::ParticipatoryProcessGroup %>
|
8
8
|
</div>
|
9
9
|
</div>
|
10
10
|
<% end %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<%= t "decidim.admin.titles.participatory_processes" %>
|
5
5
|
</div>
|
6
6
|
<div class="secondary-nav__actions">
|
7
|
-
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process.name", scope: "decidim.admin")), [
|
7
|
+
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process.name", scope: "decidim.admin")), ["new", "participatory_process"], class: "button expanded small" if can? :create, Decidim::ParticipatoryProcess %>
|
8
8
|
</div>
|
9
9
|
</div>
|
10
10
|
<% end %>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<% add_decidim_page_title(translated_attribute(
|
1
|
+
<% add_decidim_page_title(translated_attribute(current_component.name)) if try(:current_component) %>
|
2
2
|
<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
|
3
3
|
<% add_decidim_meta_tags(
|
4
4
|
image_url: current_participatory_space.banner_image.url,
|
@@ -20,7 +20,7 @@
|
|
20
20
|
</div>
|
21
21
|
<% end %>
|
22
22
|
|
23
|
-
<%= render "layouts/decidim/
|
23
|
+
<%= render "layouts/decidim/component_authorization_modals" %>
|
24
24
|
<% end %>
|
25
25
|
|
26
26
|
<% provide :meta_image_url, current_participatory_space.banner_image.url %>
|
data/config/locales/ca.yml
CHANGED
@@ -5,7 +5,7 @@ ca:
|
|
5
5
|
announcement: Anunci
|
6
6
|
banner_image: Imatge de bàner
|
7
7
|
copy_categories: Copiar categories
|
8
|
-
|
8
|
+
copy_components: Copiar components
|
9
9
|
copy_steps: Copiar fases
|
10
10
|
description: Descripció
|
11
11
|
developer_group: Grup promotor
|
@@ -66,15 +66,17 @@ ca:
|
|
66
66
|
attachment_files: Fitxers
|
67
67
|
attachments: Adjunts
|
68
68
|
categories: Categories
|
69
|
-
|
69
|
+
components: Components
|
70
70
|
info: Informació
|
71
71
|
moderations: Moderacions
|
72
|
+
private_users: Usuaris privats
|
72
73
|
process_admins: Usuaris del procés
|
73
74
|
steps: Fases del procés
|
74
75
|
models:
|
75
76
|
participatory_process:
|
76
77
|
fields:
|
77
78
|
created_at: Data de creació
|
79
|
+
private: Privat
|
78
80
|
promoted: Destacat
|
79
81
|
published: Publicat
|
80
82
|
title: Títol
|
@@ -183,6 +185,8 @@ ca:
|
|
183
185
|
title: Informació general
|
184
186
|
index:
|
185
187
|
not_published: No publicada
|
188
|
+
private: Privat
|
189
|
+
public: Públic
|
186
190
|
published: Publicat
|
187
191
|
new:
|
188
192
|
create: Crear
|
@@ -275,12 +279,14 @@ ca:
|
|
275
279
|
local_area: Àrea d'organització
|
276
280
|
participatory_scope: Què es decideix
|
277
281
|
participatory_structure: Com es decideix
|
282
|
+
private_space: Aquest és un procés privat
|
278
283
|
scope: Àmbit
|
279
284
|
start_date: Data d'inici
|
280
285
|
target: Qui participa
|
281
286
|
statistics:
|
282
287
|
answers_count: Respostes
|
283
288
|
comments_count: Comentaris
|
289
|
+
debates_count: Debats
|
284
290
|
endorsements_count: Adhesions
|
285
291
|
headline: Activitat
|
286
292
|
meetings_count: Trobades presencials
|
data/config/locales/en.yml
CHANGED
@@ -6,7 +6,7 @@ en:
|
|
6
6
|
announcement: Announcement
|
7
7
|
banner_image: Banner image
|
8
8
|
copy_categories: Copy categories
|
9
|
-
|
9
|
+
copy_components: Copy components
|
10
10
|
copy_steps: Copy steps
|
11
11
|
description: Description
|
12
12
|
developer_group: Developer group
|
@@ -67,15 +67,17 @@ en:
|
|
67
67
|
attachment_files: Files
|
68
68
|
attachments: Attachments
|
69
69
|
categories: Categories
|
70
|
-
|
70
|
+
components: Components
|
71
71
|
info: Info
|
72
72
|
moderations: Moderations
|
73
|
+
private_users: Private Users
|
73
74
|
process_admins: Process users
|
74
75
|
steps: Steps
|
75
76
|
models:
|
76
77
|
participatory_process:
|
77
78
|
fields:
|
78
79
|
created_at: Created at
|
80
|
+
private: Private
|
79
81
|
promoted: Highlighted
|
80
82
|
published: Published
|
81
83
|
title: Title
|
@@ -184,6 +186,8 @@ en:
|
|
184
186
|
title: General Information
|
185
187
|
index:
|
186
188
|
not_published: Not published
|
189
|
+
private: Private
|
190
|
+
public: Public
|
187
191
|
published: Published
|
188
192
|
new:
|
189
193
|
create: Create
|
@@ -276,12 +280,14 @@ en:
|
|
276
280
|
local_area: Organization Area
|
277
281
|
participatory_scope: What is decided
|
278
282
|
participatory_structure: How is it decided
|
283
|
+
private_space: This is a private process
|
279
284
|
scope: Scope
|
280
285
|
start_date: Start date
|
281
286
|
target: Who participates
|
282
287
|
statistics:
|
283
288
|
answers_count: Answers
|
284
289
|
comments_count: Comments
|
290
|
+
debates_count: Debates
|
285
291
|
endorsements_count: Endorsements
|
286
292
|
headline: Activity
|
287
293
|
meetings_count: Meetings
|
data/config/locales/es.yml
CHANGED
@@ -5,7 +5,7 @@ es:
|
|
5
5
|
announcement: Anuncio
|
6
6
|
banner_image: Imagen de banner
|
7
7
|
copy_categories: Copiar categorías
|
8
|
-
|
8
|
+
copy_components: Copiar componentes
|
9
9
|
copy_steps: Copiar las fases
|
10
10
|
description: Descripción
|
11
11
|
developer_group: Grupo promotor
|
@@ -66,15 +66,17 @@ es:
|
|
66
66
|
attachment_files: Archivos
|
67
67
|
attachments: Archivos adjuntos
|
68
68
|
categories: Categorías
|
69
|
-
|
69
|
+
components: Componentes
|
70
70
|
info: Información
|
71
71
|
moderations: Moderaciones
|
72
|
+
private_users: Usuarios privados
|
72
73
|
process_admins: Usuarios del proceso
|
73
74
|
steps: Fases del proceso
|
74
75
|
models:
|
75
76
|
participatory_process:
|
76
77
|
fields:
|
77
78
|
created_at: Fecha de creación
|
79
|
+
private: Privado
|
78
80
|
promoted: Destacado
|
79
81
|
published: Publicada
|
80
82
|
title: Título
|
@@ -183,6 +185,8 @@ es:
|
|
183
185
|
title: Información general
|
184
186
|
index:
|
185
187
|
not_published: No publicado
|
188
|
+
private: Privado
|
189
|
+
public: Público
|
186
190
|
published: Publicada
|
187
191
|
new:
|
188
192
|
create: Crear
|
@@ -275,12 +279,14 @@ es:
|
|
275
279
|
local_area: Área de organización
|
276
280
|
participatory_scope: Qué se decide
|
277
281
|
participatory_structure: Cómo se decide
|
282
|
+
private_space: Este es un proceso privado
|
278
283
|
scope: Ámbito
|
279
284
|
start_date: Fecha de inicio
|
280
285
|
target: Quién participa
|
281
286
|
statistics:
|
282
287
|
answers_count: Respuestas
|
283
288
|
comments_count: Comentarios
|
289
|
+
debates_count: Debates
|
284
290
|
endorsements_count: Adhesiones
|
285
291
|
headline: Actividad
|
286
292
|
meetings_count: Encuentros
|