decidim-consultations 0.18.1 → 0.19.0

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

@@ -25,12 +25,12 @@
               <td>
                 <% if allowed_to? :update, :consultation, consultation: consultation %>
                   <%= link_to translated_attribute(consultation.title), edit_consultation_path(consultation) %>
-                  <br />
+                  <br>
                 <% elsif allowed_to? :preview, :consultation, consultation: consultation %>
                   <%= link_to translated_attribute(consultation.title),
                               decidim_consultations.consultation_path(consultation),
                               target: "_blank" %>
-                  <br />
+                  <br>
                 <% else %>
                   <%= translated_attribute(consultation.title) %>
                 <% end %>

data/app/views/decidim/consultations/admin/consultations/results.html.erb

@@ -0,0 +1,42 @@
+<div class="card" id="consultations">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t "decidim.admin.titles.results" %>
+      <span class="label button--title">
+        <%= t "decidim.admin.consultations.results.total_votes", count: current_consultation.total_votes %>
+        /
+        <%= t "decidim.admin.consultations.results.participants", count: current_consultation.total_participants %>
+        </span>
+    </h2>
+  </div>
+  <div class="card-section">
+    <table class="table-list">
+      <% current_consultation.questions.published.includes(:responses).each do |question| %>
+        <% unless question.external_voting %>
+          <thead>
+            <tr>
+              <th><%= strip_tags translated_attribute question.title %></th>
+              <th class="table-list__actions">
+                <%= t "decidim.admin.consultations.results.total_votes", count: question.total_votes %>
+                /
+                <%= t "decidim.admin.consultations.results.participants", count: question.total_participants %>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <% if question.publishable_results? %>
+              <% question.sorted_results.each do |response| %>
+              <tr>
+                <td><%= strip_tags translated_attribute response.title %></td>
+                <td><%= response.votes_count %></td>
+              </tr>
+              <% end %>
+            <% else %>
+              <tr><td><em><%= t "decidim.admin.consultations.results.not_visible" %></em></td><td>&nbsp;</td></tr>
+            <% end %>
+          </tbody>
+        <% end %>
+      <% end %>
+    </table>
+  </div>
+</div>

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

@@ -0,0 +1,19 @@
+<%= javascript_include_tag "decidim/slug_form" %>
+
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t "question_configuration.form.title", scope: "decidim.admin" %></h2>
+  </div>
+
+  <div class="card-section">
+    <%= t "question_configuration.form.help", scope: "decidim.admin" %>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.number_field :max_votes, step: 1, min: 1 %>
+      <%= form.number_field :min_votes, step: 1, min: 1 %>
+      <%= form.translated :editor, :instructions, toolbar: :full, lines: 5 %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/consultations/admin/question_configuration/edit.html.erb

@@ -0,0 +1,12 @@
+<%= decidim_form_for @form,
+                     url: question_configuration_path(current_question),
+                     method: :patch,
+                     html: { class: "form edit_question" } do |f| %>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t("questions.edit.update", scope: "decidim.admin"),
+                 class: "button",
+                 data: { disable_with: true } %>
+
+  </div>
+<% end %>

data/app/views/decidim/consultations/admin/questions/edit.html.erb

@@ -1,5 +1,6 @@
 <%= decidim_form_for @form,
                      url: question_path(current_question),
+                     method: :patch,
                      html: { class: "form edit_question" } do |f| %>
   <%= render partial: "form", object: f %>
   <div class="button--double form-general-submit">

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

@@ -25,12 +25,12 @@
                 <% if allowed_to? :update, :question, question: question %>
                   <%= link_to decidim_sanitize(translated_attribute(question.title)),
                               edit_question_path(question) %>
-                  <br />
+                  <br>
                 <% elsif allowed_to? :preview, :question, question: question %>
                   <%= link_to translated_attribute(question.title),
                               decidim_consultations.question_path(question),
                               target: "_blank" %>
