decidim-consultations 0.19.0 → 0.22.0

data/app/views/decidim/consultations/admin/responses/_form.html.erb

@@ -6,6 +6,9 @@
   <div class="card-section">
     <div class="row column">
       <%= form.translated :text_field, :title, autofocus: true %>
+      <% if allowed_to? :create, :response_group, question: current_question %>
+        <%= form.collection_select :decidim_consultations_response_group_id, question_response_groups, :id, :title %>
+      <% end %>
     </div>
   </div>
 </div>

data/app/views/decidim/consultations/admin/responses/index.html.erb

@@ -5,6 +5,9 @@
       <%= link_to t("actions.new_response", scope: "decidim.admin"),
                   new_response_path(current_question),
                   class: "button tiny button--title" if allowed_to? :create, :response %>
+      <%= link_to t("actions.response_groups", scope: "decidim.admin"),
+                  response_groups_path(current_question),
+                  class: "button tiny button--title" if allowed_to? :create, :response_group, question: current_question %>
     </h2>
   </div>
   <div class="card-section">
@@ -13,12 +16,15 @@
         <thead>
           <tr>
             <th><%= t("models.response.fields.title", scope: "decidim.admin") %></th>
+            <% if allowed_to? :create, :response_group, question: current_question %>
+              <th><%= t("models.response.fields.response_group", scope: "decidim.admin") %></th>
+            <% end %>
             <th><%= t("models.response.fields.created_at", scope: "decidim.admin") %></th>
             <th></th>
           </tr>
         </thead>
         <tbody>
-          <% current_question.responses.each do |response| %>
+          <% current_question.sorted_responses.each do |response| %>
             <tr>
               <td>
                 <% if allowed_to? :update, :response, response: response %>
@@ -28,6 +34,11 @@
                   <%= translated_attribute(response.title) %>
                 <% end %>
               </td>
+              <% if allowed_to? :create, :response_group, question: current_question %>
+              <td>
+                  <%= translated_attribute(response&.response_group&.title) %>
+              </td>
+              <% end %>
               <td>
                 <%= l response.created_at, format: :short %>
               </td>

data/app/views/decidim/consultations/consultations/_consultation_card.html.erb

@@ -1,12 +1,12 @@
 <div class="column">
-  <article class="card card--process">
+  <div class="card card--process">
     <%= link_to consultation_path(consultation), class: "card__link" do %>
       <div class="card__image-top"
            style="background-image:url(<%= consultation.banner_image.url %>)"></div>
     <% end %>
     <div class="card__content">
       <%= link_to consultation_path(consultation), class: "card__link" do %>
-        <h4 class="card__title"><%= translated_attribute consultation.title %></h4>
+        <span class="card__title"><%= translated_attribute consultation.title %></span>
       <% end %>
       <p class="card__desc">
         <%= decidim_sanitize html_truncate(translated_attribute(consultation.subtitle), length: 630, separator: "...") %>
@@ -20,5 +20,5 @@
         <% end %>
       </div>
     </div>
-  </article>
+  </div>
 </div>

data/app/views/decidim/consultations/consultations/_consultation_details.html.erb

@@ -1,6 +1,6 @@
 <div class="row section" id="consultation-details">
   <div class="columns medium-6 large-5 large-push-1">
-    <p class="lead"><%= decidim_sanitize translated_attribute consultation.description %></p>
+    <p class="lead"><%= decidim_sanitize translated_attribute(consultation.description), strip_tags: true %></p>
   </div>
   <div class="columns medium-6 large-5 large-pull-1">
     <% if consultation.introductory_video_url.blank? %>
@@ -9,7 +9,7 @@
       </div>
     <% else %>
       <div class="embed-container">
-        <iframe src="<%= consultation.introductory_video_url %>" frameborder=0 allowfullscreen>
+        <iframe src="<%= consultation.introductory_video_url %>" allowfullscreen>
         </iframe>
       </div>
     <% end %>

data/app/views/decidim/consultations/consultations/_filters.html.erb

@@ -1,3 +1,5 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "consultations" } %>
+
 <%= filter_form_for filter do |form| %>
   <div class="filters__section">
     <div class="filters__search">
@@ -5,10 +7,12 @@
         <%= form.search_field :search_text,
                               label: false,
                               class: "input-group-field",
-                              placeholder: t("consultations.filters.search", scope: "decidim") %>
+                              placeholder: t("consultations.filters.search", scope: "decidim"),
+                              title: t("consultations.filters.search", scope: "decidim"),
+                              data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t("consultations.filters.search", scope: "decidim") %>
+          <button type="submit" class="button" aria-controls="consultations">
+            <%= icon "magnifying-glass", aria_label: t("consultations.filters.search", scope: "decidim"), role: "img" %>
           </button>
         </div>
       </div>
