decidim 0.0.1 → 0.0.2

data/decidim-proposals/app/views/decidim/proposals/proposal_votes/create.js.erb

@@ -0,0 +1,5 @@
+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 }) %>');

data/decidim-proposals/app/views/decidim/proposals/proposals/_count.html.erb

@@ -0,0 +1 @@
+<%= t(".proposals_count", count: @proposals.total_count) %>

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

@@ -0,0 +1,26 @@
+<%= filter_form_for filter do |form| %>
+  <div class="filters__section">
+    <div class="filters__search">
+      <div class="input-group">
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t('.search') %>
+        <div class="input-group-button">
+          <button type="submit" class="button button--muted">
+            <%= icon "magnifying-glass", aria_label: t('.search') %>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizenship", t('.citizenship')]], :first, :last, legend_title: t('.origin') %>
+
+  <% if current_user && current_settings.votes_enabled? %>
+    <%= form.collection_check_boxes :activity, [["voted", t('.voted')]], :first, :last, legend_title: t('.activity') %>
+  <% 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 %>
+<% end %>

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

@@ -26,8 +26,17 @@
     </div>
     <div class="card__footer">
       <div class="card__support">
-        <div class="card__support__data"></div>
-        <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>
+        <% 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>
+        <% else %>
+          <div class="card__support__data"></div>
+          <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>  
+        <% end %>
       </div>
     </div>
   </article>

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

@@ -0,0 +1,4 @@
+<div class="row small-up-1 medium-up-2 card-grid">
+  <%= render @proposals %>
+</div>
+<%= decidim_paginate @proposals, random_seed: @random_seed %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_share.html.erb

@@ -0,0 +1,33 @@
+<div class="text-center">
+  <button class="link text-center" data-open="processShare">
+    <%= t(".share") %>
+    <%= icon "share", class: "icon--after"%>
+  </button>
+</div>
+<div class="reveal" id="processShare" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".share") %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="button-group text-center">
+  <%= social_share_button_tag(content_for(:meta_title),
+        url: content_for(:meta_url),
+        image: content_for(:meta_image_url),
+        desc: content_for(:meta_description),
+        via: content_for(:twitter_handler)) %>
+    <a class="button secondary" data-open="urlShare">
+      <%= icon "link-intact" %>
+    </a>
+  </div>
+</div>
+<div class="reveal" id="urlShare" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".share_link") %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <h4 class="heading4"><%= "#{content_for(:meta_url)}" %></h4>
+</div>

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

@@ -0,0 +1,13 @@
+<% if current_user %>
+  <% if proposal.voted_by? current_user %>
+    <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
+      <%= t('.already_voted') %>
+    </button>
+  <% else %>
+    <%= button_to t('.vote'), proposal_proposal_votes_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 %>
+<% else %>
+  <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
+    <%= t('.vote') %>
+  </button>
+<% end %>

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

@@ -0,0 +1,6 @@
+<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>

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

@@ -1,6 +1,8 @@
 <div class="row columns">
   <div class="title-action">
-    <h2 class="title-action__title section-heading"><%= t(".proposals_count", count: @proposals.total_count) %></h2>
+    <h2 id="proposals-count" class="title-action__title section-heading">
+      <%= render partial: "count" %>
+    </h2>
     <%= link_to new_proposal_path, class: "title-action__action button small hollow" do %>
       <%= t(".new_proposal") %>
       <%= icon "plus" %>
@@ -8,16 +10,14 @@
   </div>
 </div>
 <div class="row">
-  <div class="columns mediumlarge-12 large-12">
-    <div class="row small-up-1 medium-up-3 card-grid">
-      <%= render @proposals %>
+  <div class="columns mediumlarge-4 large-3">
+    <div class="card card--secondary show-for-mediumlarge" >
+      <%= render partial: "filters" %>
     </div>
-    <%
-      # Kaminari uses url_for to generate the url, but this doesn't play nice with our engine system
-      # and unless we remove these params they are added again as query string 😩
-      params.delete("participatory_process_id")
-      params.delete("feature_id")
-    %>
-    <%= paginate @proposals, theme: "decidim", params: { random_seed: @random_seed } %>
+  </div>
+  <div id="proposals" class="columns mediumlarge-8 large-9">
+    <%= render partial: "proposals" %>
   </div>
 </div>