-                  <br />
+                  <br>
                 <% else %>
                   <%= translated_attribute(question.title) %>
                 <% end %>
@@ -50,6 +50,7 @@
                 <% end %>
               </td>
               <td class="table-list__actions">
+
                 <% if allowed_to? :update, :question, question: question %>
                   <%= icon_link_to "pencil",
                                    edit_question_path(question),
@@ -57,6 +58,8 @@
                                    class: "action-icon--edit" %>
                 <% end %>
 
+                <%= free_resource_permissions_link(question) %>
+
                 <% if allowed_to? :preview, :question, question: question %>
                   <%= icon_link_to "eye",
                                    decidim_consultations.question_path(question),
@@ -64,6 +67,7 @@
                                    class: "action-icon--preview",
                                    target: "_blank" %>
                 <% end %>
+
               </td>
             </tr>
           <% end %>

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

@@ -13,4 +13,4 @@
     <%= card_for consultation %>
   <% end %>
 </div>
-<%= decidim_paginate consultations, random_seed: random_seed %>
+<%= decidim_paginate consultations %>

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

@@ -1,10 +1,12 @@
 <% if consultation.highlighted_questions.any? %>
   <div class="row section" id="highlighted-questions">
-    <h2 class=section-heading>
-      <%= t "consultations.highlighted_questions.title",
-            scope: "decidim",
-            scope_name: translated_attribute(consultation.highlighted_scope.name) %>
-    </h2>
+    <% if consultation.highlighted_scope.present? %>
+      <h2 class=section-heading>
+        <%= t "consultations.highlighted_questions.title",
+              scope: "decidim",
+              scope_name: translated_attribute(consultation.highlighted_scope.name) %>
+      </h2>
+    <% end %>
 
     <% consultation.highlighted_questions.each do |question| %>
       <%= render partial: "decidim/consultations/consultations/question", locals: { question: question } %>

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

@@ -0,0 +1,14 @@
+<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>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,14 @@
+<div class="row column results-rules">
+  <div class="callout secondary">
+    <div class="row">
+      <div class="columns medium-8 large-9">
+        <h3 class="heading3"><%= t(".title") %></h3>
+        <ul>
+          <li><%= t(".vote_limit.description", limit: question.max_votes) %></li>
+          <li><%= t(".minimum_votes_per_user.description", votes: question.min_votes) %></li>
+          <li><%= t(".total_participants", count: question.total_participants) %></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,29 @@
+<div class="row column voting-rules">
+  <div class="callout secondary">
+    <div class="row">
+      <div class="columns medium-8 large-9">
+        <h3 class="heading3"><%= t(".title") %></h3>
+        <ul>
+          <li><%= t(".vote_limit.description", limit: question.max_votes) %></li>
+          <li><%= t(".minimum_votes_per_user.description", votes: question.min_votes) %></li>
+        </ul>
+        <% if question.instructions %>
+          <%= decidim_sanitize translated_attribute question.instructions %>
+        <% end %>
+      </div>
+      <div class="columns medium-4 large-3">
+        <div class="card card--nomargin text-center remaining-votes-counter">
+          <div class="card__content">
+            <span class="definition-data__title"><%= t(".vote_limit.left", limit: question.max_votes) %></span>
+            <span id="remaining-votes-count" class="extra__suport-number">
+              <%= question.max_votes %>
+            </span>
+            <span class="extra__suport-text"><%= t(".vote_limit.votes") %></span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= javascript_include_tag "decidim/consultations/utils_multiple" %>

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

