decidim-core 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 +5 -11
- data/app/assets/images/decidim/icons.svg +25 -6
- data/app/assets/javascripts/decidim/account_form.js.es6 +8 -8
- data/app/assets/javascripts/decidim/append_elements.js.es6 +1 -1
- data/app/assets/javascripts/decidim/append_redirect_url_to_modals.js.es6 +5 -5
- data/app/assets/javascripts/decidim/data_picker.js.es6 +10 -10
- data/app/assets/javascripts/decidim/editor.js.es6 +37 -22
- data/app/assets/javascripts/decidim/filters.js.es6 +1 -1
- data/app/assets/javascripts/decidim/form_filter.component.js.es6 +15 -15
- data/app/assets/javascripts/decidim/form_filter.component.test.js +29 -29
- data/app/assets/javascripts/decidim/impersonation.js.es6 +3 -3
- data/app/assets/javascripts/decidim/input_mentions.js.es6 +100 -0
- data/app/assets/javascripts/decidim/input_tags.js.es6 +12 -0
- data/app/assets/javascripts/decidim/{map.js.es6.erb → map.js.es6} +9 -9
- data/app/assets/javascripts/decidim/notifications.js.es6 +10 -10
- data/app/assets/javascripts/decidim/orders.js.es6 +5 -5
- data/app/assets/javascripts/decidim/user_registrations.js.es6 +4 -4
- data/app/assets/javascripts/decidim/widget.js.es6 +1 -1
- data/app/assets/javascripts/decidim.js.es6 +10 -0
- data/app/assets/stylesheets/decidim/application.scss.erb +1 -1
- data/app/assets/stylesheets/decidim/modules/_author-avatar.scss +39 -0
- data/app/assets/stylesheets/decidim/modules/_cards.scss +158 -3
- data/app/assets/stylesheets/decidim/modules/_definition-data.scss +6 -0
- data/app/assets/stylesheets/decidim/modules/_extra.scss +1 -3
- data/app/assets/stylesheets/decidim/modules/_icons.scss +14 -6
- data/app/assets/stylesheets/decidim/modules/_inline-filters.scss +61 -0
- data/app/assets/stylesheets/decidim/modules/_input-mentions.scss +124 -0
- data/app/assets/stylesheets/decidim/modules/_input-tags.scss +55 -0
- data/app/assets/stylesheets/decidim/modules/_modules.scss +3 -0
- data/app/assets/stylesheets/decidim/modules/_status-labels.scss +4 -0
- data/app/assets/stylesheets/decidim/modules/_typography.scss +16 -0
- data/app/assets/stylesheets/decidim/utils/_helpers.scss +29 -0
- data/app/assets/stylesheets/decidim/utils/_mixins.scss +6 -0
- data/app/cells/decidim/author_box/show.erb +10 -0
- data/app/cells/decidim/author_box_cell.rb +21 -0
- data/app/cells/decidim/card/show.erb +17 -0
- data/app/cells/decidim/card_cell.rb +29 -0
- data/app/cells/decidim/profile/profile_inline.erb +21 -0
- data/app/cells/decidim/profile/show.erb +13 -0
- data/app/cells/decidim/profile_cell.rb +17 -0
- data/app/commands/decidim/create_omniauth_registration.rb +3 -2
- data/app/commands/decidim/create_report.rb +1 -1
- data/app/commands/decidim/invite_user.rb +2 -0
- data/app/constraints/decidim/current_component.rb +41 -0
- data/app/controllers/concerns/decidim/action_authorization.rb +3 -3
- data/app/controllers/concerns/decidim/devise_controllers.rb +2 -1
- data/app/controllers/concerns/decidim/filter_resource.rb +1 -1
- data/app/controllers/concerns/decidim/form_factory.rb +1 -1
- data/app/controllers/concerns/decidim/impersonate_users.rb +6 -2
- data/app/controllers/concerns/decidim/needs_authorization.rb +2 -2
- data/app/controllers/concerns/decidim/participatory_space_context.rb +15 -0
- data/app/controllers/concerns/decidim/settings.rb +5 -5
- data/app/controllers/decidim/application_controller.rb +2 -1
- data/app/controllers/decidim/{features → components}/base_controller.rb +16 -8
- data/app/controllers/decidim/devise/omniauth_registrations_controller.rb +3 -1
- data/app/controllers/decidim/devise/registrations_controller.rb +1 -3
- data/app/controllers/decidim/doorkeeper/authorizations_controller.rb +16 -0
- data/app/controllers/decidim/doorkeeper/credentials_controller.rb +46 -0
- data/app/controllers/decidim/doorkeeper/token_info_controller.rb +9 -0
- data/app/controllers/decidim/doorkeeper/tokens_controller.rb +9 -0
- data/app/controllers/decidim/widgets_controller.rb +1 -1
- data/app/forms/decidim/follow_form.rb +1 -1
- data/app/forms/decidim/form.rb +1 -1
- data/app/forms/decidim/omniauth_registration_form.rb +1 -0
- data/app/forms/decidim/registration_form.rb +5 -5
- data/app/helpers/decidim/card_helper.rb +16 -0
- data/app/helpers/decidim/component_path_helper.rb +36 -0
- data/app/helpers/decidim/icon_helper.rb +7 -7
- data/app/helpers/decidim/messaging/conversation_helper.rb +4 -3
- data/app/helpers/decidim/paginate_helper.rb +1 -1
- data/app/helpers/decidim/resource_helper.rb +2 -2
- data/app/jobs/decidim/export_job.rb +3 -3
- data/app/mailers/decidim/messaging/conversation_mailer.rb +0 -2
- data/app/middleware/decidim/current_organization.rb +2 -2
- data/app/models/decidim/abilities/admin_ability.rb +1 -1
- data/app/models/decidim/abilities/everyone_ability.rb +1 -1
- data/app/models/decidim/abilities/participatory_process_admin_ability.rb +2 -2
- data/app/models/decidim/abilities/participatory_process_collaborator_ability.rb +2 -2
- data/app/models/decidim/action_log.rb +7 -5
- data/app/models/decidim/area.rb +7 -0
- data/app/models/decidim/authorization.rb +14 -0
- data/app/models/decidim/{feature.rb → component.rb} +15 -15
- data/app/models/decidim/moderation.rb +1 -1
- data/app/models/decidim/oauth_application.rb +24 -0
- data/app/models/decidim/organization.rb +5 -0
- data/app/models/decidim/participatory_space_link.rb +20 -0
- data/app/models/decidim/participatory_space_private_user.rb +19 -0
- data/app/models/decidim/user.rb +7 -0
- data/app/presenters/decidim/admin_log/area_presenter.rb +38 -0
- data/app/presenters/decidim/admin_log/{feature_presenter.rb → component_presenter.rb} +5 -5
- data/app/presenters/decidim/admin_log/newsletter_resource_presenter.rb +1 -1
- data/app/presenters/decidim/admin_log/oauth_application_presenter.rb +50 -0
- data/app/presenters/decidim/admin_log/oauth_application_resource_presenter.rb +18 -0
- data/app/presenters/decidim/home_stats_presenter.rb +7 -7
- data/app/presenters/decidim/log/value_types/area_presenter.rb +1 -1
- data/app/presenters/decidim/log/value_types/area_type_presenter.rb +28 -0
- data/app/presenters/decidim/log/value_types/currency_presenter.rb +20 -0
- data/app/presenters/decidim/log/value_types/scope_presenter.rb +1 -1
- data/app/presenters/decidim/log/value_types/scope_type_presenter.rb +1 -1
- data/app/presenters/decidim/resource_locator_presenter.rb +3 -3
- data/app/services/decidim/action_authorizer.rb +9 -9
- data/app/services/decidim/action_logger.rb +9 -7
- data/app/services/decidim/email_notification_generator.rb +1 -1
- data/app/services/decidim/notification_generator_for_recipient.rb +1 -1
- data/app/services/decidim/resource_search.rb +8 -8
- data/app/services/decidim/settings_change.rb +5 -5
- data/app/services/decidim/static_map_generator.rb +1 -1
- data/app/types/decidim/core/attachment_type.rb +14 -0
- data/app/types/decidim/core/category_type.rb +16 -0
- data/app/types/decidim/core/coordinates_type.rb +19 -0
- data/app/types/decidim/core/scope_api_type.rb +16 -0
- data/app/uploaders/decidim/oauth_application_logo_uploader.rb +9 -0
- data/app/validators/geocoding_validator.rb +2 -2
- data/app/views/decidim/account/delete.html.erb +7 -7
- data/app/views/decidim/application/_collection.html.erb +1 -1
- data/app/views/decidim/application/_document.html.erb +1 -1
- data/app/views/decidim/application/_photos.html.erb +1 -1
- data/app/views/decidim/devise/invitations/edit.html.erb +1 -1
- data/app/views/decidim/devise/omniauth_registrations/new.html.erb +1 -1
- data/app/views/decidim/devise/registrations/new.html.erb +1 -1
- data/app/views/decidim/devise/sessions/new.html.erb +2 -2
- data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb +1 -1
- data/app/views/decidim/devise/shared/_omniauth_buttons_mini.html.erb +1 -1
- data/app/views/decidim/doorkeeper/authorizations/new.html.erb +58 -0
- data/app/views/decidim/messaging/conversations/_show.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/index.html.erb +1 -1
- data/app/views/decidim/notifications/index.html.erb +1 -1
- data/app/views/decidim/notifications_settings/show.html.erb +2 -2
- data/app/views/decidim/own_user_groups/index.html.erb +3 -3
- data/app/views/decidim/scopes/_scopes_picker_input.html.erb +4 -4
- data/app/views/decidim/scopes/picker.html.erb +3 -3
- data/app/views/decidim/shared/_action_authorization_modal.html.erb +1 -1
- data/app/views/decidim/shared/_author.html.erb +1 -1
- data/app/views/decidim/shared/_author_reference.html.erb +1 -12
- data/app/views/decidim/shared/{_feature_announcement.html.erb → _component_announcement.html.erb} +2 -2
- data/app/views/decidim/shared/_embed_modal.html.erb +1 -1
- data/app/views/decidim/shared/_flag_modal.html.erb +5 -5
- data/app/views/decidim/shared/_login_modal.html.erb +3 -3
- data/app/views/decidim/shared/_private_participatory_space.html.erb +5 -0
- data/app/views/decidim/shared/_share_modal.html.erb +1 -1
- data/app/views/decidim/shared/_tags.html.erb +1 -1
- data/app/views/decidim/shared/_version_author.html.erb +1 -1
- data/app/views/decidim/widgets/_data_picker.html.erb +4 -4
- data/app/views/devise/mailer/confirmation_instructions.html.erb +3 -3
- data/app/views/devise/mailer/invite_private_user.html.erb +17 -0
- data/app/views/devise/mailer/invite_private_user.text.erb +15 -0
- data/app/views/devise/mailer/password_change.html.erb +2 -2
- data/app/views/devise/mailer/reset_password_instructions.html.erb +5 -5
- data/app/views/kaminari/decidim/_first_page.html.erb +2 -3
- data/app/views/kaminari/decidim/_gap.html.erb +2 -3
- data/app/views/kaminari/decidim/_last_page.html.erb +2 -3
- data/app/views/kaminari/decidim/_next_page.html.erb +2 -3
- data/app/views/kaminari/decidim/_page.html.erb +2 -3
- data/app/views/kaminari/decidim/_paginator.html.erb +1 -2
- data/app/views/kaminari/decidim/_prev_page.html.erb +2 -3
- data/app/views/layouts/decidim/_application.html.erb +4 -4
- data/app/views/layouts/decidim/_component_authorization_modals.html.erb +5 -0
- data/app/views/layouts/decidim/_cookie_warning.html.erb +2 -2
- data/app/views/layouts/decidim/_head.html.erb +4 -4
- data/app/views/layouts/decidim/_impersonation_warning.html.erb +4 -4
- data/app/views/layouts/decidim/_language_chooser.html.erb +1 -1
- data/app/views/layouts/decidim/_social_media_links.html.erb +5 -5
- data/app/views/layouts/decidim/_wrapper.html.erb +5 -5
- data/app/views/layouts/decidim/mailer.html.erb +1 -1
- data/app/views/layouts/decidim/widget.html.erb +5 -5
- data/app/views/pages/home/_hero.html.erb +1 -1
- data/app/views/pages/home.html.erb +6 -6
- data/config/locales/ca.yml +66 -27
- data/config/locales/en.yml +69 -30
- data/config/locales/es.yml +66 -27
- data/config/locales/eu.yml +69 -30
- data/config/locales/fi.yml +69 -30
- data/config/locales/fr.yml +85 -46
- data/config/locales/gl.yml +69 -30
- data/config/locales/it.yml +69 -30
- data/config/locales/nl.yml +122 -83
- data/config/locales/pl.yml +69 -30
- data/config/locales/pt-BR.yml +69 -30
- data/config/locales/pt.yml +69 -30
- data/config/locales/ru.yml +0 -7
- data/config/locales/sv.yml +69 -30
- data/config/locales/uk.yml +0 -13
- data/config/routes.rb +8 -0
- data/db/migrate/20180206183235_create_participatory_space_private_users.rb +15 -0
- data/db/migrate/20180221101934_fix_nickname_index.rb +5 -6
- data/db/migrate/20180226140756_add_version_to_action_logs.rb +5 -1
- data/db/migrate/20180227131727_create_participatory_space_links.rb +12 -0
- data/db/migrate/20180305132906_rename_features_to_components.rb +13 -0
- data/db/migrate/20180308113207_doorkeeper_models.rb +85 -0
- data/db/migrate/20180314085339_rename_maximum_votes_per_proposal_to_threshold_per_proposal.rb +2 -2
- data/db/migrate/{20180326075746_change_event_name_and_class_to_rename_to_publish_proposal_event.rb → 20180323102631_change_event_name_and_class_to_rename_to_publish_proposal_event.rb} +0 -0
- data/db/seeds.rb +12 -2
- data/lib/decidim/api/attachable_interface.rb +13 -0
- data/lib/decidim/api/authorable_interface.rb +13 -0
- data/lib/decidim/api/categorizable_interface.rb +13 -0
- data/lib/decidim/api/participatory_space_interface.rb +4 -4
- data/lib/decidim/api/scopable_interface.rb +13 -0
- data/lib/decidim/authorable.rb +8 -0
- data/lib/decidim/{feature_manifest.rb → component_manifest.rb} +24 -21
- data/lib/decidim/{feature_validator.rb → component_validator.rb} +6 -6
- data/lib/decidim/{features → components}/export_manifest.rb +4 -4
- data/lib/decidim/components/namer.rb +35 -0
- data/lib/decidim/components.rb +9 -0
- data/lib/decidim/content_parsers/user_parser.rb +1 -1
- data/lib/decidim/core/api.rb +13 -0
- data/lib/decidim/core/engine.rb +76 -3
- data/lib/decidim/core/test/factories.rb +43 -10
- data/lib/decidim/core/test/shared_examples/announcements_examples.rb +9 -9
- data/lib/decidim/core/test/shared_examples/attachable_interface_examples.rb +16 -0
- data/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb +33 -0
- data/lib/decidim/core/test/shared_examples/categorizable_interface_examples.rb +19 -0
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/follows_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/has_component.rb +21 -0
- data/lib/decidim/core/test/shared_examples/has_reference.rb +2 -2
- data/lib/decidim/core/test/shared_examples/localised_email.rb +1 -1
- data/lib/decidim/core/test/shared_examples/paginated_resource_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/reportable.rb +8 -6
- data/lib/decidim/core/test/shared_examples/reports_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/scopable_interface_examples.rb +19 -0
- data/lib/decidim/core/test/shared_examples/scope_helper_examples.rb +8 -3
- data/lib/decidim/core/test/shared_examples/simple_event.rb +1 -1
- data/lib/decidim/core/test/shared_examples/user_localised_email_examples.rb +1 -1
- data/lib/decidim/core/test.rb +1 -1
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +35 -37
- data/lib/decidim/events/base_event.rb +5 -5
- data/lib/decidim/events/simple_event.rb +8 -8
- data/lib/decidim/form_builder.rb +48 -3
- data/lib/decidim/has_attachment_collections.rb +1 -1
- data/lib/decidim/has_attachments.rb +1 -1
- data/lib/decidim/has_category.rb +2 -2
- data/lib/decidim/has_component.rb +23 -0
- data/lib/decidim/has_private_users.rb +26 -0
- data/lib/decidim/has_reference.rb +3 -3
- data/lib/decidim/page_finder.rb +1 -1
- data/lib/decidim/participatory_space_manifest.rb +3 -3
- data/lib/decidim/participatory_space_resourceable.rb +80 -0
- data/lib/decidim/publicable.rb +2 -2
- data/lib/decidim/query_extensions.rb +2 -2
- data/lib/decidim/rectify_ext.rb +32 -0
- data/lib/decidim/reportable.rb +1 -1
- data/lib/decidim/resource_manifest.rb +13 -13
- data/lib/decidim/resourceable.rb +8 -8
- data/lib/decidim/scopable.rb +1 -1
- data/lib/decidim/{scopable_feature.rb → scopable_component.rb} +1 -1
- data/lib/decidim/settings_manifest.rb +1 -1
- data/lib/decidim/stats_registry.rb +1 -1
- data/lib/decidim/view_model.rb +9 -0
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.fr.js +4 -1
- data/vendor/assets/javascripts/form_datepicker.js.es6 +10 -10
- data/vendor/assets/javascripts/quill.min.js +2 -2
- data/vendor/assets/javascripts/quill.min.js.map +1 -1
- data/vendor/assets/javascripts/tagsinput.js +683 -0
- data/vendor/assets/javascripts/tribute.js +1607 -0
- data/vendor/assets/stylesheets/quill.bubble.css +30 -16
- data/vendor/assets/stylesheets/quill.core.css +19 -9
- data/vendor/assets/stylesheets/quill.snow.css +30 -16
- data/vendor/assets/stylesheets/tagsinput.css +55 -0
- data/vendor/assets/stylesheets/tribute.css +27 -0
- metadata +164 -27
- data/app/constraints/decidim/current_feature.rb +0 -41
- data/app/helpers/decidim/feature_path_helper.rb +0 -36
- data/app/views/layouts/decidim/_feature_authorization_modals.html.erb +0 -5
- data/lib/decidim/core/test/shared_examples/has_feature.rb +0 -21
- data/lib/decidim/features/namer.rb +0 -35
- data/lib/decidim/features.rb +0 -9
- data/lib/decidim/has_feature.rb +0 -23
@@ -1,6 +1,6 @@
|
|
1
|
-
<div id="<%=picker_options[:id]%>" class="data-picker <%=picker_options[:class]%>" data-picker-name="<%=picker_options[:name]%>">
|
1
|
+
<div id="<%= picker_options[:id] %>" class="data-picker <%= picker_options[:class] %>" data-picker-name="<%= picker_options[:name] %>">
|
2
2
|
<div class="picker-values"><% scopes.each do |scope, params| %>
|
3
|
-
<div><a href="<%=params[:url]%>" data-picker-value="<%=scope.id%>"><%=params[:text]%></a></div>
|
3
|
+
<div><a href="<%= params[:url] %>" data-picker-value="<%= scope.id %>"><%= params[:text] %></a></div>
|
4
4
|
<% end %></div>
|
5
|
-
<div class="picker-prompt"><a href="<%=prompt_params[:url]%>"><%=prompt_params[:text]%></a></div>
|
6
|
-
</div>
|
5
|
+
<div class="picker-prompt"><a href="<%= prompt_params[:url] %>"><%= prompt_params[:text] %></a></div>
|
6
|
+
</div>
|
@@ -2,10 +2,10 @@
|
|
2
2
|
<h2 id="data_picker-title"><%= title %></h2>
|
3
3
|
<ul>
|
4
4
|
<% unless root %>
|
5
|
-
<li><a href="<%= scopes_picker_path(**context)%>"><%= t("decidim.scopes.global") %></a></li>
|
5
|
+
<li><a href="<%= scopes_picker_path(**context) %>"><%= t("decidim.scopes.global") %></a></li>
|
6
6
|
<% end %>
|
7
7
|
<% parent_scopes.each do |scope| %>
|
8
|
-
<li><a href="<%= scopes_picker_path(current: scope.id, **context)%>"><%= translated_attribute(scope.name) %></a></li>
|
8
|
+
<li><a href="<%= scopes_picker_path(current: scope.id, **context) %>"><%= translated_attribute(scope.name) %></a></li>
|
9
9
|
<% end %>
|
10
10
|
</ul>
|
11
11
|
</div>
|
@@ -15,7 +15,7 @@
|
|
15
15
|
<% if scopes.any? %>
|
16
16
|
<ul>
|
17
17
|
<% scopes.each do |scope| %>
|
18
|
-
<li><a href="<%= scopes_picker_path(current: scope.id, **context)%>"><%= translated_attribute(scope.name) %></a></li>
|
18
|
+
<li><a href="<%= scopes_picker_path(current: scope.id, **context) %>"><%= translated_attribute(scope.name) %></a></li>
|
19
19
|
<% end %>
|
20
20
|
</ul>
|
21
21
|
<% end %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<% if current_user %>
|
2
2
|
<% status = action_authorization(action) %>
|
3
3
|
<% if !status.ok? %>
|
4
|
-
<div class="reveal" id="<%= action.underscore%>AuthorizationModal" data-reveal>
|
4
|
+
<div class="reveal" id="<%= action.underscore %>AuthorizationModal" data-reveal>
|
5
5
|
<button class="close-button" data-close aria-label="Close modal"
|
6
6
|
type="button">
|
7
7
|
<span aria-hidden="true">×</span>
|
@@ -1,12 +1 @@
|
|
1
|
-
|
2
|
-
<div class="author author--inline">
|
3
|
-
<% if author.profile_path.present? %>
|
4
|
-
<%= link_to author.profile_path do %>
|
5
|
-
<%= render "decidim/shared/author", author: author %>
|
6
|
-
<% end %>
|
7
|
-
<% else %>
|
8
|
-
<%= render "decidim/shared/author", author: author %>
|
9
|
-
<% end %>
|
10
|
-
</a>
|
11
|
-
</div>
|
12
|
-
</div>
|
1
|
+
<%= cell "decidim/author_box", author, extra_classes: ["author-data--small"] %>
|
data/app/views/decidim/shared/{_feature_announcement.html.erb → _component_announcement.html.erb}
RENAMED
@@ -1,5 +1,5 @@
|
|
1
1
|
<% if translated_attribute(current_settings.announcement).present? %>
|
2
2
|
<%= render partial: "decidim/shared/announcement", locals: { announcement: current_settings.announcement } %>
|
3
|
-
<% elsif translated_attribute(
|
4
|
-
<%= render partial: "decidim/shared/announcement", locals: { announcement:
|
3
|
+
<% elsif translated_attribute(component_settings.announcement).present? %>
|
4
|
+
<%= render partial: "decidim/shared/announcement", locals: { announcement: component_settings.announcement } %>
|
5
5
|
<% end %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div class="text-center">
|
2
2
|
<button class="share-link link text-center" data-open="processEmbed">
|
3
3
|
<%= t(".embed_link") %>
|
4
|
-
<%= icon "code", class: "icon--after"%>
|
4
|
+
<%= icon "code", class: "icon--after" %>
|
5
5
|
</button>
|
6
6
|
</div>
|
7
7
|
<div class="reveal reveal--embed" id="processEmbed" data-reveal>
|
@@ -1,16 +1,16 @@
|
|
1
1
|
<div class="reveal flag-modal" id="flagModal" data-reveal>
|
2
2
|
<div class="reveal__header">
|
3
|
-
<h3 class="reveal__title"><%= t(
|
4
|
-
<button class="close-button" data-close aria-label="<%= t(
|
3
|
+
<h3 class="reveal__title"><%= t(".title") %></h3>
|
4
|
+
<button class="close-button" data-close aria-label="<%= t(".close") %>" type="button">
|
5
5
|
<span aria-hidden="true">×</span>
|
6
6
|
</button>
|
7
7
|
</div>
|
8
8
|
<% if reportable.reported_by? current_user %>
|
9
|
-
<p><%= t(
|
9
|
+
<p><%= t(".already_reported") %></p>
|
10
10
|
<% else %>
|
11
|
-
<p><%= t(
|
11
|
+
<p><%= t(".description") %></p>
|
12
12
|
<%= decidim_form_for form, url: url, method: :post do |f| %>
|
13
|
-
<%= f.collection_radio_buttons :reason, [[:spam, t(
|
13
|
+
<%= f.collection_radio_buttons :reason, [[:spam, t(".spam")], [:offensive, t(".offensive")], [:does_not_belong, t(".does_not_belong", organization_name: current_organization.name)]], :first, :last do |builder| %>
|
14
14
|
<%= builder.label { builder.radio_button + builder.text } %>
|
15
15
|
<% end %>
|
16
16
|
<%= f.text_area :details, rows: 4 %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<div class="reveal" id="loginModal" data-reveal>
|
2
2
|
<div class="reveal__header">
|
3
|
-
<h3 class="reveal__title"><%= t(
|
3
|
+
<h3 class="reveal__title"><%= t(".please_sign_in") %></h3>
|
4
4
|
<button class="close-button" data-close aria-label="Close modal"
|
5
5
|
type="button">
|
6
6
|
<span aria-hidden="true">×</span>
|
@@ -11,7 +11,7 @@
|
|
11
11
|
<%= decidim_form_for(Decidim::User.new, as: :user, url: session_path(:user), html: { class: "register-form new_user" }) do |f| %>
|
12
12
|
<div>
|
13
13
|
<div class="field">
|
14
|
-
<%= f.email_field :email, autofocus: true
|
14
|
+
<%= f.email_field :email, autofocus: true %>
|
15
15
|
</div>
|
16
16
|
<div class="field">
|
17
17
|
<%= f.password_field :password, autocomplete: "off" %>
|
@@ -22,7 +22,7 @@
|
|
22
22
|
</div>
|
23
23
|
<% end %>
|
24
24
|
<p class="text-center">
|
25
|
-
<%= link_to t(
|
25
|
+
<%= link_to t(".sign_up"), decidim.new_user_registration_path, class: "sign-up-link" %>
|
26
26
|
</p>
|
27
27
|
<p class="text-center">
|
28
28
|
<%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div class="text-center">
|
2
2
|
<button class="share-link link text-center" data-open="processShare">
|
3
3
|
<%= t(".share") %>
|
4
|
-
<%= icon "share", class: "icon--after"%>
|
4
|
+
<%= icon "share", class: "icon--after" %>
|
5
5
|
</button>
|
6
6
|
</div>
|
7
7
|
<div class="reveal" id="processShare" data-reveal>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<% if resource.category.present? || has_visible_scopes?(resource) %>
|
2
|
-
<ul class="tags <%= tags_class_extra %>"
|
2
|
+
<ul class="tags <%= tags_class_extra %>">
|
3
3
|
<% if resource.category.present? %>
|
4
4
|
<li><%= link_to translated_attribute(resource.category.name), resource_locator(resource).index(filter: { category_id: resource.category.id }) %></li>
|
5
5
|
<% end %>
|
@@ -1,6 +1,6 @@
|
|
1
|
-
<div id="<%=picker_options[:id]%>" class="data-picker <%=picker_options[:class]%>" data-picker-name="<%=picker_options[:name]%>">
|
1
|
+
<div id="<%= picker_options[:id] %>" class="data-picker <%= picker_options[:class] %>" data-picker-name="<%= picker_options[:name] %>">
|
2
2
|
<div class="picker-values"><% items.each do |item, params| %>
|
3
|
-
<div><a href="<%=params[:url]%>" data-picker-value="<%=item.id%>"><%=params[:text]%></a></div>
|
3
|
+
<div><a href="<%= params[:url] %>" data-picker-value="<%= item.id %>"><%= params[:text] %></a></div>
|
4
4
|
<% end %></div>
|
5
|
-
<div class="picker-prompt"><a href="<%=prompt_params[:url]%>"><%=prompt_params[:text]%></a></div>
|
6
|
-
</div>
|
5
|
+
<div class="picker-prompt"><a href="<%= prompt_params[:url] %>"><%= prompt_params[:text] %></a></div>
|
6
|
+
</div>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<p><%= t(
|
1
|
+
<p><%= t(".greeting", recipient: @resource.email) %></p>
|
2
2
|
|
3
|
-
<p><%= t(
|
4
|
-
<p><%= link_to t(
|
3
|
+
<p><%= t(".instruction") %></p>
|
4
|
+
<p><%= link_to t(".action"), confirmation_url(@resource, confirmation_token: @token, host: @resource.organization.host) %></p>
|
@@ -0,0 +1,17 @@
|
|
1
|
+
<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
|
2
|
+
|
3
|
+
<p>
|
4
|
+
<% if @resource.invited_by.present? %>
|
5
|
+
<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
|
6
|
+
<% else %>
|
7
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: @resource.organization.name) %>
|
8
|
+
<% end %>
|
9
|
+
</p>
|
10
|
+
|
11
|
+
<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, host: @resource.organization.host) %></p>
|
12
|
+
|
13
|
+
<% if @resource.invitation_due_at %>
|
14
|
+
<p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
|
15
|
+
<% end %>
|
16
|
+
|
17
|
+
<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>
|
@@ -0,0 +1,15 @@
|
|
1
|
+
<%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
|
2
|
+
|
3
|
+
<% if @resource.invited_by.present? %>
|
4
|
+
<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
|
5
|
+
<% else %>
|
6
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: @resource.organization.name) %>
|
7
|
+
<% end %>
|
8
|
+
|
9
|
+
<%= accept_invitation_url(@resource, invitation_token: @token, host: @resource.organization.host) %>
|
10
|
+
|
11
|
+
<% if @resource.invitation_due_at %>
|
12
|
+
<%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %>
|
13
|
+
<% end %>
|
14
|
+
|
15
|
+
<%= t("devise.mailer.invitation_instructions.ignore").html_safe %>
|
@@ -1,3 +1,3 @@
|
|
1
|
-
<p><%= t(
|
1
|
+
<p><%= t(".greeting", recipient: @resource.email) %></p>
|
2
2
|
|
3
|
-
<p><%= t(
|
3
|
+
<p><%= t(".message") %></p>
|
@@ -1,8 +1,8 @@
|
|
1
|
-
<p><%= t(
|
1
|
+
<p><%= t(".greeting", recipient: @resource.email) %></p>
|
2
2
|
|
3
|
-
<p><%= t(
|
3
|
+
<p><%= t(".instruction") %></p>
|
4
4
|
|
5
|
-
<p><%= link_to t(
|
5
|
+
<p><%= link_to t(".action"), edit_password_url(@resource, reset_password_token: @token, host: @resource.organization.host) %></p>
|
6
6
|
|
7
|
-
<p><%= t(
|
8
|
-
<p><%= t(
|
7
|
+
<p><%= t(".instruction_2") %></p>
|
8
|
+
<p><%= t(".instruction_3") %></p>
|
@@ -4,8 +4,7 @@
|
|
4
4
|
current_page: a page object for the currently displayed page
|
5
5
|
total_pages: total number of pages
|
6
6
|
per_page: number of items to fetch per page
|
7
|
-
remote: data-remote
|
8
|
-
-%>
|
7
|
+
remote: data-remote -%>
|
9
8
|
<li class="first">
|
10
|
-
<%= link_to_unless current_page.first?, t(
|
9
|
+
<%= link_to_unless current_page.first?, t("views.pagination.first").html_safe, url, remote: remote %>
|
11
10
|
</li>
|
@@ -3,6 +3,5 @@
|
|
3
3
|
current_page: a page object for the currently displayed page
|
4
4
|
total_pages: total number of pages
|
5
5
|
per_page: number of items to fetch per page
|
6
|
-
remote: data-remote
|
7
|
-
|
8
|
-
<li class="page gap"><%= t('views.pagination.truncate').html_safe %></li>
|
6
|
+
remote: data-remote -%>
|
7
|
+
<li class="page gap"><%= t("views.pagination.truncate").html_safe %></li>
|
@@ -4,8 +4,7 @@
|
|
4
4
|
current_page: a page object for the currently displayed page
|
5
5
|
total_pages: total number of pages
|
6
6
|
per_page: number of items to fetch per page
|
7
|
-
remote: data-remote
|
8
|
-
-%>
|
7
|
+
remote: data-remote -%>
|
9
8
|
<li class="last">
|
10
|
-
<%= link_to_unless current_page.last?, t(
|
9
|
+
<%= link_to_unless current_page.last?, t("views.pagination.last").html_safe, url, remote: remote %>
|
11
10
|
</li>
|
@@ -4,8 +4,7 @@
|
|
4
4
|
current_page: a page object for the currently displayed page
|
5
5
|
total_pages: total number of pages
|
6
6
|
per_page: number of items to fetch per page
|
7
|
-
remote: data-remote
|
8
|
-
-%>
|
7
|
+
remote: data-remote -%>
|
9
8
|
<li class="pagination-next">
|
10
|
-
<%= link_to_unless current_page.last?, t(
|
9
|
+
<%= link_to_unless current_page.last?, t("views.pagination.next").html_safe, url, rel: "next", remote: remote %>
|
11
10
|
</li>
|
@@ -5,8 +5,7 @@
|
|
5
5
|
current_page: a page object for the currently displayed page
|
6
6
|
total_pages: total number of pages
|
7
7
|
per_page: number of items to fetch per page
|
8
|
-
remote: data-remote
|
9
|
-
|
10
|
-
<li class="page<%= ' current' if page.current? %>">
|
8
|
+
remote: data-remote -%>
|
9
|
+
<li class="page<%= " current" if page.current? %>">
|
11
10
|
<%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel} %>
|
12
11
|
</li>
|
@@ -4,8 +4,7 @@
|
|
4
4
|
total_pages: total number of pages
|
5
5
|
per_page: number of items to fetch per page
|
6
6
|
remote: data-remote
|
7
|
-
paginator: the paginator that renders the pagination tags inside
|
8
|
-
-%>
|
7
|
+
paginator: the paginator that renders the pagination tags inside -%>
|
9
8
|
<%= paginator.render do -%>
|
10
9
|
<ul class="pagination text-center" role="navigation" aria-label="Pagination">
|
11
10
|
<%= first_page_tag unless current_page.first? %>
|
@@ -4,8 +4,7 @@
|
|
4
4
|
current_page: a page object for the currently displayed page
|
5
5
|
total_pages: total number of pages
|
6
6
|
per_page: number of items to fetch per page
|
7
|
-
remote: data-remote
|
8
|
-
-%>
|
7
|
+
remote: data-remote -%>
|
9
8
|
<li class="pagination-previous">
|
10
|
-
<%= link_to_unless current_page.first?, t(
|
9
|
+
<%= link_to_unless current_page.first?, t("views.pagination.previous").html_safe, url, rel: "prev", remote: remote %>
|
11
10
|
</li>
|
@@ -10,15 +10,15 @@
|
|
10
10
|
<html lang="<%= I18n.locale %>" class="no-js">
|
11
11
|
<head>
|
12
12
|
<title><%= decidim_page_title %></title>
|
13
|
-
<%= render partial:
|
13
|
+
<%= render partial: "layouts/decidim/head" %>
|
14
14
|
</head>
|
15
15
|
|
16
16
|
<body>
|
17
|
-
<%= render partial:
|
18
|
-
<%= render partial:
|
17
|
+
<%= render partial: "layouts/decidim/impersonation_warning" %>
|
18
|
+
<%= render partial: "layouts/decidim/cookie_warning" %>
|
19
19
|
<%= render partial: "layouts/decidim/omnipresent_banner" %>
|
20
20
|
|
21
|
-
<%= render
|
21
|
+
<%= render "layouts/decidim/wrapper" do %>
|
22
22
|
<%= yield %>
|
23
23
|
<% end %>
|
24
24
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
<% unless cookies_accepted? %>
|
2
2
|
<div class="cookie-warning">
|
3
|
-
<%= t(
|
3
|
+
<%= t(".description_html", link: link_to(t(".link_label"), decidim.page_path("terms-and-conditions"), target: "_blank")) %>
|
4
4
|
<div class="cookie-warning__action">
|
5
|
-
<%= button_to t(
|
5
|
+
<%= button_to t(".ok"), decidim.accept_cookies_path, method: :get, remote: true, class: "button tiny cookie-bar__button" %>
|
6
6
|
</div>
|
7
7
|
</div>
|
8
8
|
<% end %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<%= csrf_meta_tags %>
|
2
2
|
|
3
|
-
<meta name="viewport" content="width=device-width, initial-scale=1.0"
|
3
|
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
4
4
|
<% available_locales.each do |locale| %>
|
5
5
|
<link rel="alternate" href="<%= url_for(request.parameters.merge(locale: locale)) %>" hreflang="<%= locale %>" />
|
6
6
|
<% end %>
|
@@ -18,8 +18,8 @@
|
|
18
18
|
<meta property="og:image" content="<%= decidim_meta_image_url %>" />
|
19
19
|
|
20
20
|
<%= favicon %>
|
21
|
-
<%= stylesheet_link_tag
|
22
|
-
<%= javascript_include_tag
|
21
|
+
<%= stylesheet_link_tag "application", media: "all" %>
|
22
|
+
<%= javascript_include_tag "application" %>
|
23
23
|
|
24
|
-
<%= render partial:
|
24
|
+
<%= render partial: "layouts/decidim/head_extra" %>
|
25
25
|
<%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
|
@@ -1,9 +1,9 @@
|
|
1
|
-
<% if
|
1
|
+
<% if current_user_impersonated? %>
|
2
2
|
<div class="impersonation-warning" data-session-ends-at="<%= impersonation_session_ends_at.iso8601 %>">
|
3
|
-
<%= t(
|
4
|
-
<%= t(
|
3
|
+
<%= t(".description_html", user_name: current_user.name) %>
|
4
|
+
<%= t(".expire_time_html", minutes: impersonation_session_remaining_duration_in_minutes) %>
|
5
5
|
<div class="impersonation-warning__action">
|
6
|
-
<%= button_to t(
|
6
|
+
<%= button_to t(".close_session"), decidim_admin.close_session_impersonatable_user_impersonations_path(current_user), class: "button tiny impersonation-bar__button", data: {disable: true } %>
|
7
7
|
</div>
|
8
8
|
</div>
|
9
9
|
<%= javascript_include_tag "decidim/impersonation" %>
|
@@ -5,7 +5,7 @@
|
|
5
5
|
<%= link_to t("name", scope: "locale") %>
|
6
6
|
<ul class="menu is-dropdown-submenu">
|
7
7
|
<% (available_locales - [I18n.locale.to_s]).each do |locale| %>
|
8
|
-
<li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post%></li>
|
8
|
+
<li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post %></li>
|
9
9
|
<% end %>
|
10
10
|
</ul>
|
11
11
|
</li>
|
@@ -3,35 +3,35 @@
|
|
3
3
|
<% if current_organization.twitter_handler.present? %>
|
4
4
|
<li>
|
5
5
|
<a class="footer-social__icon" target="_blank" title="Twitter" href="https://twitter.com/<%= current_organization.twitter_handler %>">
|
6
|
-
<%= icon
|
6
|
+
<%= icon "twitter", role: "img", aria_label: "Twitter" %>
|
7
7
|
</a>
|
8
8
|
</li>
|
9
9
|
<% end %>
|
10
10
|
<% if current_organization.facebook_handler.present? %>
|
11
11
|
<li>
|
12
12
|
<a class="footer-social__icon" target="_blank" title="Facebook" href="https://www.facebook.com/<%= current_organization.facebook_handler %>">
|
13
|
-
<%= icon
|
13
|
+
<%= icon "facebook", role: "img", aria_label: "Facebook" %>
|
14
14
|
</a>
|
15
15
|
</li>
|
16
16
|
<% end %>
|
17
17
|
<% if current_organization.instagram_handler.present? %>
|
18
18
|
<li>
|
19
19
|
<a class="footer-social__icon" target="_blank" title="Instagram" href="https://www.instagram.com/<%= current_organization.instagram_handler %>">
|
20
|
-
<%= icon
|
20
|
+
<%= icon "instagram", role: "img", aria_label: "Instagram" %>
|
21
21
|
</a>
|
22
22
|
</li>
|
23
23
|
<% end %>
|
24
24
|
<% if current_organization.youtube_handler.present? %>
|
25
25
|
<li>
|
26
26
|
<a class="footer-social__icon" target="_blank" title="YouTube" href="https://www.youtube.com/<%= current_organization.youtube_handler %>">
|
27
|
-
<%= icon
|
27
|
+
<%= icon "youtube", role: "img", aria_label: "YouTube" %>
|
28
28
|
</a>
|
29
29
|
</li>
|
30
30
|
<% end %>
|
31
31
|
<% if current_organization.github_handler.present? %>
|
32
32
|
<li>
|
33
33
|
<a class="footer-social__icon" target="_blank" title="GitHub" href="https://www.github.com/<%= current_organization.github_handler %>">
|
34
|
-
<%= icon
|
34
|
+
<%= icon "github", role: "img", aria_label: "GitHub" %>
|
35
35
|
</a>
|
36
36
|
</li>
|
37
37
|
<% end %>
|
@@ -31,7 +31,7 @@
|
|
31
31
|
<%= render partial: "layouts/decidim/language_chooser" %>
|
32
32
|
<div class="hide-for-medium topbar__menu">
|
33
33
|
<button type="button" data-toggle="offCanvas">
|
34
|
-
<%= icon "menu", aria_label: t(
|
34
|
+
<%= icon "menu", aria_label: t("layouts.decidim.header.navigation"), role: "img" %>
|
35
35
|
</button>
|
36
36
|
</div>
|
37
37
|
<% if current_user %>
|
@@ -60,8 +60,8 @@
|
|
60
60
|
<% else %>
|
61
61
|
<div class="topbar__user show-for-medium" data-set="nav-login-holder">
|
62
62
|
<div class="topbar__user__login js-append">
|
63
|
-
<%= link_to t(
|
64
|
-
<%= link_to t(
|
63
|
+
<%= link_to t("layouts.decidim.header.sign_up"), decidim.new_user_registration_path, class: "sign-up-link" %>
|
64
|
+
<%= link_to t("layouts.decidim.header.sign_in"), decidim.new_user_session_path, class: "sign-in-link" %>
|
65
65
|
</div>
|
66
66
|
</div>
|
67
67
|
<% end %>
|
@@ -96,7 +96,7 @@
|
|
96
96
|
</ul>
|
97
97
|
<% end %>
|
98
98
|
</div>
|
99
|
-
<%= render partial:
|
99
|
+
<%= render partial: "layouts/decidim/social_media_links" %>
|
100
100
|
</div>
|
101
101
|
</div>
|
102
102
|
<div class="mini-footer">
|
@@ -107,7 +107,7 @@
|
|
107
107
|
target="_blank">
|
108
108
|
<%= image_tag("decidim/cc-badge.png", alt: "Creative Commons License" ) %>
|
109
109
|
</a>
|
110
|
-
<%= t(
|
110
|
+
<%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
|
111
111
|
</div>
|
112
112
|
<div class="medium-3 large-2 column">
|
113
113
|
<div class="decidim-logo">
|
@@ -3,8 +3,8 @@
|
|
3
3
|
<head>
|
4
4
|
<title><%= decidim_page_title %></title>
|
5
5
|
<%= csrf_meta_tags %>
|
6
|
-
<%= stylesheet_link_tag
|
7
|
-
<%= javascript_include_tag
|
6
|
+
<%= stylesheet_link_tag "application" %>
|
7
|
+
<%= javascript_include_tag "application" %>
|
8
8
|
</head>
|
9
9
|
|
10
10
|
<body class="widget">
|
@@ -26,7 +26,7 @@
|
|
26
26
|
|
27
27
|
<div class="card__content">
|
28
28
|
<div class="card__header">
|
29
|
-
<%= link_to model do%>
|
29
|
+
<%= link_to model do %>
|
30
30
|
<h5 class="card__title"><%= content_for(:title) %></h5>
|
31
31
|
<% end %>
|
32
32
|
<% if model.try(:author) %>
|
@@ -57,7 +57,7 @@
|
|
57
57
|
<div class="card__support">
|
58
58
|
<div class="card__support__data"></div>
|
59
59
|
<%= link_to model, class: "card__button button small", target: "_blank" do %>
|
60
|
-
<%= t(
|
60
|
+
<%= t(".see_more") %>
|
61
61
|
<% end %>
|
62
62
|
</div>
|
63
63
|
<% end %>
|
@@ -69,6 +69,6 @@
|
|
69
69
|
<%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
|
70
70
|
</div>
|
71
71
|
|
72
|
-
<%= javascript_include_tag
|
72
|
+
<%= javascript_include_tag "decidim/widget" %>
|
73
73
|
</body>
|
74
74
|
</html>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<div class="columns small-centered large-10">
|
5
5
|
<h1 class="text-highlight heading1 hero-heading">
|
6
6
|
<% if translated_attribute(current_organization.welcome_text).blank? %>
|
7
|
-
<%= t(
|
7
|
+
<%= t(".welcome", organization: current_organization.name) %>
|
8
8
|
<% else %>
|
9
9
|
<%= decidim_sanitize translated_attribute current_organization.welcome_text %>
|
10
10
|
<% end %>
|
@@ -1,17 +1,17 @@
|
|
1
|
-
<%= render partial:
|
1
|
+
<%= render partial: "pages/home/hero" %>
|
2
2
|
|
3
3
|
<% if !translated_attribute(current_organization.description).blank? %>
|
4
|
-
<%= render partial:
|
4
|
+
<%= render partial: "pages/home/sub_hero" %>
|
5
5
|
<% end %>
|
6
6
|
|
7
7
|
<%= render partial: "pages/home/highlighted_content_banner" %>
|
8
8
|
|
9
|
-
<%= render partial:
|
9
|
+
<%= render partial: "pages/home/highlighted_processes" %>
|
10
10
|
|
11
|
-
<%= render partial:
|
11
|
+
<%= render partial: "pages/home/extended" %>
|
12
12
|
|
13
13
|
<% if current_organization.show_statistics? %>
|
14
|
-
<%= render partial:
|
14
|
+
<%= render partial: "pages/home/statistics" %>
|
15
15
|
<% end %>
|
16
16
|
|
17
|
-
<%= render partial:
|
17
|
+
<%= render partial: "pages/home/footer_sub_hero" %>
|