decidim-consultations 0.11.2 → 0.12.0.pre

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

@@ -7,7 +7,7 @@
                  class: "button",
                  data: { disable_with: true } %>
 
-    <% if can? :publish, current_question %>
+    <% if allowed_to? :publish, :question, question: current_question %>
       <% if current_question.published? %>
         <%= link_to t("actions.unpublish", scope: "decidim.admin"),
                     question_publish_path(current_question),
@@ -21,7 +21,7 @@
       <% end %>
     <% end %>
 
-    <% if can? :destroy, current_question %>
+    <% if allowed_to? :destroy, :question, question: current_question %>
       <%= link_to t("decidim.admin.actions.destroy"),
                   question_path(current_question),
                   method: :delete,

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

@@ -4,7 +4,7 @@
       <%= t "decidim.admin.titles.questions" %>
       <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.question.name", scope: "decidim.admin")),
                   new_consultation_question_path(current_consultation),
-                  class: "button tiny button--title" if can? :create, Decidim::Consultations::Question %>
+                  class: "button tiny button--title" if allowed_to? :create, :question %>
     </h2>
   </div>
   <div class="card-section">
@@ -22,11 +22,11 @@
           <% @questions.each do |question| %>
             <tr>
               <td>
-                <% if can? :update, question %>
+                <% if allowed_to? :update, :question, question: question %>
                   <%= link_to decidim_sanitize(translated_attribute(question.title)),
                               edit_question_path(question) %>
                   <br />
-                <% elsif can? :preview, question %>
+                <% elsif allowed_to? :preview, :question, question: question %>
                   <%= link_to translated_attribute(question.title),
                               decidim_consultations.question_path(question),
                               target: "_blank" %>
@@ -50,14 +50,14 @@
                 <% end %>
               </td>
               <td class="table-list__actions">
-                <% if can? :update, question %>
+                <% if allowed_to? :update, :question, question: question %>
                   <%= icon_link_to "pencil",
                                    edit_question_path(question),
                                    t("actions.configure", scope: "decidim.admin"),
                                    class: "action-icon--edit" %>
                 <% end %>
 
-                <% if can? :preview, question %>
+                <% if allowed_to? :preview, :question, question: question %>
                   <%= icon_link_to "eye",
                                    decidim_consultations.question_path(question),
                                    t("actions.preview", scope: "decidim.admin"),

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

@@ -7,7 +7,7 @@
                  class: "button",
                  data: { disable_with: true } %>
 
-    <% if can? :destroy, current_response %>
+    <% if allowed_to? :destroy, :response, response: current_response %>
       <%= link_to t("decidim.admin.actions.destroy"),
                   response_path(current_question, current_response),
                   method: :delete,

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

@@ -4,7 +4,7 @@
       <%= t "decidim.admin.titles.responses" %>
       <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.response.name", scope: "decidim.admin")),
                   new_response_path(current_question),
-                  class: "button tiny button--title" if can? :create, Decidim::Consultations::Response %>
+                  class: "button tiny button--title" if allowed_to? :create, :response %>
     </h2>
   </div>
   <div class="card-section">
@@ -21,7 +21,7 @@
           <% current_question.responses.each do |response| %>
             <tr>
               <td>
-                <% if can? :update, response %>
+                <% if allowed_to? :update, :response, response: response %>
                   <%= link_to translated_attribute(response.title),
                               edit_response_path(current_question, response) %>
                 <% else %>
@@ -32,7 +32,7 @@
                 <%= l response.created_at, format: :short %>
               </td>
               <td class="table-list__actions">
-                <% if can? :update, response %>
+                <% if allowed_to? :update, :response, response: response %>
                   <%= icon_link_to "pencil",
                                    edit_response_path(current_question, response),
                                    t("actions.configure", scope: "decidim.admin"),

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

@@ -1,5 +1,3 @@
 <%= render partial: "decidim/consultations/consultations/consultation_details", locals: { consultation: model } %>
 <%= render partial: "decidim/consultations/consultations/highlighted_questions", locals: { consultation: model } %>
 <%= render partial: "decidim/consultations/consultations/regular_questions", locals: { consultation: model } %>
-
-<%= stylesheet_link_tag "decidim/consultations/consultations", media: :all %>

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