@@ -0,0 +1,36 @@
+<%= decidim_form_for(@form,
+    url: decidim_consultations.question_question_multiple_votes_path(current_participatory_space),
+    method: :post,
+    html: { class: "form" }) do |f| %>
+
+  <%= render partial: "form", locals: { form: f, question: current_participatory_space } %>
+
+  <div class="section question-vote-cabin">
+
+    <div class="row column">
+      <div class="large-offset-4 large-4 medium-offset-3 medium-6">
+        <%= button_to decidim_consultations.question_question_votes_path(current_participatory_space),
+                      method: :post,
+                      class: "card__button button expanded",
+                      id: "vote_button" do %>
+            <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+        <% end %>
+      </div>
+
+    </div>
+
+  </div>
+  <div class="row">
+    <div class="column">
+      <%= link_to decidim_consultations.question_path(current_participatory_space),
+                  class: "card__button button hollow float-left" do %>
+            &larr; <%= t("question_header.back_to_question", scope: "layouts.decidim") %>
+      <% end %>
+    </div>
+  </div>
+
+<% end %>
+
+<%= content_for :question_header_instructions do %>
+  <%= render partial: "decidim/consultations/question_multiple_votes/voting_rules", locals: { question: current_participatory_space } %>
+<% end %>

data/app/views/decidim/consultations/question_votes/update_vote_button.js.erb

@@ -9,4 +9,13 @@
 
   $('#question-vote-modal').foundation();
   $('#question-vote-confirm-modal').foundation();
+
+  <% if signed_in? && current_question.voted_by?(current_user) %>
+    $('#vote-result-callout').addClass('warning').removeClass('hide danger');
+    $('#vote-result-callout .callout-title').text($('#vote-result-callout').data('title-ok'));
+    $('#vote-result-callout .callout-message').text($('#vote-result-callout').data('message-ok'));
+    $('#confirm-vote-form-loader').addClass('hide');
+    $('#confirm-vote-form').removeClass('hide');
+  <% end %>
+
 }());

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

@@ -1,6 +1,10 @@
 <% if question.sorted_results.any? %>
+
   <div class=row>
     <h2 class=section-heading><%= t "questions.results.title", scope: "decidim" %></h2>
+  <% if question.multiple? %>
+    <%= render partial: "decidim/consultations/question_multiple_votes/results_rules", locals: { question: question } %>
+  <% end %>
     <div class="card card--list">
       <% question.sorted_results.each do |response| %>
         <div class=card--list__item>

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

@@ -1,3 +1,13 @@
+<div class="row column">
+  <div class="callout hide" id="vote-result-callout" data-closable data-title-ok="<%= t("question_votes.create.title_success", scope: "decidim.consultations") %>" data-message-ok="<%= t("question_votes.create.success", scope: "decidim.consultations") %>" data-title-ko="<%= t("question_votes.create.title_error", scope: "decidim.consultations") %>" data-message-ko="<%= t("question_votes.create.error", scope: "decidim.consultations") %>">
+    <h5 class="callout-title"></h5>
+    <p class="callout-message"></p>
+    <button class="close-button" aria-label="Dismiss alert" type="button" data-close>
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </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") %>
@@ -38,8 +48,20 @@
           </div>
         <% end %>
       <% elsif allowed_to? :vote, :question, question: question %>
-        <%= link_to "#", class: "card__button button expanded", id: "vote_button" do %>
-          <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+        <% 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 %>
+        <%= authorized_vote_modal_button(question, remote: true, class: "button expanded light button--sc") do %>
+          <%= t("questions.vote_button.verification_required", scope: "decidim") %>
         <% end %>
       <% end %>
     <% elsif question.consultation.active? %>
@@ -56,11 +78,14 @@
   <div class="columns mediumlarge-4 show-for-mediumlarge next-question">
     <%= display_next_previous_button(:next, "float-right") %>
   </div>
+</div>
+
+<div class="row column section hide-for-mediumlarge">
   <div class="small-buttons">
-    <div class="columns small-6 hide-for-mediumlarge previous-question">
+    <div class="columns small-6 previous-question">
       <%= display_next_previous_button(:previous, "expanded") %>
     </div>
-    <div class="columns small-6 hide-for-mediumlarge next-question">
+    <div class="columns small-6 next-question">
       <%= display_next_previous_button(:next, "expanded") %>
     </div>
   </div>

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

