decidim 0.2.0 → 0.3.0

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

@@ -6,15 +6,7 @@
           <h5 class="card__title"><%= proposal.title %></h5>
         <% end %>
         <div class="card__author author-data author-data--small">
-          <div class="author-data__main">
-            <div class="author author--inline">
-              <span class="author__avatar author__avatar--small">
-                <%= image_tag proposal.author_avatar_url %>
-              </span>
-              <span class="author__name"><%= proposal.author_name %></span>
-              <%= l proposal.created_at, format: "%d/%m/%Y" %>
-            </div>
-          </div>
+          <%= render partial: "author", locals: { proposal: proposal } %>
         </div>
       </div>
       <%= render partial: "proposal_badge", locals: { proposal: proposal } %>

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

@@ -1,13 +1,9 @@
 <div id="proposal-<%= proposal.id %>-vote-button">
   <% if !current_user %>
     <% if current_settings.votes_blocked? %>
-      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled" disabled data-toggle="loginModal">
-        <%= t('.votes_blocked') %>
-      </button>
+      <%= action_authorized_button_to :vote, t('.votes_blocked'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "card__button button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
     <% else %>
-      <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
-        <%= t('.vote') %>
-       </button>
+      <%= action_authorized_button_to :vote, t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
     <% end %>
   <% else %>
     <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>

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

@@ -43,7 +43,7 @@
           <% end %>
 
           <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded" %>
+            <%= form.submit t(".send"), class: "button expanded", "data-disable-with" => "#{t('.send')}..." %>
           </div>
         <% end %>
       </div>

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

@@ -8,17 +8,7 @@
 <div class="row column view-header">
   <h2 class="heading2"><%= @proposal.title %></h2>
   <div class="author-data">
-    <div class="author-data__main">
-      <div class="author author--inline">
-        <span class="author__avatar">
-          <%= image_tag @proposal.author_avatar_url %>
-        </span>
-        <%= l @proposal.created_at, format: :long %>
-        <span class="author__name">
-          <%= @proposal.author_name %>
-        </span>
-      </div>
-    </div>
+    <%= render partial: "author", locals: { proposal: @proposal } %>
     <div class="author-data__extra">
       <button type="button" data-open="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" title="<%= t('.report') %>" aria-controls="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" aria-haspopup="true" tabindex="0">
         <%= icon "flag", aria_label: t('.report'), class: 'icon--small' %>

data/decidim-proposals/bin/rails

@@ -4,11 +4,11 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/proposals/engine", __FILE__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/decidim/proposals/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 require "rails/all"

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

@@ -79,7 +79,13 @@ ca:
             scope: Àmbit
             state: Estat
             title: Títol
+      proposal_votes:
+        create:
+          error: Hi ha hagut errors en votar la proposta.
       proposals:
+        author:
+          deleted: Usuari eliminat
+          verified_user_group: Organització verificada
         count:
           proposals_count:
             one: 1 proposta

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

@@ -81,7 +81,13 @@ en:
             scope: Scope
             state: State
             title: Title
+      proposal_votes:
+        create:
+          error: There's been errors when voting the proposal.
       proposals:
+        author:
+          deleted: Deleted user
+          verified_user_group: Verified organization
         count:
           proposals_count:
             one: 1 proposal

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

@@ -79,7 +79,13 @@ es:
             scope: Ámbito
             state: Estado
             title: Título
+      proposal_votes:
+        create:
+          error: Ha habido errores al votar la propuesta.
       proposals:
+        author:
+          deleted: Usuario eliminado
+          verified_user_group: Organización verificada
         count:
           proposals_count:
             one: 1 propuesta

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

@@ -121,8 +121,6 @@ eu:
           most_voted: Bozkatuenak
           random: Ausazkoa eran
           recent: Berrienak
-        proposal:
-          view_proposal: Ikusi proposamena
         show:
           proposal_accepted_reason: 'Proposamen hau onartu da arrazoi hauengatik:'
           proposal_rejected_reason: 'Proposamen hau baztertu da arrazoi hauengatik:'

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

@@ -108,8 +108,6 @@ fi:
           most_voted: Eniten ääniä saaneet
           random: Satunnainen
           recent: Viimeisimmät
-        proposal:
-          view_proposal: Näytä ehdotus
         show:
           proposal_accepted_reason: 'Tämä ehdotus on hyväksytty, koska:'
           proposal_rejected_reason: 'Tämä ehdotus on hylätty, koska:'

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

@@ -118,8 +118,6 @@ fr:
           most_voted: Les plus votées
           random: Aléatoire
           recent: Les plus récents
-        proposal:
-          view_proposal: Voir la proposition
         show:
           proposal_accepted_reason: 'Cette proposition a été acceptée parce que :'
           proposal_rejected_reason: 'Cette proposition a été refusée parce que:'

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

@@ -0,0 +1,147 @@
+it:
+  activemodel:
+    attributes:
+      proposal:
+        body: Corpo del testo
+        category_id: Categoria
+        scope_id: Visibilità
+        title: Titolo
+        user_group_id: Crea proposta come
+      proposal_answer:
+        answer: Risposta
+  decidim:
+    features:
+      proposals:
+        actions:
+          create: Crea
+          vote: Vota
+        name: Proposte
+        settings:
+          global:
+            comments_enabled: Commenti abilitati
+            geocoding_enabled: Geocoding abilitato
+            official_proposals_enabled: Proposte ufficiali abilitate
+            proposal_answering_enabled: Risposta Proposte abilitata
+            vote_limit: Numero max di proposte votabili
+          step:
+            comments_blocked: Commenti bloccati
+            creation_enabled: Creazione delle Proposte abilitata
+            proposal_answering_enabled: Risposta Proposte abilitata
+            votes_blocked: Votazioni bloccate
+            votes_enabled: Votazioni abilitate
+            votes_hidden: Voti nascosti (se i voti sono abilitati, spuntando questa casella verrà nascosto il numero dei voti)
+    proposals:
+      actions:
+        answer: Risposta
+        new: Nuovo
+        title: Azioni
+      admin:
+        actions:
+          preview: Anteprima
+        exports:
+          proposals: Proposte
+        models:
+          proposal:
+            name: Proposta
+        proposal_answers:
+          edit:
+            accepted: Accettata
+            answer_proposal: Risposta
+            rejected: Rifiutata
+            title: Risposta per la proposta %{title}
+        proposals:
+          answer:
+            invalid: E' stato riscontrato un problema nella risposta per questa proposta
+            success: OK, risposta per la proposta registrata.
+          create:
+            invalid: Sono stati riscontrati dei problemi durante la creazione di questa proposta
+            success: OK, proposta creata.
+          form:
+            select_a_category: Scegli una categoria
+          index:
+            title: Proposte
+          new:
+            create: Crea
+            title: Crea una proposta
+      answers:
+        accepted: Accettata
+        not_answered: Non risposto
+        rejected: Rifiutata
+      create:
+        error: C'è stato un errore durante il salvataggio di questa proposta.
+        success: OK, la proposta è stata creata.
+      models:
+        proposal:
+          fields:
+            category: Categoria
+            official_proposal: Proposta ufficiale
+            scope: Visibilità
+            state: Stato
+            title: Titolo
+      proposals:
+        count:
+          proposals_count:
+            one: 1 proposta
+            other: "%{count} proposte"
+        filters:
+          accepted: Accettata
+          activity: Attività
+          category: Categoria
+          category_prompt: Scegli una categoria
+          citizenship: Cittadinanza
+          official: Ufficiale
+          origin: Origine
+          rejected: Rifiutata
+          related_to: Associata a
+          scopes: Visibilità
+          search: Cerca
+          state: Stato
+          voted: Votata
+        filters_small_view:
+          close_modal: Chiudi modalità
+          filter: Filtra
+          filter_by: Filtra per
+          unfold: Espandi
+        index:
+          new_proposal: Nuova proposta
+          view_proposal: Visualizza proposta
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>voto
+            other: <span class="card--list__data__number">%{count}</span>voti
+        new:
+          back: Indietro
+          select_a_category: Scegli una categoria
+          send: Invia
+          title: Nuova proposta
+        orders:
+          label: 'Ordina le proposte per:'
+          most_voted: Più votate
+          random: A caso
+          recent: le più recenti
+        proposal:
+          view_proposal: Visualizza la proposta
+        show:
+          proposal_accepted_reason: 'Questa proposta è stata accettata perché:'
+          proposal_rejected_reason: 'Questa proposta è stata rifiutata perché:'
+        vote_button:
+          already_voted: Già votata
+          no_votes_remaining: Sono finite le votazioni possibili
+          vote: Vota
+          votes_blocked: Votazioni disabilitate
+        votes_count:
+          count:
+            one: VOTO
+            other: VOTI
+        votes_limit:
+          vote_limit:
+            description: Invece di votare tutte le proposte possibili puoi soltanto votare fino a %{limit} proposte.
+            left: Restano
+            title: Hai ancora %{limit} voti
+            votes: Voti
+    resource_links:
+      included_proposals:
+        proposal_projects: 'Le proposte compaiono nei seguenti progetti:'
+        proposal_results: 'Le proposte compaiono nei seguenti risultati:'
+      proposals_from_meeting:
+        proposal_meetings: Meeting associati alla proposta

data/decidim-proposals/db/migrate/20161212110850_create_decidim_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDecidimProposals < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_proposals_proposals do |t|

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 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
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddTextSearchIndexes < ActiveRecord::Migration[5.0]
   def change
     add_index :decidim_proposals_proposals, :title, name: "decidim_proposals_proposal_title_search"

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

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

data/decidim-proposals/db/migrate/20170120151202_add_user_group_id_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddUserGroupIdToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :decidim_user_group_id, :integer, index: true

data/decidim-proposals/db/migrate/20170131092413_add_answers_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAnswersToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :state, :string, index: true

data/decidim-proposals/db/migrate/20170205082832_add_index_to_decidim_proposals_proposals_proposal_votes_count.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddIndexToDecidimProposalsProposalsProposalVotesCount < ActiveRecord::Migration[5.0]
   def change
     add_index :decidim_proposals_proposals, :proposal_votes_count

data/decidim-proposals/db/migrate/20170215113152_create_proposal_reports.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateProposalReports < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_proposals_proposal_reports do |t|

data/decidim-proposals/db/migrate/20170215131720_add_report_count_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReportCountToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :report_count, :integer, default: 0

data/decidim-proposals/db/migrate/20170215132030_add_reference_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReferenceToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :reference, :string

data/decidim-proposals/db/migrate/20170220152416_add_hidden_at_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddHiddenAtToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :hidden_at, :datetime

data/decidim-proposals/db/migrate/20170228105156_add_geolocalization_fields_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddGeolocalizationFieldsToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :address, :text

data/decidim-proposals/db/migrate/20170307085300_migrate_proposal_reports_data_to_reports.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MigrateProposalReportsDataToReports < ActiveRecord::Migration[5.0]
   class Decidim::Proposals::ProposalReport < ApplicationRecord
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -6,16 +8,12 @@ class MigrateProposalReportsDataToReports < ActiveRecord::Migration[5.0]
 
   def change
     Decidim::Proposals::ProposalReport.all.each do |proposal_report|
-      moderation = Decidim::Moderation.find_or_create_by!({
-        reportable: proposal_report.proposal,
-        participatory_process: proposal_report.proposal.feature.participatory_process
-      })
-      Decidim::Report.create!({
-        moderation: moderation,
-        user: proposal_report.user,
-        reason: proposal_report.reason,
-        details: proposal_report.details
-      })
+      moderation = Decidim::Moderation.find_or_create_by!(reportable: proposal_report.proposal,
+                                                          participatory_process: proposal_report.proposal.feature.participatory_process)
+      Decidim::Report.create!(moderation: moderation,
+                              user: proposal_report.user,
+                              reason: proposal_report.reason,
+                              details: proposal_report.details)
       moderation.update_attributes!(report_count: moderation.report_count + 1)
     end
 

data/decidim-proposals/db/migrate/20170410073742_remove_not_null_reference_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveNotNullReferenceProposals < ActiveRecord::Migration[5.0]
   def change
     change_column_null :decidim_proposals_proposals, :reference, true

data/decidim-proposals/db/migrate/20170612101809_migrate_proposals_category.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class MigrateProposalsCategory < ActiveRecord::Migration[5.1]
+  def change
+    # Create categorizations ensuring database integrity
+    execute('
+      INSERT INTO decidim_categorizations(decidim_category_id, categorizable_id, categorizable_type, created_at, updated_at)
+        SELECT decidim_category_id, decidim_proposals_proposals.id, \'Decidim::Proposals::Proposal\', NOW(), NOW()
+        FROM decidim_proposals_proposals
+        INNER JOIN decidim_categories ON decidim_categories.id = decidim_proposals_proposals.decidim_category_id
+    ')
+    # Remove unused column
+    remove_column :decidim_proposals_proposals, :decidim_category_id
+  end
+end

data/decidim-proposals/decidim-proposals.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"
@@ -17,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-comments", Decidim.version
   s.add_dependency "rectify", "~> 0.9.1"
   s.add_dependency "kaminari", "~> 1.0.1"
-  s.add_dependency 'social-share-button', "~> 0.10.0"
+  s.add_dependency "social-share-button", "~> 0.10.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-meetings", Decidim.version