decidim-proposals 0.0.3 → 0.0.5

data/app/views/decidim/proposals/admin/proposals/new.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb

@@ -1,14 +1,14 @@
 var $proposalVotesCount = $('#proposal-<%= proposal.id %>-votes-count');
 var $proposalVoteButton = $('#proposal-<%= proposal.id %>-vote-button');
 
-$proposalVotesCount.html('<%= j(render partial: 'decidim/proposals/proposals/votes_count', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
-$proposalVoteButton.html('<%= j(render partial: 'decidim/proposals/proposals/vote_button', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
+morphdom($proposalVotesCount[0], '<%= j(render partial: 'decidim/proposals/proposals/votes_count', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
+morphdom($proposalVoteButton[0], '<%= j(render partial: 'decidim/proposals/proposals/vote_button', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
 
 <% if vote_limit_enabled? %>
   var $remainingVotesCount = $('#remaining-votes-count');
   var $notVotedButtons = $('.card__button.button').not('.success');
 
-  $remainingVotesCount.html('<%= j(render partial: 'decidim/proposals/proposals/remaining_votes_count') %>');
+  morphdom($remainingVotesCount[0], '<%= j(render partial: 'decidim/proposals/proposals/remaining_votes_count') %>');
 
   <% if remaining_votes_count_for(current_user) == 0 %>
     $notVotedButtons.attr('disabled', true);
@@ -17,4 +17,4 @@ $proposalVoteButton.html('<%= j(render partial: 'decidim/proposals/proposals/vot
     $notVotedButtons.attr('disabled', false);
     $notVotedButtons.val('<%= t('decidim.proposals.proposals.vote_button.vote') %>');
   <% end %>
-<% end %>
+<% end %>

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

@@ -12,17 +12,29 @@
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizenship", t('.citizenship')]], :first, :last, legend_title: t('.origin') %>
+  <% if feature_settings.official_proposals_enabled %>
+    <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizenship", t('.citizenship')]], :first, :last, legend_title: t('.origin') %>
+  <% end %>
+
+  <% if feature_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
+    <%= form.collection_radio_buttons :state, [["all", t('.all')], ["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, legend_title: t('.state') %>
+  <% end %>
 
-  <%= form.collection_radio_buttons :state, [["all", t('.all')], ["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, legend_title: t('.state') %>
+  <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>
+    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, legend_title: t('.related_to') %>
+  <% end %>
 
   <% if current_user && current_settings.votes_enabled? %>
     <%= form.collection_check_boxes :activity, [["voted", t('.voted')]], :first, :last, legend_title: t('.activity') %>
   <% end %>
 
+  <% if current_organization.scopes.any? && feature_settings.scoped_proposals_enabled %>
+    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+  <% end %>
+
   <% if current_feature.categories.any? %>
     <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>
   <% end %>
 
-  <%= form.hidden_field :random_seed %>
+  <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

data/app/views/decidim/proposals/proposals/_proposal.html.erb

@@ -19,21 +19,13 @@
       </div>
       <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
       <p><%= truncate(proposal.body, length: 100) %></p>
-      <% if proposal.category %>
-        <ul class="tags tags--proposal">
-          <li><a href=""><%= translated_attribute(proposal.category.name) %></a></li>
-        </ul>
-      <% end %>
+      <%= render partial: "tags", locals: { proposal: proposal } %>
     </div>
     <div class="card__footer">
       <div class="card__support">
         <% if current_settings.votes_enabled? %>
-          <div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
-            <%= render partial: "votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
-          </div>
-          <div id="proposal-<%= proposal.id %>-vote-button"> 
-            <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
-          </div>
+          <%= render partial: "votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
+          <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
         <% elsif !current_settings.votes_enabled? || current_settings.votes_enabled? && current_settings.votes_blocked? %>
           <div class="card__support__data"></div>
           <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>

data/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -1,4 +1,5 @@
+<%= order_selector [:random, :most_voted, :recent], i18n_scope: "decidim.proposals.proposals.orders" %>
 <div class="row small-up-1 medium-up-2 card-grid">
   <%= render @proposals %>
 </div>
-<%= decidim_paginate @proposals, random_seed: @random_seed %>
+<%= decidim_paginate @proposals, random_seed: random_seed %>

data/app/views/decidim/proposals/proposals/_remaining_votes_count.html.erb

@@ -1 +1,3 @@
-<%= remaining_votes_count_for(current_user) %>
+<span id="remaining-votes-count" class="extra__suport-number">
+  <%= remaining_votes_count_for(current_user) %>
+</span>

data/app/views/decidim/proposals/proposals/_tags.html.erb

@@ -0,0 +1,10 @@
+<% if proposal.category.present? || proposal.scope.present? %>
+  <ul class="tags tags--proposal" >
+    <% if proposal.category.present? %>
+      <li><%= link_to translated_attribute(proposal.category.name), decidim_proposals.proposals_path(filter: { category_id: proposal.category.id }) %></li>
+    <% end %>
+    <% if proposal.scope.present? && feature_settings.scoped_proposals_enabled %>
+      <li><%= link_to proposal.scope.name, decidim_proposals.proposals_path(filter: { scope_id: [proposal.scope.id] }) %></li>
+    <% end %>
+  </ul>
+<% end %>

data/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -1,25 +1,27 @@
-<% if current_user %>
-  <% if proposal.voted_by? current_user %>
-    <% if vote_limit_enabled? %>
-      <%= button_to t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
-    <% else %>
-      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
-        <%= t('.already_voted') %>
-      </button>
-    <% end %>
+<div id="proposal-<%= proposal.id %>-vote-button">
+  <% if !current_user %>
+    <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
+      <%= t('.vote') %>
+    </button>
   <% else %>
-    <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-      <%= button_to t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
-    <% elsif current_settings.votes_blocked? %>
-      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled">
-        <%= t('.votes_blocked') %>
-      </button>
+    <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
+      <% if vote_limit_enabled? %>
+        <%= action_authorized_button_to :vote, t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
+      <% else %>
+        <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
+          <%= t('.already_voted') %>
+        </button>
+      <% end %>
     <% else %>
-      <%= button_to t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+      <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+        <%= action_authorized_button_to :vote, t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+      <% elsif current_settings.votes_blocked? %>
+        <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled">
+          <%= t('.votes_blocked') %>
+        </button>
+      <% else %>
+        <%= action_authorized_button_to "vote", t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+      <% end %>
     <% end %>
   <% end %>
-<% else %>
-  <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
-    <%= t('.vote') %>
-  </button>
-<% end %>
+</div>

data/app/views/decidim/proposals/proposals/_votes_count.html.erb

@@ -1,6 +1,9 @@
-<span class="<%= votes_count_classes(from_proposals_list)[:number] %>">
-  <%= proposal.votes.size %>
-</span>
-<span class="<%= votes_count_classes(from_proposals_list)[:label]  %>">
-  <%= t('.count', count: proposal.votes.size) %>
-</span>
+<div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
+  <span class="<%= votes_count_classes(from_proposals_list)[:number] %>">
+    <%= proposal.proposal_votes_count %>
+  </span>
+  <span class="<%= votes_count_classes(from_proposals_list)[:label]  %>">
+    <%= t('.count', count: proposal.proposal_votes_count) %>
+  </span>
+
+</div>

data/app/views/decidim/proposals/proposals/_votes_limit.html.erb

@@ -10,9 +10,7 @@
           <div class="card card--nomargin text-center">
             <div class="card__content">
               <span class="definition-data__title"><%= t('.vote_limit.left', limit: feature_settings.vote_limit) %></span>
-              <span id="remaining-votes-count" class="extra__suport-number">
-                <%= render partial: "remaining_votes_count" %>
-              </span>
+              <%= render partial: "remaining_votes_count" %>
               <span class="extra__suport-text"><%= t('.vote_limit.votes') %></span>
             </div>
           </div>

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

@@ -4,8 +4,8 @@
     <h2 id="proposals-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
     </h2>
-    <% if can? :create, Decidim::Proposals::Proposal %>
-      <%= link_to new_proposal_path, class: "title-action__action button small hollow" do %>
+    <% if current_settings.creation_enabled %>
+      <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow" do %>
         <%= t(".new_proposal") %>
         <%= icon "plus" %>
       <% end %>
@@ -30,4 +30,4 @@
 </div>
 
 <%= javascript_include_tag("decidim/filters") %>
-<%= render partial: "decidim/shared/login_modal" %>
+<%= javascript_include_tag "decidim/orders" %>

data/app/views/decidim/proposals/proposals/index.js.erb

@@ -1,5 +1,10 @@
 var $proposals = $('#proposals');
 var $proposalsCount = $('#proposals-count');
+var $orderFilterInput = $('.order_filter');
 
 $proposals.html('<%= j(render partial: "proposals") %>');
-$proposalsCount.html('<%= j(render partial: "count") %>');
+$proposalsCount.html('<%= j(render partial: "count") %>');
+$orderFilterInput.val('<%= order %>');
+
+var $dropdownMenu = $('.dropdown.menu:last');
+$dropdownMenu.foundation();

data/app/views/decidim/proposals/proposals/new.html.erb

@@ -9,7 +9,7 @@
   <div class="columns large-6 medium-centered">
     <div class="card">
       <div class="card__content">
-        <%= form_for(@form) do |form| %>
+        <%= decidim_form_for(@form) do |form| %>
           <div class="field">
             <%= form.text_field :title %>
           </div>
@@ -24,7 +24,7 @@
             </div>
           <% end %>
 
-          <% if @form.scopes&.any? %>
+          <% if @form.scopes&.any? && feature_settings.scoped_proposals_enabled %>
             <div class="field">
               <%= form.select :scope_id, @form.scopes.map{|s| [s.name, s.id]}, prompt: t(".select_a_scope") %>
             </div>

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

@@ -1,7 +1,8 @@
-<% content_for :meta_description, @proposal.body %>
-<% content_for :meta_title, @proposal.title %>
-<% content_for :meta_url, proposal_url(@proposal.id) %>
-<% content_for :twitter_handler, current_organization.twitter_handler %>
+<% add_decidim_meta_tags({
+  description: @proposal.body,
+  title: @proposal.title,
+  url: proposal_url(@proposal.id)
+}) %>
 
 <%= render partial: "votes_limit" %>
 <div class="row column view-header">
@@ -34,30 +35,30 @@
         </div>
       </div>
     <% end %>
-    <%= render partial: "share", locals: { proposal: @proposal } %>
+    <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <%= render partial: "proposal_badge", locals: { proposal: @proposal } %>
       <p><%= @proposal.body %></p>
-      <% if @proposal.category || @proposal.scope %>
-        <ul class="tags tags--proposal">
-          <% if @proposal.category %>
-            <li><a href=""><%= translated_attribute(@proposal.category.name) %></a></li>
-          <% end %>
-          <% if @proposal.scope %>
-            <li><a href=""><%= @proposal.scope.name %></a></li>
-          <% end %>
-        </ul>
-      <% end %>
+      <%= render partial: "tags", locals: { proposal: @proposal } %>
     </div>
-    <% if @proposal.rejected? %>
-      <div class="section">
-        <div class="callout warning">
-          <h5><%= t(".proposal_rejected_reason") %></h5>
-          <p><%= translated_attribute @proposal.answer %></p>
+    <% if @proposal.answered? && translated_attribute(@proposal.answer).present? %>
+      <% if @proposal.accepted? %>
+        <div class="section">
+          <div class="callout success">
+            <h5><%= t(".proposal_accepted_reason") %></h5>
+            <p><%= translated_attribute @proposal.answer %></p>
+          </div>
         </div>
-      </div>
+      <% else %>
+        <div class="section">
+          <div class="callout warning">
+            <h5><%= t(".proposal_rejected_reason") %></h5>
+            <p><%= translated_attribute @proposal.answer %></p>
+          </div>
+        </div>
+      <% end %>
     <% end %>
     <%= linked_resources_for @proposal, :results, "included_proposals" %>
     <%= linked_resources_for @proposal, :projects, "included_proposals" %>
@@ -65,13 +66,7 @@
   </div>
 </div>
 
-<%= content_for :expanded do %>
-  <% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
-    <%= comments_for @proposal, arguable: true, votable: true %>
-  <% end %>
-<% end %>
-
-<%= render partial: "decidim/shared/login_modal" %>
+<%= comments_for @proposal %>
 
 <%= javascript_include_tag "decidim/proposals/social_share" %>
 <%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/config/i18n-tasks.yml

@@ -6,3 +6,5 @@ ignore_unused:
 - "decidim.resource_links.*"
 - "activemodel.attributes.proposal.*"
 - "decidim.proposals.answers.*"
+- "decidim.features.proposals.actions.*"
+- "decidim.proposals.proposals.orders.*"

data/config/locales/ca.yml

@@ -10,12 +10,23 @@ ca:
   decidim:
     features:
       proposals:
+        actions:
+          create: Crear propostes
+          vote: Votar
         name: Propostes
         settings:
+          global:
+            comments_enabled: Comentaris habilitats
+            official_proposals_enabled: Propostes oficials habilitades
+            proposal_answering_enabled: Resposta oficial a propostes activades
+            scoped_proposals_enabled: Propostes amb àmbits
+            vote_limit: Límit de vot
           step:
+            comments_blocked: Comentaris bloquejats
             creation_enabled: Habilitar de creació de propostes
-            votes_blocked: Vots bloquejats
-            votes_enabled: Vots habilitats
+            proposal_answering_enabled: Resposta oficial a propostes activades
+            votes_blocked: Suports bloquejats
+            votes_enabled: Suports habilitats
     proposals:
       actions:
         answer: Respondre
@@ -75,6 +86,8 @@ ca:
           official: Oficial
           origin: Origen
           rejected: Rebutjades
+          related_to: Relacionat amb
+          scopes: Àmbits
           search: Cerca
           state: Estat
           voted: Votat
@@ -87,37 +100,39 @@ ca:
           new_proposal: Nova proposta
         linked_proposals:
           proposal_votes:
-            one: <span class="card--list__data__number">1</span>vot
-            other: <span class="card--list__data__number">%{count}</span>vots
+            one: <span class="card--list__data__number">1</span>suport
+            other: <span class="card--list__data__number">%{count}</span>suports
         new:
           back: Enrere
           select_a_category: Si us plau, seleccioni una categoria
           select_a_scope: Si us plau, seleccioni un àmbit
           send: Enviar
           title: Nova proposta
+        orders:
+          label: 'Ordenar propostes per:'
+          most_voted: Més votat
+          random: Aleatori
+          recent: Recent
         proposal:
           view_proposal: Veure proposta
-        share:
-          close_window: Tanca la finestra
-          share: Compartir
-          share_link: Comparteix l'enllaç
         show:
+          proposal_accepted_reason: 'Aquesta proposta ha estat acceptada perquè:'
           proposal_rejected_reason: 'Aquesta proposta ha estat rebutjada perquè:'
         vote_button:
           already_voted: Ja has votat
-          no_votes_remaining: No hi ha vots restants
+          no_votes_remaining: No hi ha suports restants
           vote: Votar
-          votes_blocked: Votació desactivada
+          votes_blocked: Recollida de suports desactivada
         votes_count:
           count:
-            one: VOT
-            other: VOTS
+            one: SUPORT
+            other: SUPORTS
         votes_limit:
           vote_limit:
-            description: En lloc de votar tantes propostes com vulgui, només es pot votar fins %{limit} propostes.
+            description: En lloc de donar suport a tantes propostes com es vulgui, només es pot donar suport fins a un màxim de %{limit} propostes.
             left: Restant
-            title: Té %{limit} vots a distribuir
-            votes: Vots
+            title: Té %{limit} suports a distribuir
+            votes: Suports
     resource_links:
       included_proposals:
         results: 'La proposta apareix en aquests resultats:'

data/config/locales/en.yml

@@ -11,10 +11,21 @@ en:
   decidim:
     features:
       proposals:
+        actions:
+          create: Create proposals
+          vote: Vote
         name: Proposals
         settings:
+          global:
+            comments_enabled: Comments enabled
+            official_proposals_enabled: Official proposals enabled
+            proposal_answering_enabled: Proposal answering enabled
+            scoped_proposals_enabled: Scoped proposals enabled
+            vote_limit: Vote limit
           step:
+            comments_blocked: Comments blocked
             creation_enabled: Proposal creation enabled
+            proposal_answering_enabled: Proposal answering enabled
             votes_blocked: Votes blocked
             votes_enabled: Votes enabled
     proposals:
@@ -76,6 +87,8 @@ en:
           official: Official
           origin: Origin
           rejected: Rejected
+          related_to: Related to
+          scopes: Scopes
           search: Search
           state: State
           voted: Voted
@@ -96,13 +109,15 @@ en:
           select_a_scope: Please select a scope
           send: Send
           title: New proposal
+        orders:
+          label: 'Order proposals by:'
+          most_voted: Most voted
+          random: Random
+          recent: Recent
         proposal:
           view_proposal: View proposal
-        share:
-          close_window: Close window
-          share: Share
-          share_link: Share link
         show:
+          proposal_accepted_reason: 'This proposal has been accepted because:'
           proposal_rejected_reason: 'This proposal has been rejected because:'
         vote_button:
           already_voted: Already voted