+
+<%= render partial: "decidim/shared/login_modal" %>

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

@@ -0,0 +1,5 @@
+var $proposals = $('#proposals');
+var $proposalsCount = $('#proposals-count');
+
+$proposals.html('<%= j(render partial: "proposals") %>');
+$proposalsCount.html('<%= j(render partial: "count") %>');

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

@@ -1,3 +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 %>
+
 <div class="row column view-header">
   <h2 class="heading2"><%= @proposal.title %></h2>
   <div class="author-data">
@@ -16,22 +21,44 @@
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
+    <% if current_settings.votes_enabled? %>
+      <div class="card extra">
+        <div class="card__content">
+            <div id="proposal-<%= @proposal.id %>-votes-count">
+              <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
+            </div>
+            <div id="proposal-<%= @proposal.id %>-vote-button"> 
+              <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
+            </div>
+        </div>
+      </div>
+    <% end %>
+    <%= render partial: "share", locals: { proposal: @proposal } %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <p><%= @proposal.body %></p>
-      <% if @proposal.category %>
+      <% if @proposal.category || @proposal.scope %>
         <ul class="tags tags--proposal">
-          <li><a href=""><%= translated_attribute(@proposal.category.name) %></a></li>
+          <% 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 %>
     </div>
   </div>
 </div>
 
-
 <%= content_for :expanded do %>
   <% if @proposal.commentable? %>
-    <%= comments_for @proposal, arguable: true %>
+    <%= comments_for @proposal, arguable: true, votable: true %>
   <% end %>
 <% end %>
+
+<%= render partial: "decidim/shared/login_modal" %>
+
+<%= javascript_include_tag "decidim/proposals/social_share" %>
+<%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/decidim-proposals/config/i18n-tasks.yml

@@ -2,3 +2,4 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.proposals.name"
+- "decidim.features.proposals.settings.*"

data/decidim-proposals/config/initializers/social_share_button.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+SocialShareButton.configure do |config|
+  config.allow_sites = %w(twitter facebook google_plus)
+end

data/decidim-proposals/config/locales/ca.yml

@@ -3,6 +3,9 @@ ca:
     features:
       proposals:
         name: Propostes
+        settings:
+          step:
+            votes_enabled: Vots habilitats
     proposals:
       actions:
         new: Nova proposta
@@ -33,9 +36,21 @@ ca:
             scope: Àmbit
             title: Títol
       proposals:
+        count:
+          proposals_count:
+            one: 1 proposta
+            other: "%{count} propostes"
+        filters:
+          activity: Activitat
+          all: Tots
+          category: Categoria
+          citizenship: Ciutadania
+          official: Oficial
+          origin: Origen
+          search: Cerca
+          voted: Votat
         index:
           new_proposal: Nova proposta
-          proposals_count: "%{count} propostes"
         new:
           back: Enrere
           select_a_category: Si us plau, seleccioni una categoria
@@ -43,4 +58,15 @@ ca:
           send: Enviar
           title: Nova proposta
         proposal:
-          view_proposal: Veure proposta
+          view_proposal: Veure proposta
+        share:
+          close_window: Tanca la finestra
+          share: Compartir
+          share_link: Comparteix l'enllaç
+        vote_button:
+          already_voted: Ja has votat
+          vote: Votar
+        votes_count:
+          count:
+            one: VOT
+            other: VOTS

data/decidim-proposals/config/locales/en.yml

@@ -4,6 +4,9 @@ en:
     features:
       proposals:
         name: Proposals
+        settings:
+          step:
+            votes_enabled: Votes enabled
     proposals:
       actions:
         new: New proposal
@@ -34,9 +37,21 @@ en:
             scope: Scope
             title: Title
       proposals:
+        count:
+          proposals_count:
+            one: 1 proposal
+            other: "%{count} proposals"
+        filters:
+          activity: Activity
+          all: All
+          category: Category
+          citizenship: Citizenship
+          official: Official
+          origin: Origin
+          search: Search
+          voted: Voted
         index:
           new_proposal: New proposal
-          proposals_count: "%{count} proposals"
         new:
           back: Back
           select_a_category: Please select a category