@@ -10,7 +10,7 @@
 
 <div class="row small-up-1 medium-up-2 card-grid">
   <% consultations.each do |consultation| %>
-    <%= render partial: "consultation_card", locals: { consultation: consultation } %>
+    <%= card_for consultation %>
   <% end %>
 </div>
 <%= decidim_paginate consultations, random_seed: random_seed %>

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

@@ -1,10 +1,10 @@
-<% if consultation.regular_questions.any? %>
+<% if consultation.questions.any? %>
   <section id="regular-questions" class="row section">
     <h2 class=section-heading>
       <%= t "consultations.regular_questions.title", scope: "decidim" %>
     </h2>
 
-    <% consultation.regular_questions.each do |scope_id, questions| %>
+    <% consultation.questions_by_scope.each do |scope_id, questions| %>
       <h3 class="heading6"><%= translated_attribute questions.first.scope.name %></h3>
       <% questions.each do |question| %>
         <%= render partial: "decidim/consultations/consultations/question", locals: { question: question } %>

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

@@ -1,11 +1,3 @@
 <%= render partial: "consultation_details", locals: { consultation: current_consultation } %>
 <%= render partial: "highlighted_questions", locals: { consultation: current_consultation } %>
 <%= render partial: "regular_questions", locals: { consultation: current_consultation } %>
-
-<% if finished_consultations.any? %>
-  <div class="text-center">
-    <%= link_to t("consultations.show.see_finished_consultations", scope: "decidim"),
-                finished_consultations_path,
-                class: "button hollow button--sc" %>
-  </div>
-<% end %>

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