@@ -19,7 +23,8 @@
                                     options_for_state_filter,
                                     :first,
                                     :last,
-                                    legend_title: t("consultations.filters.state", scope: "decidim") %>
+                                    { legend_title: t("consultations.filters.state", scope: "decidim") },
+                                    "aria-controls": "consultations" %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

data/app/views/decidim/consultations/consultations/_question.html.erb

@@ -1,4 +1,4 @@
-<article class="card consultations-card">
+<div class="card consultations-card">
   <div class="row collapse card--process__row">
     <div class="columns mediumlarge-8 large-9 card--process__column">
       <div class="card__content">
@@ -35,4 +35,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

data/app/views/decidim/consultations/consultations/index.html.erb

@@ -11,9 +11,9 @@ edit_link(
   <div class="row columns">
     <div class="title-action">
       <div class="row collapse">
-        <h2 id="consultations-count" class="title-action__title section-heading">
+        <h1 id="consultations-count" class="title-action__title section-heading">
           <%= render partial: "count", locals: { count: consultations.count } %>
-        </h2>
+        </h1>
       </div>
     </div>
   </div>
@@ -32,4 +32,4 @@ edit_link(
 <% end %>
 
 <%= javascript_include_tag "decidim/filters" %>
-<%= javascript_include_tag "decidim/orders" %>
+<%= javascript_include_tag "decidim/results_listing" %>

data/app/views/decidim/consultations/question_multiple_votes/_form.html.erb

@@ -1,14 +1,18 @@
-<div class="row column">
-  <div class="large-offset-4 large-4 medium-offset-3 medium-6">
-    <div class="card">
-      <div class="card__content multiple_votes_form">
-        <% question.responses.each do |response| %>
-          <div>
-            <%= check_box_tag "responses[]", response.id, false, id: "vote_id_#{response.id}" %>
-            <%= form.label :id, translated_attribute(response.title), for: "vote_id_#{response.id}" %>
-          </div>
-        <% end %>
+<div class="card">
+  <% if group %>
+    <div class="card__top">
+      <div class="card__content">
+        <h5 class="card__title"><%= translated_attribute group.title %></h5>
       </div>
     </div>
+  <% end %>
+
+  <div class="card__content multiple_votes_form">
+    <% responses.each do |response| %>
+      <div>
+        <%= check_box_tag "responses[]", response.id, false, id: "vote_id_#{response.id}" %>
+        <%= form.label :id, translated_attribute(response.title), for: "vote_id_#{response.id}" %>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/decidim/consultations/question_multiple_votes/show.html.erb

@@ -3,9 +3,15 @@
     method: :post,
     html: { class: "form" }) do |f| %>
 
-  <%= render partial: "form", locals: { form: f, question: current_participatory_space } %>
+  <div class="section row<%= " question-masonry-group" if current_participatory_space.grouped? %>">
+    <% current_participatory_space.grouped_responses.each do |group, responses| %>
+      <div class="column large-4 medium-6<%= " large-offset-4 medium-offset-3" unless current_participatory_space.grouped? %>">
+        <%= render partial: "form", locals: { form: f, group: group, responses: responses } %>
+      </div>
+    <% end %>
+  </div>
 
-  <div class="section question-vote-cabin">
+  <div class="question-vote-cabin">
 
     <div class="row column">
       <div class="large-offset-4 large-4 medium-offset-3 medium-6">

data/app/views/decidim/consultations/questions/_vote_button.html.erb

@@ -8,88 +8,91 @@
   </div>
 </div>
 
-<div class="row column question-vote-cabin">
-  <div class="columns mediumlarge-4 show-for-mediumlarge previous-question">
-    <%= display_next_previous_button(:previous, "float-left") %>
-  </div>
-  <div class="columns mediumlarge-4">
-    <% if question.consultation.upcoming? %>
-      <div class="card__button button expanded disabled">
-        <div class="vote-button-caption"><%= t("questions.vote_button.vote", scope: "decidim") %></div>
-        <div>
-          <%= t "questions.vote_button.starting_from",
-                scope: "decidim",
-                date: l(question.start_voting_date) %>
-        </div>
-      </div>
-    <% elsif question.consultation.finished? && signed_in? && question.voted_by?(current_user) %>
-      <%= button_to decidim_consultations.question_question_votes_path(question),
-                  method: :delete,
-                  remote: true,
-                  data: { disable: true },
-                  class: "card__button button expanded success disabled",
-                  id: "unvote_button" do %>
-        <div class="vote-button-caption">
-          <%= t("questions.vote_button.already_voted", scope: "decidim") %>
+<%# Check if controller has questions_helper %>
+<% if defined? display_next_previous_button %>
+  <div class="row column question-vote-cabin">
+    <div class="columns mediumlarge-4 show-for-mediumlarge previous-question">
+      <%= display_next_previous_button(:previous, "float-left") %>
+    </div>
+    <div class="columns mediumlarge-4">
+      <% if question.consultation.upcoming? %>
+        <div class="card__button button expanded disabled">
+          <div class="vote-button-caption"><%= t("questions.vote_button.vote", scope: "decidim") %></div>
+          <div>
+            <%= t "questions.vote_button.starting_from",
+                  scope: "decidim",
+                  date: l(question.start_voting_date) %>
+          </div>
         </div>
-      <% end %>
-    <% elsif signed_in? && question.consultation.active? %>
-      <% if allowed_to? :unvote, :question, question: question %>
+      <% elsif question.consultation.finished? && signed_in? && question.voted_by?(current_user) %>
         <%= button_to decidim_consultations.question_question_votes_path(question),
-                      method: :delete,
-                      remote: true,
-                      data: { disable: true },
-                      class: "card__button button expanded success",
-                      id: "unvote_button" do %>
-          <div class="vote-button-caption"
-               data-original="<%= t("questions.vote_button.already_voted", scope: "decidim") %>"
-               data-replace="<%= t("questions.vote_button.already_voted_hover", scope: "decidim") %>">
+                    method: :delete,
+                    remote: true,
+                    data: { disable: true },
+                    class: "card__button button expanded success disabled",
+                    id: "unvote_button" do %>
+          <div class="vote-button-caption">
             <%= t("questions.vote_button.already_voted", scope: "decidim") %>
           </div>
         <% end %>
-      <% elsif allowed_to? :vote, :question, question: question %>
-        <% if question.multiple? %>
-          <%= link_to decidim_consultations.question_question_multiple_votes_path(question),
-                      class: "card__button button expanded",
-                      id: "multivote_button" do %>
-            <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+      <% elsif signed_in? && question.consultation.active? %>
+        <% if allowed_to? :unvote, :question, question: question %>
+          <%= button_to decidim_consultations.question_question_votes_path(question),
+                        method: :delete,
+                        remote: true,
+                        data: { disable: true },
+                        class: "card__button button expanded success",
+                        id: "unvote_button" do %>
+            <div class="vote-button-caption"
+                 data-original="<%= t("questions.vote_button.already_voted", scope: "decidim") %>"
+                 data-replace="<%= t("questions.vote_button.already_voted_hover", scope: "decidim") %>">
+              <%= t("questions.vote_button.already_voted", scope: "decidim") %>
+            </div>
+          <% end %>
+        <% elsif allowed_to? :vote, :question, question: question %>
+          <% if question.multiple? %>
+            <%= link_to decidim_consultations.question_question_multiple_votes_path(question),
+                        class: "card__button button expanded",
+                        id: "multivote_button" do %>
+              <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+            <% end %>
+          <% else %>
+            <%= link_to "#", class: "card__button button expanded", id: "vote_button" do %>
+              <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+            <% end %>
           <% end %>
         <% else %>
-          <%= link_to "#", class: "card__button button expanded", id: "vote_button" do %>
-            <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+          <%= authorized_vote_modal_button(question, remote: true, class: "button expanded light button--sc") do %>
+            <%= t("questions.vote_button.verification_required", scope: "decidim") %>
           <% end %>
         <% end %>
-      <% else %>
-        <%= authorized_vote_modal_button(question, remote: true, class: "button expanded light button--sc") do %>
-          <%= t("questions.vote_button.verification_required", scope: "decidim") %>
+      <% elsif question.consultation.active? %>
+        <%= logged_button_to decidim_consultations.question_question_votes_path(question),
+                             class: "card__button button expanded",
+                             data: { disable: true },
+                             id: "vote_button" do %>
+          <div class="vote-button-caption">
+            <%= t("questions.vote_button.vote", scope: "decidim") %>
+          </div>
         <% end %>
       <% end %>
-    <% elsif question.consultation.active? %>
-      <%= logged_button_to decidim_consultations.question_question_votes_path(question),
-                           class: "card__button button expanded",
-                           data: { disable: true },
-                           id: "vote_button" do %>
-        <div class="vote-button-caption">
-          <%= t("questions.vote_button.vote", scope: "decidim") %>
-        </div>
-      <% end %>
-    <% end %>
-  </div>
-  <div class="columns mediumlarge-4 show-for-mediumlarge next-question">
-    <%= display_next_previous_button(:next, "float-right") %>
+    </div>
+    <div class="columns mediumlarge-4 show-for-mediumlarge next-question">
+      <%= display_next_previous_button(:next, "float-right") %>
+    </div>
   </div>
-</div>
 
-<div class="row column section hide-for-mediumlarge">
-  <div class="small-buttons">
-    <div class="columns small-6 previous-question">
-      <%= display_next_previous_button(:previous, "expanded") %>
-    </div>
-    <div class="columns small-6 next-question">
-      <%= display_next_previous_button(:next, "expanded") %>
+  <div class="row column section hide-for-mediumlarge">
+    <div class="small-buttons">
+      <div class="columns small-6 previous-question">
+        <%= display_next_previous_button(:previous, "expanded") %>
+      </div>
+      <div class="columns small-6 next-question">
+        <%= display_next_previous_button(:next, "expanded") %>
+      </div>
     </div>
   </div>
-</div>
+<% end %>
 
 <%= render partial: "decidim/consultations/questions/vote_modal", locals: { question: question } %>
 <%= render partial: "decidim/consultations/questions/vote_modal_confirm", locals: { question: question } %>

data/app/views/decidim/consultations/questions/_vote_modal.html.erb

@@ -3,7 +3,7 @@
     <h3 class="reveal__title">
       <%= t "questions.vote_modal.title", scope: "decidim" %>
     </h3>
-    <button class="close-button" data-close aria-label="Close modal" type="button">
+    <button class="close-button" data-close aria-label="<%= t "questions.vote_modal.close_modal", scope: "decidim" %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>

data/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb

@@ -3,7 +3,7 @@
     <h3 class="reveal__title">
       <%= t "questions.vote_modal_confirm.title", scope: "decidim" %>
     </h3>
-    <button class="close-button" data-close aria-label="Close modal" type="button">
+    <button class="close-button" data-close aria-label="<%= t("questions.vote_modal_confirm.close_modal", scope: "decidim") %>%" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>

data/app/views/decidim/consultations/questions/show.html.erb

@@ -5,7 +5,7 @@
         <%= decidim_sanitize translated_attribute current_question.question_context %>
 
         <div class="show-more">
-          <button class="button button--muted small"><%= t "read_more", scope: "decidim.questions.show" %></button>
+          <button class="button hollow small"><%= t "read_more", scope: "decidim.questions.show" %></button>
         </div>
 
         <div class="hide show-more-panel">
@@ -13,12 +13,12 @@
 
           <div class="section">
             <h2 class=section-heading><%= t "question.what_is_decided", scope: "activemodel.attributes" %></h2>
-            <p><%= decidim_sanitize translated_attribute current_question.what_is_decided %></p>
+            <p><%= decidim_sanitize translated_attribute(current_question.what_is_decided), strip_tags: true %></p>
           </div>
 
           <div class="section">
             <h2 class=section-heading><%= t "question.question_context", scope: "activemodel.attributes" %></h2>
-            <p><%= decidim_sanitize translated_attribute current_question.question_context %></p>
+            <p><%= decidim_sanitize translated_attribute(current_question.question_context), strip_tags: true %></p>
           </div>
         </div>
       </div>
@@ -36,7 +36,7 @@
 <%= content_for :question_header_details do %>
   <div id="question-header-details" class="row consultations-home-intro">
     <div class="columns medium-5">
-      <img src="<%= current_question.hero_image&.url %>">
+      <%= image_tag current_question.hero_image&.url, alt: t("question.hero_image", scope: "activemodel.attributes") %>
     </div>
 
     <div class="columns medium-5">

data/app/views/layouts/decidim/_question_components.html.erb

@@ -2,15 +2,15 @@
   <div class="process-nav consultations-nav">
     <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
       <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
-      <div class="process-nav__link">
+      <span class="process-nav__link">
         <% if self.try(:current_component) %>
           <%= component_icon(current_component) %>
           <%= translated_attribute(current_component.name) %>
         <% else %>
-          <%= external_icon "decidim/pages/icon.svg" %>
+          <%= external_icon "decidim/pages/icon.svg", role: "img", "aria-hidden": true %>
           <%= t ".question_menu_item" %>
         <% end %>
-      </div>
+      </span>
     </button>
 
     <%

data/app/views/layouts/decidim/_question_header.html.erb

@@ -10,7 +10,7 @@
           </h1>
           <%= link_to decidim_consultations.consultations_path, class: "consultations-header__link" do %>
             <%= t ".back_to_consultation" %>
-            <%= icon "media-play" %>
+            <%= icon "media-play", role: "img", "aria-hidden": true %>
           <% end %>
         </div>
       </div>

data/app/views/layouts/decidim/admin/question.html.erb

@@ -29,7 +29,7 @@
         <% end %>
 
         <% if allowed_to? :read, :response %>
-          <li <% if is_active_link?(decidim_admin_consultations.responses_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <li <% if is_active_link?(decidim_admin_consultations.responses_path(current_participatory_space)) || is_active_link?(decidim_admin_consultations.response_groups_path(current_participatory_space)) %> class="is-active" <% end %>>
             <%= aria_selected_link_to t("responses", scope: "decidim.admin.menu.questions_submenu"),
                                       decidim_admin_consultations.responses_path(current_participatory_space) %>
           </li>