decidim-initiatives 0.9.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 +16 -16
- data/Rakefile +1 -1
- data/app/assets/javascripts/decidim/initiatives/admin/invite_users.js +7 -8
- data/app/assets/javascripts/decidim/initiatives/application.js +1 -1
- data/app/assets/javascripts/decidim/initiatives/identity_selector_dialog.js +6 -9
- data/app/assets/javascripts/decidim/initiatives/scoped_type.js +8 -12
- data/app/assets/stylesheet/decidim/initiatives/admin.css.scss +10 -11
- data/app/assets/stylesheet/decidim/initiatives/application.css.scss +19 -19
- data/app/assets/stylesheet/decidim/initiatives/popularity_item.css.scss +40 -24
- data/app/assets/stylesheet/decidim/initiatives/print-initiative.css.scss +26 -26
- data/app/assets/stylesheet/decidim/initiatives/social_share.css.scss +5 -4
- data/app/assets/stylesheet/decidim/initiatives/statistics.css.scss +4 -4
- data/app/commands/decidim/initiatives/admin/create_initiative_type.rb +1 -4
- data/app/commands/decidim/initiatives/admin/publish_initiative.rb +44 -0
- data/app/commands/decidim/initiatives/admin/send_initiative_to_technical_validation.rb +42 -0
- data/app/commands/decidim/initiatives/admin/unpublish_initiative.rb +44 -0
- data/app/commands/decidim/initiatives/admin/update_initiative.rb +9 -7
- data/app/commands/decidim/initiatives/admin/update_initiative_type.rb +1 -4
- data/app/commands/decidim/initiatives/create_initiative.rb +23 -13
- data/app/commands/decidim/initiatives/spawn_committee_request.rb +1 -1
- data/app/constraints/decidim/initiatives/current_component.rb +28 -0
- data/app/constraints/decidim/initiatives/current_initiative.rb +2 -2
- data/app/controllers/concerns/decidim/initiatives/action_authorization.rb +1 -1
- data/app/controllers/concerns/decidim/initiatives/admin/initiative_admin.rb +1 -3
- data/app/controllers/concerns/decidim/initiatives/orderable.rb +6 -6
- data/app/controllers/concerns/decidim/initiatives/type_selector_options.rb +1 -1
- data/app/controllers/decidim/initiatives/admin/application_controller.rb +1 -1
- data/app/controllers/decidim/initiatives/admin/{feature_permissions_controller.rb → component_permissions_controller.rb} +2 -2
- data/app/controllers/decidim/initiatives/admin/components_controller.rb +15 -0
- data/app/controllers/decidim/initiatives/admin/initiatives_controller.rb +29 -18
- data/app/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller.rb +6 -6
- data/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb +7 -7
- data/app/controllers/decidim/initiatives/committee_requests_controller.rb +2 -3
- data/app/controllers/decidim/initiatives/create_initiative_controller.rb +5 -9
- data/app/controllers/decidim/initiatives/initiative_votes_controller.rb +3 -3
- data/app/controllers/decidim/initiatives/initiatives_controller.rb +0 -1
- data/app/forms/decidim/initiatives/admin/initiative_form.rb +1 -1
- data/app/forms/decidim/initiatives/admin/initiative_type_scope_form.rb +3 -2
- data/app/helpers/decidim/initiatives/create_initiative_helper.rb +7 -7
- data/app/helpers/decidim/initiatives/initiative_helper.rb +36 -29
- data/app/helpers/decidim/initiatives/initiatives_helper.rb +1 -1
- data/app/mailers/decidim/initiatives/initiatives_mailer.rb +18 -16
- data/app/models/decidim/initiative.rb +15 -7
- data/app/models/decidim/initiatives/abilities/admin/attachments_ability.rb +1 -0
- data/app/models/decidim/initiatives/abilities/admin/{features_ability.rb → components_ability.rb} +2 -3
- data/app/models/decidim/initiatives_vote.rb +3 -3
- data/app/presenters/decidim/initiatives/admin_log/initiative_presenter.rb +49 -0
- data/app/presenters/decidim/initiatives/initiative_stats_presenter.rb +4 -4
- data/app/queries/decidim/initiatives/admin/manageable_initiatives.rb +8 -8
- data/app/queries/decidim/initiatives/freetext_initiative_types.rb +1 -1
- data/app/queries/decidim/initiatives/initiatives_created.rb +1 -1
- data/app/queries/decidim/initiatives/initiatives_promoted.rb +3 -3
- data/app/queries/decidim/initiatives/outdated_validating_initiatives.rb +3 -3
- data/app/queries/decidim/initiatives/support_period_finished_initiatives.rb +3 -3
- data/app/services/decidim/initiatives/initiative_search.rb +5 -5
- data/app/services/decidim/initiatives/progress_notifier.rb +1 -1
- data/app/services/decidim/initiatives/status_change_notifier.rb +3 -9
- data/app/views/decidim/initiatives/_initiative.html.erb +11 -11
- data/app/views/decidim/initiatives/admin/committee_requests/index.html.erb +14 -14
- data/app/views/decidim/initiatives/admin/initiatives/_form.html.erb +5 -5
- data/app/views/decidim/initiatives/admin/initiatives/edit.html.erb +25 -25
- data/app/views/decidim/initiatives/admin/initiatives/index.html.erb +31 -31
- data/app/views/decidim/initiatives/admin/initiatives/show.html.erb +7 -8
- data/app/views/decidim/initiatives/admin/initiatives_type_scopes/_form.html.erb +1 -3
- data/app/views/decidim/initiatives/admin/initiatives_type_scopes/edit.html.erb +8 -8
- data/app/views/decidim/initiatives/admin/initiatives_type_scopes/new.html.erb +5 -5
- data/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb +2 -2
- data/app/views/decidim/initiatives/admin/initiatives_types/_initiative_type_scopes.html.erb +9 -9
- data/app/views/decidim/initiatives/admin/initiatives_types/edit.html.erb +8 -8
- data/app/views/decidim/initiatives/admin/initiatives_types/index.html.erb +3 -3
- data/app/views/decidim/initiatives/admin/initiatives_types/new.html.erb +3 -3
- data/app/views/decidim/initiatives/committee_requests/new.html.erb +13 -13
- data/app/views/decidim/initiatives/create_initiative/_finish_help.html.erb +7 -0
- data/app/views/decidim/initiatives/create_initiative/_share_committee_link.html.erb +4 -4
- data/app/views/decidim/initiatives/create_initiative/fill_data.html.erb +8 -8
- data/app/views/decidim/initiatives/create_initiative/finish.html.erb +10 -10
- data/app/views/decidim/initiatives/create_initiative/previous_form.html.erb +9 -9
- data/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb +8 -8
- data/app/views/decidim/initiatives/create_initiative/select_initiative_type.html.erb +9 -10
- data/app/views/decidim/initiatives/create_initiative/show_similar_initiatives.html.erb +7 -7
- data/app/views/decidim/initiatives/initiative_votes/update_buttons_and_counters.js.erb +2 -2
- data/app/views/decidim/initiatives/initiative_widgets/show.html.erb +1 -1
- data/app/views/decidim/initiatives/initiatives/_author.html.erb +3 -3
- data/app/views/decidim/initiatives/initiatives/_count.html.erb +1 -1
- data/app/views/decidim/initiatives/initiatives/_filters.html.erb +11 -11
- data/app/views/decidim/initiatives/initiatives/_filters_small_view.html.erb +5 -5
- data/app/views/decidim/initiatives/initiatives/_index_header.html.erb +1 -1
- data/app/views/decidim/initiatives/initiatives/_initiative_badge.html.erb +1 -1
- data/app/views/decidim/initiatives/initiatives/_initiatives.html.erb +2 -2
- data/app/views/decidim/initiatives/initiatives/_result.html.erb +4 -4
- data/app/views/decidim/initiatives/initiatives/_statistics.html.erb +5 -5
- data/app/views/decidim/initiatives/initiatives/_supports.html.erb +1 -1
- data/app/views/decidim/initiatives/initiatives/_supports_count.html.erb +1 -2
- data/app/views/decidim/initiatives/initiatives/_tags.html.erb +2 -2
- data/app/views/decidim/initiatives/initiatives/_vote_button.html.erb +3 -3
- data/app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb +3 -3
- data/app/views/decidim/initiatives/initiatives/_votes_count.html.erb +2 -2
- data/app/views/decidim/initiatives/initiatives/index.html.erb +8 -8
- data/app/views/decidim/initiatives/initiatives/index.js.erb +2 -2
- data/app/views/decidim/initiatives/initiatives/show.html.erb +21 -21
- data/app/views/decidim/initiatives/initiatives/signature_identities.html.erb +6 -6
- data/app/views/decidim/initiatives/initiatives_mailer/_initiative_link.html.erb +2 -2
- data/app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb +6 -6
- data/app/views/decidim/initiatives/initiatives_mailer/notify_progress.html.erb +2 -2
- data/app/views/decidim/initiatives/initiatives_mailer/notify_state_change.html.erb +2 -2
- data/app/views/decidim/initiatives/initiatives_mailer/notify_validating_request.html.erb +2 -2
- data/app/views/decidim/initiatives/initiatives_type_scopes/search.html.erb +1 -1
- data/app/views/layouts/decidim/_initiative_creation_header.html.erb +3 -4
- data/app/views/layouts/decidim/_initiative_header.html.erb +21 -21
- data/app/views/layouts/decidim/_initiative_header_steps.html.erb +1 -1
- data/app/views/layouts/decidim/admin/initiative.html.erb +15 -15
- data/app/views/layouts/decidim/admin/initiatives.html.erb +4 -4
- data/app/views/layouts/decidim/initiative.html.erb +2 -2
- data/app/views/layouts/decidim/initiative_creation.html.erb +4 -6
- data/config/locales/ca.yml +243 -246
- data/config/locales/en.yml +218 -222
- data/config/locales/es.yml +243 -246
- data/config/locales/eu.yml +322 -0
- data/config/locales/fi.yml +322 -0
- data/config/locales/fr.yml +322 -0
- data/config/locales/gl.yml +322 -0
- data/config/locales/it.yml +322 -0
- data/config/locales/nl.yml +322 -0
- data/config/locales/pl.yml +328 -0
- data/config/locales/pt-BR.yml +322 -0
- data/config/locales/pt.yml +322 -0
- data/config/locales/ru.yml +5 -0
- data/config/locales/sv.yml +322 -0
- data/config/locales/uk.yml +5 -0
- data/db/migrate/20170906091626_create_decidim_initiatives_types.rb +1 -1
- data/db/migrate/20170906094044_create_decidim_initiatives.rb +3 -3
- data/db/migrate/20170922152432_create_decidim_initiatives_committee_members.rb +2 -2
- data/db/migrate/20170927153744_change_signature_interval_to_optional.rb +2 -0
- data/db/migrate/20170928160302_add_decidim_user_group_id_to_decidim_initiatives_votes.rb +2 -0
- data/db/migrate/20170928160912_remove_scope_from_decidim_initiatives_votes.rb +2 -0
- data/db/migrate/20171011110714_add_banner_image_to_initiative_type.rb +2 -0
- data/db/migrate/20171011152425_add_hashtag_to_initiatives.rb +2 -0
- data/db/migrate/20171013090432_add_initiative_supports_count_to_initiative.rb +7 -1
- data/db/migrate/20171017090551_create_decidim_initiatives_decidim_initiatives_type_scopes.rb +4 -2
- data/db/migrate/20171017091458_remove_supports_required_from_decidim_initiatives_types.rb +2 -0
- data/db/migrate/20171017091734_add_scopes_for_all_initiative_types.rb +29 -5
- data/db/migrate/20171017094911_add_scoped_type_to_initiative.rb +2 -0
- data/db/migrate/20171017095143_update_initiative_scoped_type.rb +47 -4
- data/db/migrate/20171017103029_remove_unused_attributes_from_initiative.rb +2 -0
- data/db/migrate/20171019103358_add_initiative_notification_dates.rb +2 -0
- data/db/migrate/20171023075942_create_initiative_extra_data.rb +2 -0
- data/db/migrate/20171023122747_create_static_pages.rb +15 -6
- data/db/migrate/20171023141639_optional_validation_support.rb +2 -0
- data/db/migrate/20171031183855_add_offline_votes_to_initiative.rb +2 -0
- data/db/migrate/20171102094250_drop_initiative_description_index.rb +2 -0
- data/db/migrate/20171102094556_create_initiative_description_index.rb +4 -2
- data/db/migrate/20171109132011_enable_pg_extensions.rb +5 -5
- data/db/migrate/20171204094639_drop_decidim_initiatives_extra_data.rb +2 -0
- data/db/migrate/20171204103119_remove_requires_validation_from_decidim_initiatives_type.rb +2 -0
- data/db/migrate/20171214161410_add_unique_on_votes.rb +10 -9
- data/lib/decidim/initiatives.rb +2 -2
- data/lib/decidim/initiatives/admin_engine.rb +26 -26
- data/lib/decidim/initiatives/current_locale.rb +1 -1
- data/lib/decidim/initiatives/engine.rb +5 -5
- data/lib/decidim/initiatives/initiative_slug.rb +2 -3
- data/lib/decidim/initiatives/participatory_space.rb +19 -17
- data/lib/decidim/initiatives/test/factories.rb +2 -7
- data/lib/decidim/initiatives/version.rb +3 -1
- data/lib/tasks/decidim_initiatives.rake +2 -0
- metadata +57 -90
- data/LICENSE-AGPLv3.txt +0 -661
- data/app/constraints/decidim/initiatives/current_feature.rb +0 -28
- data/app/controllers/decidim/initiatives/admin/features_controller.rb +0 -16
- data/app/helpers/decidim/initiatives/partial_translations_helper.rb +0 -28
- data/app/views/decidim/initiatives/create_initiative/_compare_help.ca.html.erb +0 -2
- data/app/views/decidim/initiatives/create_initiative/_compare_help.en.html.erb +0 -2
- data/app/views/decidim/initiatives/create_initiative/_compare_help.es.html.erb +0 -2
- data/app/views/decidim/initiatives/create_initiative/_finish_help.ca.html.erb +0 -19
- data/app/views/decidim/initiatives/create_initiative/_finish_help.en.html.erb +0 -20
- data/app/views/decidim/initiatives/create_initiative/_finish_help.es.html.erb +0 -19
@@ -1,15 +1,15 @@
|
|
1
|
-
<%= decidim_form_for(@form, html: { class:
|
2
|
-
<%= render partial:
|
1
|
+
<%= decidim_form_for(@form, html: { class: "form edit_initiative_type" }) do |f| %>
|
2
|
+
<%= render partial: "form", object: f %>
|
3
3
|
<div class="button--double form-general-submit">
|
4
|
-
<%= f.submit t(
|
4
|
+
<%= f.submit t(".update"), class: "button" %>
|
5
5
|
|
6
6
|
<% if can? :destroy, current_initiative_type %>
|
7
|
-
<%= link_to t(
|
7
|
+
<%= link_to t(".destroy"), current_initiative_type,
|
8
8
|
method: :delete,
|
9
|
-
class:
|
10
|
-
data: { confirm: t(
|
9
|
+
class: "alert button",
|
10
|
+
data: { confirm: t(".confirm_destroy") } %>
|
11
11
|
<% end %>
|
12
12
|
</div>
|
13
|
-
<br
|
14
|
-
<%= render partial:
|
13
|
+
<br />
|
14
|
+
<%= render partial: "initiative_type_scopes", locals: { initiative_type: current_initiative_type } %>
|
15
15
|
<% end %>
|
@@ -3,8 +3,8 @@
|
|
3
3
|
<h2 class="card-title">
|
4
4
|
<%= t "decidim.admin.titles.initiatives_types" %>
|
5
5
|
<%= link_to t("actions.new", scope: "decidim.admin", name: t("models.initiatives_types.name", scope: "decidim.admin")),
|
6
|
-
[
|
7
|
-
class:
|
6
|
+
["new", "initiatives_type"],
|
7
|
+
class: "button tiny button--title" if can? :create, Decidim::InitiativesType %>
|
8
8
|
</h2>
|
9
9
|
</div>
|
10
10
|
<div class="card-section">
|
@@ -25,7 +25,7 @@
|
|
25
25
|
<% else %>
|
26
26
|
<%= translated_attribute initiative_type.title %></td>
|
27
27
|
<% end %>
|
28
|
-
<td><%=l initiative_type.created_at, format: :short %></td>
|
28
|
+
<td><%= l initiative_type.created_at, format: :short %></td>
|
29
29
|
<% end %>
|
30
30
|
</tbody>
|
31
31
|
</table>
|
@@ -1,11 +1,11 @@
|
|
1
1
|
<h2 class="process-title-summary">
|
2
|
-
<%=t
|
2
|
+
<%= t ".title" %>
|
3
3
|
</h2>
|
4
4
|
|
5
5
|
<%= decidim_form_for(@form, html: { class: "form new_initiatives_types" }) do |f| %>
|
6
|
-
<%= render partial:
|
6
|
+
<%= render partial: "form", object: f %>
|
7
7
|
|
8
8
|
<div class="button--double form-general-submit">
|
9
|
-
<%= f.submit t(
|
9
|
+
<%= f.submit t(".create") %>
|
10
10
|
</div>
|
11
11
|
<% end %>
|
@@ -1,37 +1,37 @@
|
|
1
1
|
<% add_decidim_meta_tags({
|
2
2
|
image_url: current_initiative.type.banner_image.url,
|
3
|
-
description:
|
4
|
-
title:
|
3
|
+
description: translated_attribute(current_initiative.description),
|
4
|
+
title: translated_attribute(current_initiative.title),
|
5
5
|
url: initiative_url(current_initiative.id),
|
6
6
|
twitter_handler: current_organization.twitter_handler
|
7
7
|
}) %>
|
8
8
|
|
9
|
-
<% add_decidim_page_title(
|
9
|
+
<% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
|
10
10
|
<% provide :meta_image_url, current_initiative.type.banner_image.url %>
|
11
11
|
|
12
|
-
<br
|
12
|
+
<br /><br />
|
13
13
|
<div class="row column">
|
14
|
-
<h2 class="heading2"><%=
|
15
|
-
<%= render partial:
|
14
|
+
<h2 class="heading2"><%= translated_attribute(current_initiative.title) %></h2>
|
15
|
+
<%= render partial: "decidim/initiatives/initiatives/author", locals: { initiative: current_initiative } %>
|
16
16
|
</div>
|
17
17
|
|
18
18
|
<div class="row">
|
19
19
|
<div class="columns large-12">
|
20
20
|
<div class="section">
|
21
|
-
<%= sanitize
|
21
|
+
<%= sanitize translated_attribute(current_initiative.description) %>
|
22
22
|
</div>
|
23
23
|
|
24
24
|
<div class="section">
|
25
|
-
<p><%=t
|
26
|
-
<%= link_to t(
|
25
|
+
<p><%= t ".help_text" %></p>
|
26
|
+
<%= link_to t(".continue"),
|
27
27
|
spawn_initiative_committee_requests_path(current_initiative),
|
28
|
-
class:
|
28
|
+
class: "title-action__action button small hollow" if current_user %>
|
29
29
|
|
30
30
|
<%= action_authorized_link_to :spawn,
|
31
|
-
t(
|
31
|
+
t(".continue"),
|
32
32
|
spawn_initiative_committee_requests_path(current_initiative),
|
33
|
-
class:
|
33
|
+
class: "title-action__action button small hollow" unless current_user %>
|
34
34
|
</div>
|
35
35
|
</div>
|
36
36
|
</div>
|
37
|
-
<%= stylesheet_link_tag
|
37
|
+
<%= stylesheet_link_tag "decidim/initiatives/application" %>
|
@@ -0,0 +1,7 @@
|
|
1
|
+
<p><%= t ".help_text" %></p>
|
2
|
+
<ul>
|
3
|
+
<li><%= t ".help_for_organizations" %></li>
|
4
|
+
<li><%= t ".help_in_person_signatures" %></li>
|
5
|
+
</ul>
|
6
|
+
<p><%== t ".initiatives_page_link", link: link_to(t(".page"), decidim.page_path("initiatives"), target: "_blank") %></p>
|
7
|
+
<p><%= t ".access_reminder" %></p>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div class="card__content">
|
2
|
-
<%=t
|
2
|
+
<%= t ".invite_to_committee_help" %>
|
3
3
|
|
4
4
|
<div class="card card--list">
|
5
5
|
<div class="card--list__item">
|
@@ -11,14 +11,14 @@
|
|
11
11
|
</div>
|
12
12
|
</div>
|
13
13
|
<div class="card--list__data">
|
14
|
-
<%= icon_link_to
|
14
|
+
<%= icon_link_to "clipboard", "#", t(".invite_to_committee_help"), class: "card--list__data__icon invite-users-link" %>
|
15
15
|
</div>
|
16
16
|
</div>
|
17
17
|
</div>
|
18
18
|
</div>
|
19
19
|
|
20
20
|
<div class="column actions">
|
21
|
-
<%= link_to t(
|
21
|
+
<%= link_to t(".continue"), next_wizard_path, class: "button expanded" %>
|
22
22
|
</div>
|
23
23
|
|
24
|
-
<%= javascript_include_tag
|
24
|
+
<%= javascript_include_tag "decidim/initiatives/admin/invite_users.js" %>
|
@@ -1,29 +1,29 @@
|
|
1
1
|
<% content_for :back_link do %>
|
2
|
-
<%= link_to :back, class:
|
3
|
-
<%= icon
|
4
|
-
<%= t(
|
2
|
+
<%= link_to :back, class: "muted-link" do %>
|
3
|
+
<%= icon "chevron-left", class: "icon--small" %>
|
4
|
+
<%= t(".back") %>
|
5
5
|
<% end %>
|
6
6
|
<% end %>
|
7
7
|
|
8
8
|
<div class="row column">
|
9
9
|
<div class="column large-6 medium-centered">
|
10
10
|
<div class="callout secondary">
|
11
|
-
<%==t ".fill_data_help" %>
|
12
|
-
<%= link_to t(".more_information"), decidim.page_path(
|
11
|
+
<%== t ".fill_data_help" %>
|
12
|
+
<%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>.
|
13
13
|
</div>
|
14
14
|
</div>
|
15
15
|
</div>
|
16
|
-
<br
|
16
|
+
<br />
|
17
17
|
<div class="row">
|
18
18
|
<div class="columns large-6 medium-centered">
|
19
19
|
<div class="card">
|
20
20
|
<div class="card__content">
|
21
|
-
<%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class:
|
21
|
+
<%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form new_initiative_form" }) do |f| %>
|
22
22
|
<%= f.hidden_field :type_id %>
|
23
23
|
<div class=section>
|
24
24
|
<div class="field">
|
25
25
|
<label for="type_description">
|
26
|
-
<%=t
|
26
|
+
<%= t ".initiative_type" %>
|
27
27
|
<%= text_field_tag :type_description, strip_tags(translated_attribute(initiative_type.title)), readonly: true %>
|
28
28
|
</label>
|
29
29
|
</div>
|
@@ -1,30 +1,30 @@
|
|
1
1
|
<% content_for :back_link do %>
|
2
|
-
<%= link_to :back, class:
|
3
|
-
<%= icon
|
4
|
-
<%= t(
|
2
|
+
<%= link_to :back, class: "muted-link" do %>
|
3
|
+
<%= icon "chevron-left", class: "icon--small" %>
|
4
|
+
<%= t(".back") %>
|
5
5
|
<% end %>
|
6
6
|
<% end %>
|
7
7
|
|
8
8
|
<div class="row column">
|
9
9
|
<div class="column large-6 medium-centered">
|
10
10
|
<div class="callout secondary">
|
11
|
-
<%=t
|
12
|
-
<%= link_to t(
|
11
|
+
<%= t ".callout_text" %>
|
12
|
+
<%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>
|
13
13
|
</div>
|
14
14
|
</div>
|
15
15
|
</div>
|
16
|
-
<br
|
16
|
+
<br />
|
17
17
|
<div class="row">
|
18
18
|
<div class="columns large-6 small-12 medium-centered">
|
19
19
|
<div class="card">
|
20
20
|
<div class="card__content">
|
21
|
-
<%= render partial:
|
21
|
+
<%= render partial: "finish_help" %>
|
22
22
|
</div>
|
23
23
|
|
24
24
|
<div class="column actions">
|
25
|
-
<%= link_to t(
|
26
|
-
<%= link_to t(
|
25
|
+
<%= link_to t(".go_to_my_initiatives"), decidim_admin_initiatives.initiatives_path, class: "button expanded" %>
|
26
|
+
<%= link_to t(".back_to_initiatives"), initiatives_path, class: "button white-button expanded" %>
|
27
27
|
</div>
|
28
28
|
</div>
|
29
29
|
</div>
|
30
|
-
</div>
|
30
|
+
</div>
|
@@ -1,24 +1,24 @@
|
|
1
1
|
<% content_for :back_link do %>
|
2
|
-
<%= link_to :back, class:
|
3
|
-
<%= icon
|
4
|
-
<%= t(
|
2
|
+
<%= link_to :back, class: "muted-link" do %>
|
3
|
+
<%= icon "chevron-left", class: "icon--small" %>
|
4
|
+
<%= t(".back") %>
|
5
5
|
<% end %>
|
6
6
|
<% end %>
|
7
7
|
|
8
8
|
<div class="row">
|
9
9
|
<div class="column large-6 medium-centered">
|
10
10
|
<div class="callout secondary">
|
11
|
-
<%=t
|
12
|
-
<%= link_to t(
|
11
|
+
<%= t ".help" %>
|
12
|
+
<%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>.
|
13
13
|
</div>
|
14
14
|
</div>
|
15
15
|
</div>
|
16
|
-
<br
|
16
|
+
<br />
|
17
17
|
<div class="row">
|
18
18
|
<div class="columns large-6 medium-centered">
|
19
19
|
<div class="card">
|
20
20
|
<div class="card__content">
|
21
|
-
<%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class:
|
21
|
+
<%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form new_initiative_previous_form" }) do |f| %>
|
22
22
|
<%= f.hidden_field :type_id %>
|
23
23
|
|
24
24
|
<div class="field">
|
@@ -30,10 +30,10 @@
|
|
30
30
|
</div>
|
31
31
|
|
32
32
|
<div class="actions">
|
33
|
-
<%= f.submit t(
|
33
|
+
<%= f.submit t(".continue"), class: "button expanded" %>
|
34
34
|
</div>
|
35
35
|
<% end %>
|
36
36
|
</div>
|
37
37
|
</div>
|
38
38
|
</div>
|
39
|
-
</div>
|
39
|
+
</div>
|
@@ -1,21 +1,21 @@
|
|
1
1
|
<% content_for :back_link do %>
|
2
|
-
<%= link_to :back, class:
|
3
|
-
<%= icon
|
4
|
-
<%= t(
|
2
|
+
<%= link_to :back, class: "muted-link" do %>
|
3
|
+
<%= icon "chevron-left", class: "icon--small" %>
|
4
|
+
<%= t(".back") %>
|
5
5
|
<% end %>
|
6
6
|
<% end %>
|
7
7
|
|
8
8
|
<div class="row column">
|
9
9
|
<div class="column large-6 medium-centered">
|
10
10
|
<div class="callout secondary">
|
11
|
-
<%=t
|
12
|
-
<%= link_to t(
|
11
|
+
<%= t ".individual_help_text" %>
|
12
|
+
<%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>.
|
13
13
|
</div>
|
14
14
|
</div>
|
15
15
|
</div>
|
16
|
-
<br
|
16
|
+
<br />
|
17
17
|
<div class="row">
|
18
18
|
<div class="columns large-6 small-12 medium-centered">
|
19
|
-
<%= render partial:
|
19
|
+
<%= render partial: "share_committee_link" %>
|
20
20
|
</div>
|
21
|
-
</div>
|
21
|
+
</div>
|
@@ -1,17 +1,17 @@
|
|
1
1
|
<% content_for :back_link do %>
|
2
|
-
<%= link_to initiatives_path, class:
|
3
|
-
<%= icon
|
4
|
-
<%= t(
|
2
|
+
<%= link_to initiatives_path, class: "muted-link" do %>
|
3
|
+
<%= icon "chevron-left", class: "icon--small" %>
|
4
|
+
<%= t(".back") %>
|
5
5
|
<% end %>
|
6
6
|
<% end %>
|
7
7
|
|
8
8
|
<div class="row column">
|
9
9
|
<div class="callout secondary">
|
10
|
-
<%=t
|
11
|
-
<%= link_to t(
|
10
|
+
<%= t ".select_initiative_type_help" %>
|
11
|
+
<%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>.
|
12
12
|
</div>
|
13
13
|
</div>
|
14
|
-
<br
|
14
|
+
<br />
|
15
15
|
<section id="initiative-types-grid" class="section row collapse">
|
16
16
|
<div class="row small-up-1 medium-up-2 large-up-3 card-grid">
|
17
17
|
<% initiative_types_each do |type| %>
|
@@ -21,14 +21,14 @@
|
|
21
21
|
<div class="card__header">
|
22
22
|
<h5 class="card__title"><%= translated_attribute type.title %></h5>
|
23
23
|
</div>
|
24
|
-
<%=raw translated_attribute type.description %>
|
24
|
+
<%= raw translated_attribute type.description %>
|
25
25
|
</div>
|
26
26
|
<div class="card__footer">
|
27
27
|
<div class="card__support">
|
28
28
|
<div class="card__support__data"></div>
|
29
|
-
<%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class:
|
29
|
+
<%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form select-initiative_type-form" }) do |f| %>
|
30
30
|
<%= f.hidden_field :type_id, value: type.id %>
|
31
|
-
<%= f.submit t(
|
31
|
+
<%= f.submit t(".select"), class: "button small secondary card__button" %>
|
32
32
|
<% end %>
|
33
33
|
</div>
|
34
34
|
</div>
|
@@ -37,4 +37,3 @@
|
|
37
37
|
<% end %>
|
38
38
|
</div>
|
39
39
|
</section>
|
40
|
-
|
@@ -1,16 +1,16 @@
|
|
1
1
|
<% content_for :back_link do %>
|
2
|
-
<%= link_to :back, class:
|
3
|
-
<%= icon
|
4
|
-
<%= t(
|
2
|
+
<%= link_to :back, class: "muted-link" do %>
|
3
|
+
<%= icon "chevron-left", class: "icon--small" %>
|
4
|
+
<%= t(".back") %>
|
5
5
|
<% end %>
|
6
6
|
<% end %>
|
7
7
|
<div class="row column">
|
8
8
|
<div class="callout secondary">
|
9
|
-
<%=
|
10
|
-
<%= link_to t(
|
9
|
+
<%= t(".compare_help") %>
|
10
|
+
<%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>.
|
11
11
|
</div>
|
12
12
|
</div>
|
13
|
-
<br
|
13
|
+
<br />
|
14
14
|
|
15
15
|
<div class="row small-up-1 medium-up-2 card-grid">
|
16
16
|
<%= render similar_initiatives %>
|
@@ -18,6 +18,6 @@
|
|
18
18
|
|
19
19
|
<div class="row">
|
20
20
|
<div class="columns mediumlarge-4 small-12 mediumlarge-push-4">
|
21
|
-
<%= link_to t(
|
21
|
+
<%= link_to t(".continue"), next_wizard_path, class: "button expanded" %>
|
22
22
|
</div>
|
23
23
|
</div>
|
@@ -5,7 +5,7 @@
|
|
5
5
|
userIdentitiesDialog = $('#user-identities'),
|
6
6
|
refreshUrl;
|
7
7
|
|
8
|
-
$initiativeVotesCount.html('<%= j(render partial:
|
8
|
+
$initiativeVotesCount.html('<%= j(render partial: "decidim/initiatives/initiatives/votes_count", locals: { initiative: current_initiative }) %>');
|
9
9
|
|
10
10
|
// Update the identities dialog, if exists.
|
11
11
|
if (userIdentitiesDialog.length) {
|
@@ -16,6 +16,6 @@
|
|
16
16
|
});
|
17
17
|
} else {
|
18
18
|
var $initiativeVoteButton = $('#initiative-<%= current_initiative.id %>-vote-cabin');
|
19
|
-
$initiativeVoteButton.html('<%= j(render partial:
|
19
|
+
$initiativeVoteButton.html('<%= j(render partial: "decidim/initiatives/initiatives/vote_cabin", locals: { initiative: current_initiative }) %>');
|
20
20
|
}
|
21
21
|
}());
|
@@ -1,4 +1,4 @@
|
|
1
1
|
<% content_for(:title, translated_attribute(model.title)) %>
|
2
2
|
|
3
|
-
<%= render partial:
|
3
|
+
<%= render partial: "decidim/initiatives/initiatives/initiative_badge", locals: { initiative: model } %>
|
4
4
|
<p><%= truncate(translated_attribute(model.description), length: 100) %></p>
|
@@ -7,7 +7,7 @@
|
|
7
7
|
<span class="author__name">
|
8
8
|
<% if initiative.author.deleted? %>
|
9
9
|
<span class="label label--small label--basic">
|
10
|
-
<%= t(
|
10
|
+
<%= t(".deleted") %>
|
11
11
|
</span>
|
12
12
|
<% else %>
|
13
13
|
<%= initiative.author_name %>
|
@@ -29,7 +29,7 @@
|
|
29
29
|
<% end %>
|
30
30
|
|
31
31
|
<div class="publish-date">
|
32
|
-
<%=l initiative.published_at || initiative.created_at, format:
|
32
|
+
<%= l initiative.published_at || initiative.created_at, format: "%d/%m/%Y" %>
|
33
33
|
</div>
|
34
34
|
</div>
|
35
|
-
</div>
|
35
|
+
</div>
|
@@ -1 +1 @@
|
|
1
|
-
<%= t(
|
1
|
+
<%= t(".title", count: initiatives.to_a.count) %>
|
@@ -2,10 +2,10 @@
|
|
2
2
|
<div class="filters__section">
|
3
3
|
<div class="filters__search">
|
4
4
|
<div class="input-group">
|
5
|
-
<%= form.search_field :search_text, label: false, class:
|
5
|
+
<%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
|
6
6
|
<div class="input-group-button">
|
7
7
|
<button type="submit" class="button button--muted">
|
8
|
-
<%= icon
|
8
|
+
<%= icon "magnifying-glass", aria_label: t(".search") %>
|
9
9
|
</button>
|
10
10
|
</div>
|
11
11
|
</div>
|
@@ -13,32 +13,32 @@
|
|
13
13
|
</div>
|
14
14
|
|
15
15
|
<%= form.collection_radio_buttons :state,
|
16
|
-
[[
|
16
|
+
[["open", t(".open")], ["closed", t(".closed")]],
|
17
17
|
:first,
|
18
18
|
:last,
|
19
|
-
legend_title: t(
|
19
|
+
legend_title: t(".state") %>
|
20
20
|
|
21
21
|
<% if current_user %>
|
22
22
|
<%= form.collection_radio_buttons :author,
|
23
|
-
[[
|
23
|
+
[["any", t(".any")], ["myself", t(".myself")]],
|
24
24
|
:first,
|
25
25
|
:last,
|
26
|
-
legend_title: t(
|
26
|
+
legend_title: t(".author") %>
|
27
27
|
<% end %>
|
28
28
|
|
29
29
|
<div class="filters__section">
|
30
30
|
<fieldset>
|
31
|
-
<legend><h6 class="heading6"><%= t
|
31
|
+
<legend><h6 class="heading6"><%= t ".type" %></h6></legend>
|
32
32
|
<%= form.initiative_types_select :type,
|
33
|
-
legend_title: t(
|
33
|
+
legend_title: t(".type"),
|
34
34
|
label: false,
|
35
|
-
prompt: t(
|
35
|
+
prompt: t(".type_prompt"),
|
36
36
|
remote_path: initiative_types_search_path,
|
37
37
|
multiple: true %>
|
38
38
|
</fieldset>
|
39
39
|
</div>
|
40
40
|
|
41
|
-
<%= scopes_picker_field form, :scope_id %>
|
41
|
+
<%= scopes_picker_field form, :scope_id, root: true %>
|
42
42
|
|
43
|
-
<%= hidden_field_tag :order, order, id: nil, class:
|
43
|
+
<%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
|
44
44
|
<% end %>
|