@@ -23,6 +23,7 @@
                         class: "button expanded",
                         data: { disable: true } %>
       <% end %>
+      <div id="confirm-vote-form-loader" class="loading-spinner hide"></div>
     </div>
   </div>
   <div class="text-center">

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

@@ -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 %>" />
+      <img src="<%= current_question.hero_image&.url %>">
     </div>
 
     <div class="columns medium-5">

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

@@ -20,6 +20,8 @@
   </div>
 </div>
 
+<%= yield :question_header_instructions if content_for? :question_header_instructions %>
+
 <div class="row column consultations-title">
   <h1 class="heading2"><%= decidim_sanitize translated_attribute question.title %></h1>
   <% unless question.hashtag.blank? %>
@@ -30,17 +32,3 @@
 
   <%= yield :question_header_details if content_for? :question_header_details %>
 </div>
-
-<% if question.external_voting %>
-  <iframe src="<%= question.i_frame_url %>"></iframe>
-<% else %>
-  <% if question.results_published? %>
-    <%= render partial: "decidim/consultations/questions/results", locals: { question: question } %>
-  <% else %>
-    <div id="question-<%= question.id %>-vote-button">
-      <%= render partial: "decidim/consultations/questions/vote_button", locals: { question: question } %>
-    </div>
-  <% end %>
-<% end %>
-
-<%= render partial: "layouts/decidim/question_components", locals: { question: question } %>

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

@@ -0,0 +1,11 @@
+<% if question.external_voting %>
+  <iframe src="<%= question.i_frame_url %>"></iframe>
+<% else %>
+  <% if question.results_published? %>
+    <%= render partial: "decidim/consultations/questions/results", locals: { question: question } %>
+  <% else %>
+    <div id="question-<%= question.id %>-vote-button">
+      <%= render partial: "decidim/consultations/questions/vote_button", locals: { question: question } %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -14,6 +14,10 @@
           <%= aria_selected_link_to t("questions", scope: "decidim.admin.menu.consultations_submenu"),
                                     decidim_admin_consultations.consultation_questions_path(current_consultation) %>
         </li>
