decidim-assemblies 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/config/decidim_assemblies_manifest.js +1 -0
- data/app/assets/javascripts/decidim/assemblies/admin/assemblies.js.es6 +57 -4
- data/app/assets/javascripts/decidim/assemblies/assemblies.js.es6 +18 -0
- data/app/commands/decidim/assemblies/admin/copy_assembly.rb +9 -9
- data/app/commands/decidim/assemblies/admin/create_assembly.rb +33 -1
- data/app/commands/decidim/assemblies/admin/create_assembly_admin.rb +2 -2
- data/app/commands/decidim/assemblies/admin/update_assembly.rb +31 -1
- data/app/constraints/decidim/assemblies/{current_feature.rb → current_component.rb} +7 -7
- data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb +17 -6
- data/app/controllers/decidim/assemblies/admin/{feature_permissions_controller.rb → component_permissions_controller.rb} +2 -2
- data/app/controllers/decidim/assemblies/admin/{features_controller.rb → components_controller.rb} +2 -2
- data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb +26 -0
- data/app/controllers/decidim/assemblies/assemblies_controller.rb +10 -4
- data/app/controllers/decidim/assemblies/assembly_widgets_controller.rb +1 -1
- data/app/forms/decidim/assemblies/admin/assembly_copy_form.rb +1 -1
- data/app/forms/decidim/assemblies/admin/assembly_form.rb +63 -2
- data/app/helpers/decidim/assemblies/admin/assemblies_helper.rb +20 -0
- data/app/helpers/decidim/assemblies/assemblies_helper.rb +51 -0
- data/app/models/decidim/assemblies/abilities/admin/admin_ability.rb +1 -0
- data/app/models/decidim/assemblies/abilities/admin/assembly_admin_ability.rb +3 -3
- data/app/models/decidim/assemblies/abilities/admin/assembly_moderator_ability.rb +1 -1
- data/app/models/decidim/assembly.rb +102 -2
- data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb +20 -1
- data/app/presenters/decidim/assemblies/assembly_stats_presenter.rb +9 -9
- data/app/presenters/decidim/log/value_types/assembly_presenter.rb +28 -0
- data/app/queries/decidim/assemblies/organization_prioritized_assemblies.rb +3 -2
- data/app/queries/decidim/assemblies/organization_published_assemblies.rb +3 -1
- data/app/queries/decidim/assemblies/visible_assemblies.rb +20 -0
- data/app/views/decidim/assemblies/_assembly.html.erb +1 -1
- data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb +76 -1
- data/app/views/decidim/assemblies/admin/assemblies/edit.html.erb +3 -4
- data/app/views/decidim/assemblies/admin/assemblies/index.html.erb +20 -4
- data/app/views/decidim/assemblies/admin/assemblies/new.html.erb +2 -2
- data/app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb +1 -1
- data/app/views/decidim/assemblies/admin/assembly_copies/new.html.erb +1 -1
- data/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb +1 -1
- data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb +1 -1
- data/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb +1 -1
- data/app/views/decidim/assemblies/assemblies/_nav_breadcumb.html.erb +11 -0
- data/app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb +1 -1
- data/app/views/decidim/assemblies/assemblies/_statistics.html.erb +1 -1
- data/app/views/decidim/assemblies/assemblies/index.html.erb +1 -1
- data/app/views/decidim/assemblies/assemblies/show.html.erb +129 -7
- data/app/views/decidim/assemblies/assembly_widgets/show.html.erb +1 -1
- data/app/views/layouts/decidim/_assembly_header.html.erb +13 -13
- data/app/views/layouts/decidim/admin/assemblies.html.erb +1 -1
- data/app/views/layouts/decidim/admin/assembly.html.erb +15 -10
- data/app/views/layouts/decidim/assembly.html.erb +2 -2
- data/config/locales/ca.yml +71 -1
- data/config/locales/en.yml +71 -1
- data/config/locales/es.yml +71 -1
- data/config/locales/eu.yml +71 -1
- data/config/locales/fi.yml +71 -1
- data/config/locales/fr.yml +88 -18
- data/config/locales/gl.yml +71 -1
- data/config/locales/it.yml +71 -1
- data/config/locales/nl.yml +105 -35
- data/config/locales/pl.yml +71 -1
- data/config/locales/pt-BR.yml +71 -1
- data/config/locales/pt.yml +71 -1
- data/config/locales/ru.yml +0 -1
- data/config/locales/sv.yml +71 -1
- data/config/locales/uk.yml +0 -1
- data/db/migrate/20180124083729_add_private_to_assemblies.rb +7 -0
- data/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb +22 -0
- data/db/migrate/20180302121116_add_fields_to_assemblies.rb +25 -0
- data/lib/decidim/assemblies/admin_engine.rb +11 -5
- data/lib/decidim/assemblies/engine.rb +7 -7
- data/lib/decidim/assemblies/participatory_space.rb +89 -34
- data/lib/decidim/assemblies/test/factories.rb +24 -0
- data/lib/decidim/assemblies/version.rb +1 -1
- metadata +23 -13
@@ -6,7 +6,18 @@
|
|
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("assemblies.show.private_space", scope: "decidim") } %>
|
11
|
+
<% end %>
|
12
|
+
|
9
13
|
<div class="row column">
|
14
|
+
<% if current_participatory_space.parent.present? %>
|
15
|
+
<div class="row">
|
16
|
+
<div class="small-12 columns">
|
17
|
+
<%= render partial: "decidim/assemblies/assemblies/nav_breadcumb", locals: { assemblies: current_participatory_space.ancestors.to_a } %>
|
18
|
+
</div>
|
19
|
+
</div>
|
20
|
+
<% end %>
|
10
21
|
<div class="row">
|
11
22
|
<div class="columns medium-7 mediumlarge-8">
|
12
23
|
<div class="section">
|
@@ -14,9 +25,63 @@
|
|
14
25
|
<%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
|
15
26
|
</div>
|
16
27
|
<%= decidim_sanitize translated_attribute(current_participatory_space.description) %>
|
28
|
+
|
29
|
+
<% if current_participatory_space.private_space? %>
|
30
|
+
<%= assembly_features(current_participatory_space) %>
|
31
|
+
<% end %>
|
17
32
|
</div>
|
33
|
+
|
34
|
+
<% if translated_attribute(current_participatory_space.purpose_of_action).present? ||
|
35
|
+
translated_attribute(current_participatory_space.internal_organisation).present? ||
|
36
|
+
translated_attribute(current_participatory_space.composition).present? %>
|
37
|
+
<div class="show-more">
|
38
|
+
<button class="button button--muted small"><%= t("assemblies.show.read_more", scope: "decidim") %></button>
|
39
|
+
</div>
|
40
|
+
|
41
|
+
<div class="hide show-more-panel">
|
42
|
+
<% if translated_attribute(current_participatory_space.purpose_of_action).present? %>
|
43
|
+
<div class="section">
|
44
|
+
<h4 class="section-heading"><%= t("assemblies.show.purpose_of_action", scope: "decidim") %></h4>
|
45
|
+
<%= decidim_sanitize translated_attribute(current_participatory_space.purpose_of_action) %>
|
46
|
+
</div>
|
47
|
+
<% end %>
|
48
|
+
|
49
|
+
<% if translated_attribute(current_participatory_space.internal_organisation).present? %>
|
50
|
+
<div class="section">
|
51
|
+
<h4 class="section-heading"><%= t("assemblies.show.internal_organisation", scope: "decidim") %></h4>
|
52
|
+
<%= decidim_sanitize translated_attribute(current_participatory_space.internal_organisation) %>
|
53
|
+
</div>
|
54
|
+
<% end %>
|
55
|
+
|
56
|
+
<% if translated_attribute(current_participatory_space.composition).present? %>
|
57
|
+
<div class="section">
|
58
|
+
<h4 class="section-heading"><%= t("assemblies.show.composition", scope: "decidim") %></h4>
|
59
|
+
<%= decidim_sanitize translated_attribute(current_participatory_space.composition) %>
|
60
|
+
</div>
|
61
|
+
<% end %>
|
62
|
+
<div class="section text-center">
|
63
|
+
<div class="hide-more">
|
64
|
+
<button class="button button--muted small"><%= t("assemblies.show.read_less", scope: "decidim") %></button>
|
65
|
+
</div>
|
66
|
+
</div>
|
67
|
+
</div>
|
68
|
+
<% end %>
|
69
|
+
|
70
|
+
<%= render_hook(:assembly_meetings) %>
|
71
|
+
|
18
72
|
<%= attachments_for current_participatory_space %>
|
73
|
+
<% if current_participatory_space.children_count > 0 %>
|
74
|
+
<section id="assemblies-grid" class="section row collapse">
|
75
|
+
<h4 class="section-heading"><%= t("assemblies.show.children", scope: "decidim") %></h4>
|
76
|
+
<div class="row small-up-1 medium-up-2 large-up-3 card-grid">
|
77
|
+
<%= render partial: "decidim/assemblies/assembly", collection: current_participatory_space.children %>
|
78
|
+
</div>
|
79
|
+
</section>
|
80
|
+
<% end %>
|
81
|
+
|
82
|
+
<%= participatory_processes_for_assembly(assembly_participatory_processes) if assembly_participatory_processes.present? %>
|
19
83
|
</div>
|
84
|
+
|
20
85
|
<div class="section columns medium-5 mediumlarge-4 large-3">
|
21
86
|
<div class="card extra">
|
22
87
|
<div class="card__content">
|
@@ -27,28 +92,28 @@
|
|
27
92
|
<% if translated_attribute(current_participatory_space.meta_scope).present? %>
|
28
93
|
<div class="definition-data__item scope">
|
29
94
|
<span class="definition-data__title"><%= t("assemblies.show.scope", scope: "decidim") %></span>
|
30
|
-
|
95
|
+
<%= translated_attribute(current_participatory_space.meta_scope) %>
|
31
96
|
</div>
|
32
97
|
<% end %>
|
33
98
|
|
34
99
|
<% if translated_attribute(current_participatory_space.developer_group).present? %>
|
35
100
|
<div class="definition-data__item developer-group">
|
36
101
|
<span class="definition-data__title"><%= t("assemblies.show.developer_group", scope: "decidim") %></span>
|
37
|
-
|
102
|
+
<%= translated_attribute(current_participatory_space.developer_group) %>
|
38
103
|
</div>
|
39
104
|
<% end %>
|
40
105
|
|
41
106
|
<% if translated_attribute(current_participatory_space.local_area).present? %>
|
42
107
|
<div class="definition-data__item local_area">
|
43
108
|
<span class="definition-data__title"><%= t("assemblies.show.local_area", scope: "decidim") %></span>
|
44
|
-
|
109
|
+
<%= translated_attribute(current_participatory_space.local_area) %>
|
45
110
|
</div>
|
46
111
|
<% end %>
|
47
112
|
|
48
113
|
<% if translated_attribute(current_participatory_space.target).present? %>
|
49
114
|
<div class="definition-data__item target">
|
50
115
|
<span class="definition-data__title"><%= t("assemblies.show.target", scope: "decidim") %></span>
|
51
|
-
|
116
|
+
<%= translated_attribute(current_participatory_space.target) %>
|
52
117
|
</div>
|
53
118
|
<% end %>
|
54
119
|
|
@@ -62,27 +127,84 @@
|
|
62
127
|
<% if translated_attribute(current_participatory_space.participatory_structure).present? %>
|
63
128
|
<div class="definition-data__item participatory_structure">
|
64
129
|
<span class="definition-data__title"><%= t("assemblies.show.participatory_structure", scope: "decidim") %></span>
|
65
|
-
|
130
|
+
<%= translated_attribute(current_participatory_space.participatory_structure) %>
|
66
131
|
</div>
|
67
132
|
<% end %>
|
68
133
|
|
69
134
|
<% if translated_attribute(current_participatory_space.try(:area).try(:name)).present? %>
|
70
135
|
<div class="definition-data__item area">
|
71
136
|
<span class="definition-data__title"><%= t("assemblies.show.area", scope: "decidim") %></span>
|
72
|
-
|
137
|
+
<%= translated_attribute(current_participatory_space.area.area_type.name) %> - <%= translated_attribute(current_participatory_space.area.name) %>
|
73
138
|
</div>
|
74
139
|
<% end %>
|
75
140
|
|
141
|
+
<% if current_participatory_space.assembly_type.presence %>
|
142
|
+
<div class="definition-data__item assembly_type">
|
143
|
+
<span class="definition-data__title"><%= t("assemblies.show.assembly_type", scope: "decidim") %></span>
|
144
|
+
<% if current_participatory_space.assembly_type == "others" %>
|
145
|
+
<%= translated_attribute(current_participatory_space.assembly_type_other) %>
|
146
|
+
<% else %>
|
147
|
+
<%= t("assembly_types.#{current_participatory_space.assembly_type }", scope: "decidim.assemblies") %>
|
148
|
+
<% end %>
|
149
|
+
</div>
|
150
|
+
<% end %>
|
151
|
+
|
152
|
+
<% if current_participatory_space.creation_date.presence %>
|
153
|
+
<div class="definition-data__item creation_date">
|
154
|
+
<span class="definition-data__title"><%= t("assemblies.show.creation_date", scope: "decidim") %></span>
|
155
|
+
<%= l current_participatory_space.creation_date, format: :datepicker %>
|
156
|
+
</div>
|
157
|
+
<% end %>
|
158
|
+
|
159
|
+
<% if current_participatory_space.created_by.presence %>
|
160
|
+
<div class="definition-data__item created_by">
|
161
|
+
<span class="definition-data__title"><%= t("assemblies.show.created_by", scope: "decidim") %></span>
|
162
|
+
<% if current_participatory_space.created_by == "others" %>
|
163
|
+
<%= translated_attribute(current_participatory_space.created_by_other) %>
|
164
|
+
<% else %>
|
165
|
+
<%= t("created_by.#{current_participatory_space.created_by }", scope: "decidim.assemblies") %>
|
166
|
+
<% end %>
|
167
|
+
</div>
|
168
|
+
<% end %>
|
169
|
+
|
170
|
+
<div class="definition-data__item duration">
|
171
|
+
<span class="definition-data__title"><%= t("assemblies.show.duration", scope: "decidim") %></span>
|
172
|
+
<% if current_participatory_space.duration.presence %>
|
173
|
+
<%= l current_participatory_space.duration, format: :datepicker %>
|
174
|
+
<% else %>
|
175
|
+
<%= t("assemblies.show.indefinite_duration", scope: "decidim") %>
|
176
|
+
<% end %>
|
177
|
+
</div>
|
178
|
+
|
179
|
+
<% if current_participatory_space.included_at.presence %>
|
180
|
+
<div class="definition-data__item included_at">
|
181
|
+
<span class="definition-data__title"><%= t("assemblies.show.included_at", scope: "decidim") %></span>
|
182
|
+
<%= l current_participatory_space.included_at, format: :datepicker %>
|
183
|
+
</div>
|
184
|
+
<% end %>
|
185
|
+
|
186
|
+
<% if current_participatory_space.closing_date.presence %>
|
187
|
+
<div class="definition-data__item closing_date">
|
188
|
+
<span class="definition-data__title"><%= t("assemblies.show.closing_date", scope: "decidim") %></span>
|
189
|
+
<%= l current_participatory_space.closing_date, format: :datepicker %>
|
190
|
+
<br />
|
191
|
+
<%= decidim_sanitize translated_attribute(current_participatory_space.closing_date_reason) %>
|
192
|
+
</div>
|
193
|
+
<% end %>
|
194
|
+
|
195
|
+
<%= social_handler_links(current_participatory_space) %>
|
76
196
|
</div>
|
77
197
|
<%= resource_reference(current_participatory_space) %>
|
78
198
|
<%= render partial: "decidim/shared/share_modal" %>
|
79
199
|
<%= embed_modal_for assembly_assembly_widget_url(current_participatory_space, format: :js) %>
|
80
200
|
</div>
|
81
201
|
</div>
|
202
|
+
|
82
203
|
<% if current_participatory_space.show_statistics? %>
|
83
|
-
<%= render partial:
|
204
|
+
<%= render partial: "statistics" %>
|
84
205
|
<% end %>
|
85
206
|
</div>
|
86
207
|
|
87
208
|
<%= javascript_include_tag "decidim/proposals/social_share" %>
|
88
209
|
<%= stylesheet_link_tag "decidim/proposals/social_share" %>
|
210
|
+
<%= javascript_include_tag "decidim/assemblies/assemblies" %>
|
@@ -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
|
<span class="card--process__small"></span>
|
@@ -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) %>
|
@@ -21,15 +21,15 @@
|
|
21
21
|
</div>
|
22
22
|
</div>
|
23
23
|
</div>
|
24
|
-
<% if current_participatory_space.
|
24
|
+
<% if current_participatory_space.components.any? %>
|
25
25
|
<div class="row column">
|
26
26
|
<div class="process-nav">
|
27
|
-
<button class="process-nav__trigger hide-for-medium"
|
28
|
-
<%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(
|
27
|
+
<button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
|
28
|
+
<%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
|
29
29
|
<div class="process-nav__link">
|
30
|
-
<%
|
31
|
-
<%=
|
32
|
-
<%= translated_attribute(
|
30
|
+
<% if self.try(:current_component) %>
|
31
|
+
<%= component_icon(current_component) %>
|
32
|
+
<%= translated_attribute(current_component.name) %>
|
33
33
|
<% else %>
|
34
34
|
<%= icon "assembly" %>
|
35
35
|
<%= t ".assembly_menu_item" %>
|
@@ -45,13 +45,13 @@
|
|
45
45
|
<% end %>
|
46
46
|
</li>
|
47
47
|
|
48
|
-
<% current_participatory_space.
|
49
|
-
<% if
|
50
|
-
<li class="<%= "is-active" if is_active_link?(
|
51
|
-
<%= active_link_to
|
52
|
-
<%=
|
48
|
+
<% current_participatory_space.components.each do |component| %>
|
49
|
+
<% if component.published? || component == self.try(:current_component) %>
|
50
|
+
<li class="<%= "is-active" if is_active_link?(main_component_path(component), :inclusive) %>">
|
51
|
+
<%= active_link_to main_component_path(component), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
|
52
|
+
<%= component_icon(component) %>
|
53
53
|
|
54
|
-
<%= translated_attribute(
|
54
|
+
<%= translated_attribute(component.name) %>
|
55
55
|
<% end %>
|
56
56
|
</li>
|
57
57
|
<% end %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<%= t "decidim.admin.titles.assemblies" %>
|
5
5
|
</div>
|
6
6
|
<div class="secondary-nav__actions">
|
7
|
-
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly.name", scope: "decidim.admin")),
|
7
|
+
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly.name", scope: "decidim.admin")), new_assembly_path(parent_id: parent_assembly&.id), class: "button expanded small" if can? :create, Decidim::Assembly %>
|
8
8
|
</div>
|
9
9
|
</div>
|
10
10
|
<% end %>
|
@@ -6,17 +6,17 @@
|
|
6
6
|
<%= aria_selected_link_to t("info", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.edit_assembly_path(current_participatory_space) %>
|
7
7
|
</li>
|
8
8
|
<% end %>
|
9
|
-
<% if can? :read, Decidim::
|
10
|
-
<li <% if is_active_link?(decidim_admin_assemblies.
|
11
|
-
<%= aria_selected_link_to t("
|
9
|
+
<% if can? :read, Decidim::Component %>
|
10
|
+
<li <% if is_active_link?(decidim_admin_assemblies.components_path(current_participatory_space)) %> class="is-active" <% end %>>
|
11
|
+
<%= aria_selected_link_to t("components", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.components_path(current_participatory_space) %>
|
12
12
|
<ul>
|
13
|
-
<% current_participatory_space.
|
14
|
-
<% if
|
15
|
-
<li <% if is_active_link?(
|
16
|
-
<%= link_to
|
17
|
-
<%= translated_attribute
|
18
|
-
<% if
|
19
|
-
<span class="component-counter <%= "component-counter--off" if
|
13
|
+
<% current_participatory_space.components.each do |component| %>
|
14
|
+
<% if component.manifest.admin_engine %>
|
15
|
+
<li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_assemblies.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_assemblies.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
|
16
|
+
<%= link_to manage_component_path(component) do %>
|
17
|
+
<%= translated_attribute component.name %>
|
18
|
+
<% if component.primary_stat.present? %>
|
19
|
+
<span class="component-counter <%= "component-counter--off" if component.primary_stat.zero? %>"><%= component.primary_stat %></span>
|
20
20
|
<% end %>
|
21
21
|
<% end %>
|
22
22
|
</li>
|
@@ -52,6 +52,11 @@
|
|
52
52
|
<%= aria_selected_link_to t("assembly_admins", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space) %>
|
53
53
|
</li>
|
54
54
|
<% end %>
|
55
|
+
<% if can? :read, Decidim::ParticipatorySpacePrivateUser %>
|
56
|
+
<li <% if is_active_link?(decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space)) %> class="is-active" <% end %>>
|
57
|
+
<%= aria_selected_link_to t("private_users", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space) %>
|
58
|
+
</li>
|
59
|
+
<% end %>
|
55
60
|
<% if can? :read, Decidim::Moderation %>
|
56
61
|
<li <% if is_active_link?(decidim_admin_assemblies.moderations_path(current_participatory_space)) %> class="is-active" <% end %>>
|
57
62
|
<%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.moderations_path(current_participatory_space) %>
|
@@ -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
@@ -3,22 +3,40 @@ ca:
|
|
3
3
|
attributes:
|
4
4
|
assembly:
|
5
5
|
area_id: Àrea
|
6
|
+
assembly_type: Tipus d'assemblea
|
7
|
+
assembly_type_other: Altre tipus d'assemblea
|
6
8
|
banner_image: Imatge de bàner
|
9
|
+
closing_date: Data de finalització
|
10
|
+
closing_date_reason: Raó de la data de tancament
|
11
|
+
composition: Composició
|
7
12
|
copy_categories: Copiar categories
|
13
|
+
copy_components: Copiar components
|
8
14
|
copy_features: Copiar funcionalitats
|
15
|
+
created_by: Creat per
|
16
|
+
created_by_other: Creat per un altre
|
17
|
+
creation_date: Data de creació
|
9
18
|
decidim_area_id: Àrea
|
10
19
|
decidim_scope_id: Abast
|
11
20
|
description: Descripció
|
12
21
|
developer_group: Grup promotor
|
13
22
|
domain: Àrees municipals
|
23
|
+
duration: Durada
|
24
|
+
facebook: Facebook
|
25
|
+
github: GitHub
|
14
26
|
hashtag: Hashtag
|
15
27
|
hero_image: Imatge de portada
|
28
|
+
included_at: Inclòs a
|
29
|
+
instagram: Instagram
|
30
|
+
internal_organisation: Organització interna
|
31
|
+
is_transparent: És transparent
|
16
32
|
local_area: Àrea municipal
|
17
33
|
meta_scope: Metadades d'àmbit
|
34
|
+
participatory_processes_ids: Processos participatius relacionats
|
18
35
|
participatory_scope: Àmbit participatiu
|
19
36
|
participatory_structure: Estructura participativa
|
20
37
|
promoted: Destacat
|
21
38
|
published_at: Publicat el
|
39
|
+
purpose_of_action: Propòsit de l'acció
|
22
40
|
scope_id: Àmbit
|
23
41
|
scopes_enabled: Àmbit habilitat
|
24
42
|
short_description: Descripció breu
|
@@ -27,6 +45,12 @@ ca:
|
|
27
45
|
subtitle: Subtítol
|
28
46
|
target: A qui va dirigit?
|
29
47
|
title: Títol
|
48
|
+
twitter: Twitter
|
49
|
+
youtube: YouTube
|
50
|
+
assembly_user_role:
|
51
|
+
email: Correu electrònic
|
52
|
+
name: Nom
|
53
|
+
role: Rol
|
30
54
|
decidim:
|
31
55
|
admin:
|
32
56
|
assemblies:
|
@@ -41,6 +65,8 @@ ca:
|
|
41
65
|
title: Informació general
|
42
66
|
index:
|
43
67
|
not_published: No publicada
|
68
|
+
private: Privat
|
69
|
+
public: Públic
|
44
70
|
published: Publicat
|
45
71
|
new:
|
46
72
|
create: Crear
|
@@ -89,13 +115,15 @@ ca:
|
|
89
115
|
attachment_files: Fitxers
|
90
116
|
attachments: Adjunts
|
91
117
|
categories: Categories
|
92
|
-
|
118
|
+
components: Components
|
93
119
|
info: Informació
|
94
120
|
moderations: Moderacions
|
121
|
+
private_users: Usuaris privats
|
95
122
|
models:
|
96
123
|
assembly:
|
97
124
|
fields:
|
98
125
|
created_at: Data de creació
|
126
|
+
private: Privat
|
99
127
|
promoted: Destacat
|
100
128
|
published: Publicat
|
101
129
|
title: Títol
|
@@ -126,11 +154,26 @@ ca:
|
|
126
154
|
admin:
|
127
155
|
assemblies:
|
128
156
|
form:
|
157
|
+
select_a_created_by: Selecciona un creador
|
129
158
|
select_an_area: Selecciona una àrea
|
159
|
+
select_an_assembly_type: Seleccioneu un tipus d'assemblea
|
130
160
|
slug_help: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
|
161
|
+
social_handlers: Social
|
131
162
|
assembly_copies:
|
132
163
|
form:
|
133
164
|
slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
|
165
|
+
assembly_types:
|
166
|
+
commission: Comissió
|
167
|
+
consultative_advisory: Consultiva / assessora
|
168
|
+
executive: Executiva
|
169
|
+
government: Govern
|
170
|
+
others: Altres
|
171
|
+
participatory: Participativa
|
172
|
+
working_group: Grup de treball
|
173
|
+
created_by:
|
174
|
+
city_council: Ajuntament
|
175
|
+
others: Altres
|
176
|
+
public: Públic
|
134
177
|
index:
|
135
178
|
title: Assemblees
|
136
179
|
pages:
|
@@ -140,16 +183,36 @@ ca:
|
|
140
183
|
see_all_assemblies: Veure totes les assemblees
|
141
184
|
show:
|
142
185
|
area: Àrea
|
186
|
+
assembly_type: Tipus d'assemblea
|
187
|
+
children: Assemblees
|
188
|
+
closing_date: Data de finalització
|
189
|
+
composition: Composició
|
190
|
+
created_by: Creat per
|
191
|
+
creation_date: Data de creació
|
143
192
|
developer_group: Grup promotor
|
193
|
+
duration: Durada
|
194
|
+
included_at: Inclòs a
|
195
|
+
indefinite_duration: Indefinida
|
196
|
+
internal_organisation: Organització interna
|
197
|
+
is_transparent:
|
198
|
+
'false': opaca
|
199
|
+
'true': transparent
|
144
200
|
local_area: Àrea municipal
|
145
201
|
participatory_scope: Àmbit participatiu
|
146
202
|
participatory_structure: Estructura participativa
|
203
|
+
private_space: Aquesta és una assemblea privada
|
204
|
+
purpose_of_action: Propòsit de l'acció
|
205
|
+
read_less: Llegir menys
|
206
|
+
read_more: Llegir més
|
207
|
+
related_participatory_processes: Processos participatius relacionats
|
147
208
|
scope: Àmbit
|
209
|
+
social_networks: Xarxes socials
|
148
210
|
target: A qui va dirigit
|
149
211
|
statistics:
|
150
212
|
answers_count: Respostes
|
151
213
|
assemblies_count: Assemblees
|
152
214
|
comments_count: Comentaris
|
215
|
+
debates_count: Debats
|
153
216
|
endorsements_count: Adhesions
|
154
217
|
headline: Activitat
|
155
218
|
meetings_count: Trobades presencials
|
@@ -161,8 +224,15 @@ ca:
|
|
161
224
|
surveys_count: Enquestes
|
162
225
|
users_count: Participants
|
163
226
|
votes_count: Suports
|
227
|
+
log:
|
228
|
+
value_types:
|
229
|
+
assembly_presenter:
|
230
|
+
not_found: 'L''assemblea no s''ha trobada a la base de dades (ID: %{id})'
|
164
231
|
menu:
|
165
232
|
assemblies: Assemblees
|
233
|
+
errors:
|
234
|
+
messages:
|
235
|
+
cannot_be_blank: no es pot deixar en blanc
|
166
236
|
layouts:
|
167
237
|
decidim:
|
168
238
|
assemblies:
|
data/config/locales/en.yml
CHANGED
@@ -4,22 +4,40 @@ en:
|
|
4
4
|
attributes:
|
5
5
|
assembly:
|
6
6
|
area_id: Area
|
7
|
+
assembly_type: Assembly type
|
8
|
+
assembly_type_other: Assembly type other
|
7
9
|
banner_image: Banner image
|
10
|
+
closing_date: Closing date
|
11
|
+
closing_date_reason: Closing date reason
|
12
|
+
composition: Composition
|
8
13
|
copy_categories: Copy categories
|
14
|
+
copy_components: Copy components
|
9
15
|
copy_features: Copy features
|
16
|
+
created_by: Created by
|
17
|
+
created_by_other: Created by other
|
18
|
+
creation_date: Date created
|
10
19
|
decidim_area_id: Area
|
11
20
|
decidim_scope_id: Scope
|
12
21
|
description: Description
|
13
22
|
developer_group: Developer group
|
14
23
|
domain: Domain
|
24
|
+
duration: Duration
|
25
|
+
facebook: Facebook
|
26
|
+
github: GitHub
|
15
27
|
hashtag: Hashtag
|
16
28
|
hero_image: Home image
|
29
|
+
included_at: Included at
|
30
|
+
instagram: Instagram
|
31
|
+
internal_organisation: Internal organisation
|
32
|
+
is_transparent: Is transparent
|
17
33
|
local_area: Local area
|
18
34
|
meta_scope: Scope metadata
|
35
|
+
participatory_processes_ids: Related Participatory processes
|
19
36
|
participatory_scope: Participatory scope
|
20
37
|
participatory_structure: Participatory structure
|
21
38
|
promoted: Promoted
|
22
39
|
published_at: Published at
|
40
|
+
purpose_of_action: Purpose of action
|
23
41
|
scope_id: Scope
|
24
42
|
scopes_enabled: Scopes enabled
|
25
43
|
short_description: Short description
|
@@ -28,6 +46,12 @@ en:
|
|
28
46
|
subtitle: Subtitle
|
29
47
|
target: Target
|
30
48
|
title: Title
|
49
|
+
twitter: Twitter
|
50
|
+
youtube: YouTube
|
51
|
+
assembly_user_role:
|
52
|
+
email: Email
|
53
|
+
name: Name
|
54
|
+
role: Role
|
31
55
|
decidim:
|
32
56
|
admin:
|
33
57
|
assemblies:
|
@@ -42,6 +66,8 @@ en:
|
|
42
66
|
title: General Information
|
43
67
|
index:
|
44
68
|
not_published: Not published
|
69
|
+
private: Private
|
70
|
+
public: Public
|
45
71
|
published: Published
|
46
72
|
new:
|
47
73
|
create: Create
|
@@ -90,13 +116,15 @@ en:
|
|
90
116
|
attachment_files: Files
|
91
117
|
attachments: Attachments
|
92
118
|
categories: Categories
|
93
|
-
|
119
|
+
components: Components
|
94
120
|
info: Info
|
95
121
|
moderations: Moderations
|
122
|
+
private_users: Private Users
|
96
123
|
models:
|
97
124
|
assembly:
|
98
125
|
fields:
|
99
126
|
created_at: Created at
|
127
|
+
private: Private
|
100
128
|
promoted: Highlighted
|
101
129
|
published: Published
|
102
130
|
title: Title
|
@@ -127,11 +155,26 @@ en:
|
|
127
155
|
admin:
|
128
156
|
assemblies:
|
129
157
|
form:
|
158
|
+
select_a_created_by: Select a created by
|
130
159
|
select_an_area: Select an Area
|
160
|
+
select_an_assembly_type: Select an assembly type
|
131
161
|
slug_help: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
|
162
|
+
social_handlers: Social
|
132
163
|
assembly_copies:
|
133
164
|
form:
|
134
165
|
slug_help: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
|
166
|
+
assembly_types:
|
167
|
+
commission: Comission
|
168
|
+
consultative_advisory: Consultative/Advisory
|
169
|
+
executive: Executive
|
170
|
+
government: Government
|
171
|
+
others: Others
|
172
|
+
participatory: Participatory
|
173
|
+
working_group: Working group
|
174
|
+
created_by:
|
175
|
+
city_council: City Council
|
176
|
+
others: Others
|
177
|
+
public: Public
|
135
178
|
index:
|
136
179
|
title: Assemblies
|
137
180
|
pages:
|
@@ -141,16 +184,36 @@ en:
|
|
141
184
|
see_all_assemblies: See all assemblies
|
142
185
|
show:
|
143
186
|
area: Area
|
187
|
+
assembly_type: Assembly type
|
188
|
+
children: Assemblies
|
189
|
+
closing_date: Closing date
|
190
|
+
composition: Composition
|
191
|
+
created_by: Created by
|
192
|
+
creation_date: Date created
|
144
193
|
developer_group: Developer group
|
194
|
+
duration: Duration
|
195
|
+
included_at: Included at
|
196
|
+
indefinite_duration: Indefinite
|
197
|
+
internal_organisation: Internal organisation
|
198
|
+
is_transparent:
|
199
|
+
'false': opaque
|
200
|
+
'true': transparent
|
145
201
|
local_area: Local area
|
146
202
|
participatory_scope: Participatory scope
|
147
203
|
participatory_structure: Participatory structure
|
204
|
+
private_space: This is a private assembly
|
205
|
+
purpose_of_action: Purpose of action
|
206
|
+
read_less: Read less
|
207
|
+
read_more: Read more
|
208
|
+
related_participatory_processes: Related participatory processes
|
148
209
|
scope: Scope
|
210
|
+
social_networks: Social Networks
|
149
211
|
target: Target
|
150
212
|
statistics:
|
151
213
|
answers_count: Answers
|
152
214
|
assemblies_count: Assemblies
|
153
215
|
comments_count: Comments
|
216
|
+
debates_count: Debates
|
154
217
|
endorsements_count: Endorsements
|
155
218
|
headline: Activity
|
156
219
|
meetings_count: Meetings
|
@@ -162,8 +225,15 @@ en:
|
|
162
225
|
surveys_count: Surveys
|
163
226
|
users_count: Participants
|
164
227
|
votes_count: Votes
|
228
|
+
log:
|
229
|
+
value_types:
|
230
|
+
assembly_presenter:
|
231
|
+
not_found: 'The assembly was not found on the database (ID: %{id})'
|
165
232
|
menu:
|
166
233
|
assemblies: Assemblies
|
234
|
+
errors:
|
235
|
+
messages:
|
236
|
+
cannot_be_blank: can not be blank
|
167
237
|
layouts:
|
168
238
|
decidim:
|
169
239
|
assemblies:
|