@@ -1,6 +1,9 @@
 (function () {
   'use strict';
 
+  $('#question-vote-modal').foundation("close");
+  $('#question-vote-confirm-modal').foundation("close");
+  $('#question-vote-modal, #question-vote-confirm-modal').remove()
   var voteButton = $('#question-<%= current_question.id %>-vote-button');
   voteButton.html('<%= j(render partial: "decidim/consultations/questions/vote_button", locals: { question: current_question }) %>');
 

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

@@ -1,22 +1,15 @@
 <div class="row question-vote-cabin">
   <div class="columns mediumlarge-4 mediumlarge-push-4">
     <% if question.consultation.upcoming? %>
-      <%= action_authorized_button_to :vote,
-                                    decidim_consultations.question_question_votes_path(question),
-                                    remote: true,
-                                    data: { disable: true },
-                                    class: "card__button button expanded disabled",
-                                    id: "vote_button" do %>
+      <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>
-      <% end %>
-    <% end %>
-
-    <% if question.consultation.finished? && signed_in? && question.voted_by?(current_user) %>
+      </div>
+    <% elsif question.consultation.finished? && signed_in? && question.voted_by?(current_user) %>
       <%= action_authorized_button_to :unvote,
                                       decidim_consultations.question_question_votes_path(question),
                                       method: :delete,
@@ -28,10 +21,8 @@
           <%= t("questions.vote_button.already_voted", scope: "decidim") %>
         </div>
       <% end %>
-    <% end %>
-
-    <% if signed_in? && question.consultation.active? %>
-      <% if can? :unvote, question %>
+    <% elsif signed_in? && question.consultation.active? %>
+      <% if allowed_to? :unvote, :question, question: question %>
         <%= action_authorized_button_to :unvote,
                                         decidim_consultations.question_question_votes_path(question),
                                         method: :delete,
@@ -47,24 +38,20 @@
             <%= t("questions.vote_button.already_voted", scope: "decidim") %>
           </div>
         <% end %>
-      <% end %>
-
-      <% if can? :vote, question %>
+      <% 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>
         <% end %>
       <% end %>
-    <% else %>
-      <% if question.consultation.active? %>
-        <%= action_authorized_button_to :vote,
-                                      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 %>
+    <% elsif question.consultation.active? %>
+      <%= action_authorized_button_to :vote,
+                                    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>

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

@@ -10,7 +10,7 @@
   <p><%= t "questions.vote_modal.contextual_help", scope: "decidim" %></p>
   <div class="card card--secondary">
     <div class="card__content">
-      <h4 class="heading5 text-center"><%= translated_attribute question.title %></h4>
+      <h4 class="heading5 text-center"><%= translated_attribute(question.title).html_safe %></h4>
     </div>
   </div>
 

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

@@ -10,7 +10,7 @@
   <p><%= t "questions.vote_modal_confirm.contextual_help", scope: "decidim" %></p>
   <div class="card card--secondary">
     <div class="card__content">
-      <h4 class="heading5 text-center"><%= translated_attribute question.title %></h4>
+      <h4 class="heading5 text-center"><%= translated_attribute(question.title).html_safe %></h4>
       <h5 class="heading6 text-center" id="question-vote-confirm-modal-question-title"></h5>
     </div>
   </div>

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

@@ -14,14 +14,15 @@
     </button>
     <div class="row column process-nav__content is-active" id="process-nav-content" data-toggler=".is-active">
       <ul>
-        <li class="<%= "is-active" if is_active_link?(decidim_consultations.question_path(question), :exclusive) %>"
+        <li class="<%= "is-active" if is_active_link?(decidim_consultations.question_path(question), :exclusive) %>">
           <%= active_link_to decidim_consultations.question_path(question),
                              active: :exclusive,
                              class: "process-nav__link",
                              class_active: "is-active" do %>
             <%= external_icon "decidim/pages/icon.svg" %>
             <%= t ".question_menu_item" %>
-          <% end %>>
+          <% end %>
+        </li>
         <% question.components.each do |component| %>
           <% if component.published? || component == self.try(:current_component) %>
             <li class="<%= "is-active" if is_active_link?(main_component_path(component), :inclusive) %>">

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

@@ -1,14 +1,14 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
-      <% if can? :update, current_consultation %>
+      <% if allowed_to? :update, :consultation, consultation: current_consultation %>
         <li <% if is_active_link?(decidim_admin_consultations.edit_consultation_path(current_consultation)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.consultations_submenu"),
                                     decidim_admin_consultations.edit_consultation_path(current_consultation) %>
         </li>
       <% end %>
 
-      <% if can?(:index, Decidim::Consultations::Question) %>
+      <% if allowed_to? :read, :question %>
         <li <% if is_active_link?(decidim_admin_consultations.consultation_questions_path(current_consultation)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("questions", scope: "decidim.admin.menu.consultations_submenu"),
                                     decidim_admin_consultations.consultation_questions_path(current_consultation) %>
@@ -21,8 +21,11 @@
 <%= render "layouts/decidim/admin/application" do %>
   <div class="process-title">
     <div class="process-title-content">
-      <%= translated_attribute(current_consultation.title) %>
+      <%= link_to translated_attribute(current_consultation.title), decidim_consultations.consultation_path(current_consultation), target: "_blank" %>
     </div>
   </div>
-  <%= yield %>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
 <% end %>

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

@@ -1,16 +1,22 @@
 <% content_for :secondary_nav do %>
-  <div class="secondary-nav secondary-nav--subnav">
-    <ul>
-      <% if can?(:index, Decidim::Consultation) %>
-        <li <% if is_active_link?(decidim_admin_consultations.consultations_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.consultations", scope: "decidim.admin"),
-                                    decidim_admin_consultations.consultations_path %>
-        </li>
-      <% end %>
-    </ul>
+  <div class="secondary-nav">
+    <div class="secondary-nav__title">
+      <%= t "decidim.admin.titles.consultations" %>
+    </div>
+    <div class="secondary-nav__actions">
+      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.consultation.name", scope: "decidim.admin")), ["new", "consultation"], class: "button expanded small" if allowed_to? :create, :consultation %>
+    </div>
   </div>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>
-  <%= yield %>
+  <div class="process-title">
+    <div class="process-title-content">
+      <%= link_to t("decidim.admin.titles.consultations"), decidim_consultations.consultations_path, target: "_blank" %>
+    </div>
+  </div>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
 <% end %>

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

@@ -1,28 +1,28 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
-      <% if can? :update, current_participatory_space.consultation %>
+      <% if allowed_to?(:update, :consultation, consultation: current_participatory_space.consultation) %>
         <li <% if is_active_link?(decidim_admin_consultations.edit_consultation_path(current_participatory_space.consultation)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("consultation", scope: "decidim.admin.menu.questions_submenu"),
                                     decidim_admin_consultations.edit_consultation_path(current_participatory_space.consultation) %>
         </li>
       <% end %>
 
-      <% if can?(:update, current_participatory_space) %>
+      <% 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 can? :read, Decidim::Consultations::Response %>
+      <% 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 can? :read, Decidim::Component %>
+      <% 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) %>
@@ -45,14 +45,14 @@
         </li>
       <% end %>
 
-      <% if can? :read, Decidim::Category %>
+      <% 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 can? :read, Decidim::Attachment %>
+      <% 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) %>
@@ -65,8 +65,11 @@
 <%= render "layouts/decidim/admin/application" do %>
   <div class="process-title">
     <div class="process-title-content">
-      <%= translated_attribute(current_participatory_space.consultation.title) %>
+      <%= link_to translated_attribute(current_participatory_space.consultation.title), decidim_consultations.consultation_path(current_participatory_space.consultation), target: "_blank" %>
     </div>
   </div>
-  <%= yield %>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
 <% end %>

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

@@ -12,6 +12,4 @@
       </div>
     </div>
   <% end %>
-
-  <%= stylesheet_link_tag "decidim/consultations/consultations", media: :all %>
 <% end %>

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

@@ -2,6 +2,4 @@
   <div class="wrapper">
     <%= yield %>
   </div>
-
-  <%= stylesheet_link_tag "decidim/consultations/consultations", media: :all %>
 <% end %>

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

@@ -15,5 +15,4 @@
 
   <%= javascript_include_tag "decidim/consultations/social_share" %>
   <%= stylesheet_link_tag "decidim/consultations/social_share" %>
-  <%= stylesheet_link_tag "decidim/consultations/consultations", media: :all %>
 <% end %>

data/config/locales/ca.yml

@@ -8,6 +8,7 @@ ca:
         end_voting_date: Data de finalització
         introductory_image: Imatge introductòria
         introductory_video_url: URL de vídeo introductori
+        questions: Preguntes
         slug: Nom curt d'URL
         start_voting_date: Data d'inici
         subtitle: Subtítol
@@ -35,6 +36,20 @@ ca:
       vote:
         decidim_consultations_response_id:
           not_found: La resposta no s'ha trobat.
+  activerecord:
+    models:
+      decidim/consultations:
+        one: Consulta
+        other: Consultes
+      decidim/consultations/question:
+        one: Pregunta
+        other: Preguntes
+      decidim/consultations/response:
+        one: Resposta
+        other: Respostes
+      decidim/consultations/vote:
+        one: Vot
+        other: Vots
   decidim:
     admin:
       actions:
@@ -182,11 +197,8 @@ ca:
         filter: Filtre
         filter_by: Filtra per
         unfold: Desplegar
-      finished:
-        active_consultations: Consultes actives
-        past_consultations: Consultes passades
       highlighted_questions:
-        title: Consultes de %{scope_name}
+        title: Preguntes de %{scope_name}
       index:
         title: Consultes
       question:
@@ -199,11 +211,25 @@ ca:
         create:
           error: Hi ha hagut errors en votar la pregunta
       regular_questions:
-        title: Altres consultes
+        title: Preguntes per a aquesta consulta
       show:
-        see_finished_consultations: Veure consultes prèvies
+        badge_name:
+          finished: Acabada
+          open: Oberta
+          open_votes: Obre els vots
+          published_results: Resultats publicats
+        footer_button_text:
+          debate: Debat
+          view: Veure
+          view_results: Veure resultats
+          vote: Votació
+        unspecified: Sense especificar
     menu:
       consultations: Consultes
+    pages:
+      home:
+        statistics:
+          consultations_count: Consultes
     questions:
       results:
         title: Resultats
@@ -222,7 +248,7 @@ ca:
         starting_from: A partir de %{date}
         vote: Votació
       vote_modal:
-        contextual_help: Seleccioneu una opció. Tingueu en compte que una vegada que heu confirmat, no es pot canviar el vostre suport.
+        contextual_help: Selecciona una opció.
         title: 'Consulta: suport a la pregunta'
       vote_modal_confirm:
         change: Canvia
@@ -242,7 +268,3 @@ ca:
         unfold: Desplegar
       question_header:
         back_to_consultation: Veure totes les consultes
-  pages:
-    home:
-      statistics:
-        consultations_count: Consultes