@@ -45,3 +60,14 @@ en:
           title: New proposal
         proposal:
           view_proposal: View proposal
+        share:
+          close_window: Close window
+          share: Share
+          share_link: Share link
+        vote_button:
+          already_voted: Already voted
+          vote: Vote
+        votes_count:
+          count:
+            one: VOTE
+            other: VOTES

data/decidim-proposals/config/locales/es.yml

@@ -3,6 +3,9 @@ es:
     features:
       proposals:
         name: Propuestas
+        settings:
+          step:
+            votes_enabled: Votos habilitados
     proposals:
       actions:
         new: Nueva propuesta
@@ -33,9 +36,21 @@ es:
             scope: Ámbito
             title: Título
       proposals:
+        count:
+          proposals_count:
+            one: 1 propuesta
+            other: "%{count} propuestas"
+        filters:
+          activity: Actividad
+          all: Todas
+          category: Categoría
+          citizenship: Ciudadanía
+          official: Oficial
+          origin: Origen
+          search: Buscar
+          voted: Votado
         index:
           new_proposal: Nueva propuesta
-          proposals_count: "%{count} propuestas"
         new:
           back: Atrás
           select_a_category: Por favor, seleccione una categoría
@@ -43,4 +58,15 @@ es:
           send: Enviar
           title: Nueva propuesta
         proposal:
-          view_proposal: Ver propuesta
+          view_proposal: Ver propuesta
+        share:
+          close_window: Cerrar ventana
+          share: Compartir
+          share_link: Compartir enlace
+        vote_button:
+          already_voted: Ya votado
+          vote: Votar
+        votes_count:
+          count:
+            one: VOTAR
+            other: VOTOS

data/decidim-proposals/db/migrate/20170112115253_create_proposal_votes.rb

@@ -0,0 +1,12 @@
+class CreateProposalVotes < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_proposals_proposal_votes do |t|
+      t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_proposal_vote_proposal" }
+      t.references :decidim_author, null: false, index: { name: "decidim_proposals_proposal_vote_author" }
+      
+      t.timestamps
+    end
+
+    add_index :decidim_proposals_proposal_votes, [:decidim_proposal_id, :decidim_author_id], unique: true, name: "decidim_proposals_proposal_vote_proposal_author_unique"
+  end
+end

data/decidim-proposals/db/migrate/20170113114245_add_text_search_indexes.rb

@@ -0,0 +1,6 @@
+class AddTextSearchIndexes < ActiveRecord::Migration[5.0]
+  def change
+    add_index :decidim_proposals_proposals, :title, name: "decidim_proposals_proposal_title_search"
+    add_index :decidim_proposals_proposals, :body, name: "decidim_proposals_proposal_body_search"
+  end
+end

data/decidim-proposals/db/migrate/20170118120151_add_counter_cache_votes_to_proposals.rb

@@ -0,0 +1,5 @@
+class AddCounterCacheVotesToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :proposal_votes_count, :integer, null: false, default: 0
+  end
+end

data/decidim-proposals/decidim-proposals.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-core", Decidim.version
   s.add_dependency "decidim-comments", Decidim.version
   s.add_dependency "rectify", "~> 0.8.0"
-  s.add_dependency "kaminari", "~> 1.0.0.rc1"
+  s.add_dependency "kaminari", "~> 1.0.1"
+  s.add_dependency 'social-share-button', "~> 0.8.8"
 
   s.add_development_dependency "decidim-dev", Decidim.version
 end

data/decidim-proposals/lib/decidim/proposals/engine.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "kaminari"
+require "social-share-button"
 
 module Decidim
   module Proposals
@@ -10,9 +11,15 @@ module Decidim
       isolate_namespace Decidim::Proposals
 
       routes do
-        resources :proposals, only: [:create, :new, :index, :show]
+        resources :proposals, only: [:create, :new, :index, :show] do
+          resources :proposal_votes, only: [:create]
+        end
         root to: "proposals#index"
       end
+
+      initializer "decidim_proposals.assets" do |app|
+        app.config.assets.precompile += %w(decidim_proposals_manifest.js decidim_proposals_manifest.css)
+      end
     end
   end
 end