+        <li <% if is_active_link?(decidim_admin_consultations.results_consultation_path(current_consultation)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("results", scope: "decidim.admin.menu.consultations_submenu"),
+                                    decidim_admin_consultations.results_consultation_path(current_consultation) %>
+        </li>
       <% end %>
     </ul>
   </div>

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

@@ -9,56 +9,76 @@
         </li>
       <% end %>
 
-      <% if allowed_to?(:update, :question, question: current_participatory_space) %>
-        <li <% if is_active_link?(decidim_admin_consultations.edit_question_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.questions_submenu"),
-                                    decidim_admin_consultations.edit_question_path(current_participatory_space) %>
-        </li>
-      <% end %>
+        <li <% if is_active_link?(decidim_admin_consultations.consultation_questions_path(current_participatory_space.consultation)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("questions", scope: "decidim.admin.menu.consultations_submenu"),
+                                    decidim_admin_consultations.consultation_questions_path(current_participatory_space.consultation) %>
 
-      <% if allowed_to? :read, :response %>
-        <li <% if is_active_link?(decidim_admin_consultations.responses_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>
-      <% end %>
+        <ul>
+        <% if allowed_to?(:update, :question, question: current_participatory_space) %>
+          <li <% if is_active_link?(decidim_admin_consultations.edit_question_path(current_participatory_space)) %> class="is-active" <% end %>>
+            <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.questions_submenu"),
+                                      decidim_admin_consultations.edit_question_path(current_participatory_space) %>
+          </li>
+        <% end %>
 
-      <% if allowed_to? :read, :component %>
-        <li <% if is_active_link?(decidim_admin_consultations.components_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.questions_submenu"),
-                                    decidim_admin_consultations.components_path(current_participatory_space) %>
-          <ul>
-            <% current_participatory_space.components.each do |component| %>
-              <% if component.manifest.admin_engine %>
-                <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_consultations.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_consultations.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
-                  <%= link_to manage_component_path(component) do %>
-                    <%= translated_attribute component.name %>
-                    <% if component.primary_stat.present? %>
-                      <span class="component-counter <%= "component-counter--off" if component.primary_stat.zero? %>">
-                        <%= component.primary_stat %>
-                      </span>
+         <% if allowed_to?(:configure, :question, question: current_participatory_space) %>
+          <li <% if is_active_link?(decidim_admin_consultations.edit_question_configuration_path(current_participatory_space)) %> class="is-active" <% end %>>
+            <%= aria_selected_link_to t("configuration", scope: "decidim.admin.menu.questions_submenu"),
+                                      decidim_admin_consultations.edit_question_configuration_path(current_participatory_space) %>
+          </li>
+        <% end %>
+
+        <% if allowed_to? :read, :response %>
+          <li <% if is_active_link?(decidim_admin_consultations.responses_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>
+        <% end %>
+
+        <% if allowed_to? :read, :component %>
+          <li <% if is_active_link?(decidim_admin_consultations.components_path(current_participatory_space)) %> class="is-active" <% end %>>
+            <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.questions_submenu"),
+                                      decidim_admin_consultations.components_path(current_participatory_space) %>
+            <ul>
+              <% current_participatory_space.components.each do |component| %>
+                <% if component.manifest.admin_engine %>
+                  <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_consultations.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_consultations.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
+                    <%= link_to manage_component_path(component) do %>
+                      <%= translated_attribute component.name %>
+                      <% if component.primary_stat.present? %>
+                        <span class="component-counter <%= "component-counter--off" if component.primary_stat.zero? %>">
+                          <%= component.primary_stat %>
+                        </span>
+                      <% end %>
                     <% end %>
-                  <% end %>
-                </li>
+                  </li>
+                <% end %>
               <% end %>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
+            </ul>
+          </li>
+        <% end %>
 
-      <% if allowed_to? :read, :category %>
-        <li <% if is_active_link?(decidim_admin_consultations.categories_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t(".categories"),
-                                    decidim_admin_consultations.categories_path(current_participatory_space) %>
-        </li>
-      <% end %>
+        <% if allowed_to? :read, :category %>
+          <li <% if is_active_link?(decidim_admin_consultations.categories_path(current_participatory_space)) %> class="is-active" <% end %>>
+            <%= aria_selected_link_to t(".categories"),
+                                      decidim_admin_consultations.categories_path(current_participatory_space) %>
+          </li>
+        <% end %>
+
+        <% if allowed_to? :read, :attachment %>
+          <li <% if is_active_link?(decidim_admin_consultations.question_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
+            <%= aria_selected_link_to t(".attachments"),
+                                      decidim_admin_consultations.question_attachments_path(current_participatory_space) %>
+          </li>
+        <% end %>
+        </ul>
+      </li>
+
+      <li <% if is_active_link?(decidim_admin_consultations.results_consultation_path(current_participatory_space.consultation)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("results", scope: "decidim.admin.menu.consultations_submenu"),
+                                    decidim_admin_consultations.results_consultation_path(current_participatory_space.consultation) %>
+      </li>
 
-      <% if allowed_to? :read, :attachment %>
-        <li <% if is_active_link?(decidim_admin_consultations.question_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t(".attachments"),
-                                    decidim_admin_consultations.question_attachments_path(current_participatory_space) %>
-        </li>
-      <% end %>
     </ul>
   </div>
 <% end %>
@@ -67,6 +87,8 @@
   <div class="process-title">
     <div class="process-title-content">
       <%= link_to translated_attribute(current_participatory_space.consultation.title), decidim_consultations.consultation_path(current_participatory_space.consultation), target: "_blank" %>
+      &gt;
+      <%= strip_tags translated_attribute(current_participatory_space.title) %>
     </div>
   </div>