decidim-core 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57d950df7b4b3bc59a364fae1306993591d25843
-  data.tar.gz: 507479b4b86006a2e3f0ea0eabb6c087865ffecb
+  metadata.gz: 889376b1a7af947c4cfdd5c6182211e66a1feebb
+  data.tar.gz: 8257ffd74960e6fe3f2ccdac75c8fbda7c67f634
 SHA512:
-  metadata.gz: 6019e44c765d88dd513921ff1abc67b69911c53228408d5696f7c9be1bdfea47a845af095a0ae93fbe57af9430c6ef940fc9f006f67a9fc497b0415fa1d5777f
-  data.tar.gz: 002e8f943ac4dd60dfc627312966bc94574eabdd664073af2ee35a063fa4a4806690ded0134987a5fd591d963fcc3018ff65c6c159f32a0ea42608565704e83f
+  metadata.gz: 8b9c5be3cb7b7a5878fb33ba611b452e56ee998dffc1a361483858fe714c63d382b74b128d6e531f50c329c31fe5c8aee4ed9b56a873570a41bd799b026ebd3c
+  data.tar.gz: 9c1c5e92003d02865b8b78bd31b52d13047536b9e46538ac52003f6831e9feae527ddaf12d410d948d823a02ed07ac55cd5a967f58432ff90354afb17cc47420

data/app/assets/stylesheets/decidim/extras/_process_stats.scss

@@ -0,0 +1,38 @@
+#participatory_process-statistics{
+  margin-bottom: 1.5rem;
+}
+
+.process_stats{
+  padding: 0;
+  .process_stats-item{
+    width: 33.3%;
+    @include breakpoint(large down){
+      width: 33.3%;
+    }
+    @include breakpoint(medium down){
+      width: 49.9%;
+    }
+    @include breakpoint(smallmedium down){
+      width: 100%;
+    }
+    display: inline-block;
+    padding: 1em;
+    border: $border;
+    background: $white;
+    .icon {
+      width: 1.5em;
+      height: 1.5em;
+      color: #599aa6;
+      vertical-align: middle;
+      margin-right: 0.5rem;
+    }
+    .process_stats-text{
+      text-transform: uppercase;
+      letter-spacing: 0.03em;
+      font-size: 90%;
+      color: #3D393C;
+      font-weight: 600;
+      line-height: 1;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/layouts/_home.scss

@@ -91,7 +91,7 @@
 .subhero{
   padding: 4rem 0;
   text-align: center;
-  
+
   .heading3{
     @include breakpoint(medium down){
       font-size: 1.3em;
@@ -202,7 +202,7 @@
       border-bottom: $border;
       border-right: $border;
     }
-    
+
     &:last-child{
       border-right: none;
     }

data/app/controllers/concerns/decidim/feature_settings.rb

@@ -9,8 +9,6 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
-      include NeedsParticipatoryProcess
-
       helper_method :feature_settings, :current_settings
 
       def feature_settings

data/app/controllers/concerns/decidim/needs_organization.rb

@@ -1,18 +1,30 @@
 # frozen_string_literal: true
 
-require "active_support/concern"
-
 module Decidim
   # Shared behaviour for controllers that need an organization present in order
   # to work. The organization is injected via the CurrentOrganization
   # middleware.
   module NeedsOrganization
-    extend ActiveSupport::Concern
+    def self.enhance_controller(instance_or_module)
+      instance_or_module.class_eval do
+        before_action :verify_organization
+        helper_method :current_organization
+      end
+    end
+
+    def self.extended(base)
+      base.extend InstanceMethods
 
-    included do
-      before_action :verify_organization
-      helper_method :current_organization
+      enhance_controller(base)
+    end
+
+    def self.included(base)
+      base.include InstanceMethods
+
+      enhance_controller(base)
+    end
 
+    module InstanceMethods
       # The current organization for the request.
       #
       # Returns an Organization.

data/app/controllers/decidim/account_controller.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
   # The controller to handle the user's account page.
-  class AccountController < ApplicationController
+  class AccountController < Decidim::ApplicationController
     helper_method :authorizations
     include Decidim::UserProfile
 

data/app/controllers/decidim/authorizations_controller.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
   # This controller allows users to create and destroy their authorizations. It
   # shouldn't be necessary to expand it to add new authorization schemes.
-  class AuthorizationsController < ApplicationController
+  class AuthorizationsController < Decidim::ApplicationController
     helper_method :handler, :handlers, :stored_location
     before_action :valid_handler, only: [:new, :create]
 

data/app/controllers/decidim/cookie_policy_controller.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
   # This controller allows the user to accept the cookie policy.
-  class CookiePolicyController < ApplicationController
+  class CookiePolicyController < Decidim::ApplicationController
     skip_authorization_check
 
     def accept

data/app/controllers/decidim/locales_controller.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
   # A controller to allow users switching their locale.
-  class LocalesController < ApplicationController
+  class LocalesController < Decidim::ApplicationController
     authorize_resource :locales, class: false
 
     def create

data/app/controllers/decidim/notifications_settings_controller.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
   # The controller to handle the user's notifications settings page.
-  class NotificationsSettingsController < ApplicationController
+  class NotificationsSettingsController < Decidim::ApplicationController
     include Decidim::UserProfile
 
     def show

data/app/controllers/decidim/own_user_groups_controller.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
   # The controller to handle managing the current user's
   # UserGroups.
-  class OwnUserGroupsController < ApplicationController
+  class OwnUserGroupsController < Decidim::ApplicationController
     include Decidim::UserProfile
 
     def index

data/app/controllers/decidim/pages_controller.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
 require_dependency "decidim/page_finder"
 
 module Decidim
   # This controller serves static pages using HighVoltage.
-  class PagesController < ApplicationController
+  class PagesController < Decidim::ApplicationController
     include HighVoltage::StaticPage
 
     layout "layouts/decidim/application"

data/app/controllers/decidim/participatory_process_groups_controller.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
-  class ParticipatoryProcessGroupsController < ApplicationController
+  class ParticipatoryProcessGroupsController < Decidim::ApplicationController
     helper_method :participatory_processes, :group, :collection
 
     before_action :set_group

data/app/controllers/decidim/participatory_process_steps_controller.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
   # A controller that holds the logic to show ParticipatoryProcessSteps in a
   # public layout.
-  class ParticipatoryProcessStepsController < ApplicationController
+  class ParticipatoryProcessStepsController < Decidim::ApplicationController
     helper_method :participatory_process, :current_participatory_process
     layout "layouts/decidim/participatory_process", only: [:index]
     include NeedsParticipatoryProcess

data/app/controllers/decidim/participatory_processes_controller.rb

@@ -1,21 +1,19 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
   # A controller that holds the logic to show ParticipatoryProcesses in a
   # public layout.
-  class ParticipatoryProcessesController < ApplicationController
+  class ParticipatoryProcessesController < Decidim::ApplicationController
     layout "layouts/decidim/participatory_process", only: [:show]
 
-    before_action -> { extend(NeedsParticipatoryProcess) }, only: [:show]
+    before_action -> { extend NeedsParticipatoryProcess }, only: [:show]
 
     helper Decidim::AttachmentsHelper
     helper Decidim::ParticipatoryProcessHelper
     helper Decidim::IconHelper
     helper Decidim::WidgetUrlsHelper
 
-    helper_method :collection, :promoted_participatory_processes, :participatory_processes
+    helper_method :collection, :promoted_participatory_processes, :participatory_processes, :stats
 
     def index
       authorize! :read, ParticipatoryProcess
@@ -43,5 +41,9 @@ module Decidim
     def participatory_process_groups
       @process_groups ||= Decidim::ParticipatoryProcessGroup.where(organization: current_organization)
     end
+
+    def stats
+      @stats ||= ParticipatoryProcessStatsPresenter.new(participatory_process: current_participatory_process)
+    end
   end
 end

data/app/controllers/decidim/static_map_controller.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/application_controller"
-
 module Decidim
-  class StaticMapController < ApplicationController
+  class StaticMapController < Decidim::ApplicationController
     skip_authorization_check
 
     def show

data/app/helpers/decidim/participatory_process_helper.rb

@@ -13,5 +13,29 @@ module Decidim
       dates = [participatory_process_step.start_date, participatory_process_step.end_date]
       dates.map { |date| date ? localize(date.to_date, format: :default) : "?" }.join(" - ")
     end
+
+    # Public: Returns an icon given an instance of a Feature. It defaults to
+    # a question mark when no icon is found.
+    #
+    # feature - The feature to generate the icon for.
+    #
+    # Returns an HTML tag with the icon.
+    def feature_icon(feature)
+      feature_manifest_icon(feature.manifest)
+    end
+
+    # Public: Returns an icon given an instance of a Feature Manifest. It defaults to
+    # a question mark when no icon is found.
+    #
+    # feature_manifest - The feature manifest to generate the icon for.
+    #
+    # Returns an HTML tag with the icon.
+    def feature_manifest_icon(feature_manifest)
+      if feature_manifest.icon
+        external_icon feature_manifest.icon
+      else
+        icon "question-mark"
+      end
+    end
   end
 end

data/app/helpers/decidim/resource_helper.rb

@@ -67,7 +67,7 @@ module Decidim
 
     # Returns an instance of ResourceLocatorPresenter with the given resource
     def resource_locator(resource)
-      ResourceLocatorPresenter.new(resource)
+      ::Decidim::ResourceLocatorPresenter.new(resource)
     end
   end
 end

data/app/presenters/decidim/home_stats_presenter.rb

@@ -11,6 +11,7 @@ module Decidim
       highlighted_stats = highlighted_stats.concat(global_stats(priority: StatsRegistry::HIGH_PRIORITY))
       highlighted_stats = highlighted_stats.concat(feature_stats(priority: StatsRegistry::HIGH_PRIORITY))
       highlighted_stats = highlighted_stats.reject(&:empty?)
+      highlighted_stats = highlighted_stats.reject { |_name, data| data.zero? }
 
       safe_join(
         highlighted_stats.in_groups_of(2, false).map do |stats|
@@ -30,9 +31,10 @@ module Decidim
       not_highlighted_stats = global_stats(priority: StatsRegistry::MEDIUM_PRIORITY)
       not_highlighted_stats = not_highlighted_stats.concat(feature_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
       not_highlighted_stats = not_highlighted_stats.reject(&:empty?)
+      not_highlighted_stats = not_highlighted_stats.reject { |_name, data| data.zero? }
 
       safe_join(
-        not_highlighted_stats.in_groups_of(3, false).map do |stats|
+        not_highlighted_stats.in_groups_of(3, [:empty]).map do |stats|
           content_tag :div, class: "home-pam__lowlight" do
             safe_join(
               stats.map do |name, data|
@@ -61,15 +63,19 @@ module Decidim
 
     def render_stats_data(name, data)
       content_tag :div, "", class: "home-pam__data" do
-        safe_join([
-                    content_tag(:h4, I18n.t(name, scope: "pages.home.statistics"), class: "home-pam__title"),
-                    content_tag(:span, " #{number_with_delimiter(data)}", class: "home-pam__number #{name}")
-                  ])
+        if name == :empty
+          " ".html_safe
+        else
+          safe_join([
+                      content_tag(:h4, I18n.t(name, scope: "pages.home.statistics"), class: "home-pam__title"),
+                      content_tag(:span, " #{number_with_delimiter(data)}", class: "home-pam__number #{name}")
+                    ])
+        end
       end
     end
 
     def published_features
-      @published_features ||= Feature.where(participatory_process: organization.participatory_processes.published)
+      @published_features ||= Feature.where(participatory_process: organization.participatory_processes.published).published
     end
   end
 end

data/app/presenters/decidim/participatory_process_stats_presenter.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A presenter to render statistics in the homepage.
+  class ParticipatoryProcessStatsPresenter < Rectify::Presenter
+    attribute :participatory_process, Decidim::ParticipatoryProcess
+    include Decidim::ParticipatoryProcessHelper
+
+    # Public: Render a collection of primary stats.
+    def highlighted
+      highlighted_stats = feature_stats(priority: StatsRegistry::HIGH_PRIORITY)
+      highlighted_stats = highlighted_stats.concat(feature_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+      highlighted_stats = highlighted_stats.reject(&:empty?)
+      highlighted_stats = highlighted_stats.reject { |_manifest, _name, data| data.zero? }
+      grouped_highlighted_stats = highlighted_stats.group_by { |stats| stats.first.name }
+
+      safe_join(
+        grouped_highlighted_stats.map do |_manifest_name, stats|
+          content_tag :div, class: "process_stats-item" do
+            safe_join(
+              stats.each_with_index.map do |stat, index|
+                render_stats_data(stat[0], stat[1], stat[2], index)
+              end
+            )
+          end
+        end
+      )
+    end
+
+    private
+
+    def feature_stats(conditions)
+      Decidim.feature_manifests.map do |feature_manifest|
+        feature_manifest.stats.filter(conditions).with_context(published_features).map { |name, data| [feature_manifest, name, data] }.flatten
+      end
+    end
+
+    def render_stats_data(feature_manifest, name, data, index)
+      safe_join([
+                  index.zero? ? feature_manifest_icon(feature_manifest) : " /&nbsp".html_safe,
+                  content_tag(:span, "#{number_with_delimiter(data)} " + I18n.t(name, scope: "decidim.participatory_processes.statistics"),
+                              class: "#{name} process_stats-text")
+                ])
+    end
+
+    def published_features
+      @published_features ||= Feature.where(participatory_process: participatory_process).published
+    end
+  end
+end

data/app/views/decidim/application/_attachments.html.erb

@@ -1,6 +1,6 @@
 <% if attached_to.attachments.any? %>
   <div class="row attachments">
-    <div class="columns large-8">
+    <div class="columns large-12">
       <%= render partial: "documents", locals: { documents: attached_to.documents } %>
       <%= render partial: "photos", locals: { photos: attached_to.photos } %>
     </div>

data/app/views/decidim/participatory_processes/_statistics.html.erb

@@ -0,0 +1,10 @@
+<section class="extended" id="participatory_process-statistics" class="statistics">
+  <div class="row column">
+    <h4 class="section-heading"><%= t(".headline", participatory_process: translated_attribute(current_participatory_process.title)) %></h3>
+  </div>
+  <div class="row">
+    <div class="columns small-centered mediumlarge-12 large-12 process_stats">
+      <%= stats.highlighted %>
+    </div>
+  </div>
+</section>

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

@@ -15,6 +15,7 @@
         </div>
         <%== translated_attribute(current_participatory_process.description) %>
       </div>
+      <%= attachments_for current_participatory_process %>
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
       <div class="card extra definition-data">
@@ -67,17 +68,13 @@
           </div>
         <% end %>
       </div>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
       <%= render partial: "decidim/shared/share_modal" %>
       <%= embed_modal_for participatory_process_participatory_process_widget_url(current_participatory_process, format: :js) %>
     </div>
   </div>
-
-  <%= attachments_for current_participatory_process %>
+  <% if current_participatory_process.show_statistics? %>
+    <%= render partial: 'statistics' %>
+  <% end %>
 </div>
 
 <%= javascript_include_tag "decidim/proposals/social_share" %>

data/config/i18n-tasks.yml

@@ -105,8 +105,8 @@ ignore_unused:
   - decidim.participatory_processes.scopes.global
   - decidim.participatory_processes.participatory_process_groups.none
   - pages.home.statistics.*
+  - decidim.participatory_processes.statistics.*
   - forms.*
-
 # - 'activerecord.attributes.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/config/locales/en.yml

@@ -206,6 +206,20 @@ en:
         participatory_structure: Participatory structure
         scope: Scope
         target: Target
+      statistics:
+        answers_count: Answers
+        comments_count: Comments
+        headline: Activity
+        meetings_count: Meetings
+        orders_count: Orders
+        pages_count: Pages
+        processes_count: Processes
+        projects_count: Projects
+        proposals_count: Proposals
+        results_count: Results
+        surveys_count: Surveys
+        users_count: Participants
+        votes_count: Votes
     reported_mailer:
       hide:
         hello: Hello %{name},
@@ -383,12 +397,17 @@ en:
         active_step: Active step
         see_all_processes: See all processes
       statistics:
+        answers_count: Answers
         comments_count: Comments
         headline: Current state of %{organization}
         meetings_count: Meetings
+        orders_count: Orders
+        pages_count: Pages
         processes_count: Processes
+        projects_count: Projects
         proposals_count: Proposals
         results_count: Results
+        surveys_count: Surveys
         users_count: Participants
         votes_count: Votes
       sub_hero:

data/config/locales/it.yml

@@ -124,26 +124,26 @@ it:
         verified: Verificato
     pages:
       index:
-        title: Ulteriori informazioni
+        title: Informazione
     participatory_process_groups:
       show:
-        group_participatory_processes: Processi per il gruppo %{group}
+        group_participatory_processes: Processi per %{group}
         title: Titolo
     participatory_process_steps:
       index:
         process_steps: Fasi del processo
-        title: Fasi del processo participatorio
+        title: Fasi del processo partecipativo
     participatory_processes:
       index:
-        title: Processo participatorio
+        title: Processi partecipativi
       participatory_process_groups:
         none: Nessuno
       scopes:
         global: Ambito globale
       show:
-        developer_group: Gruppo di sviluppo
+        developer_group: Gruppo promotore
         end_date: Data di fine
-        local_area: Area locale
+        local_area: Municipi
         participatory_scope: Ambito partecipativo
         participatory_structure: Struttura partecipativa
         scope: Ambito
@@ -151,48 +151,47 @@ it:
       hide:
         hello: Ciao %{name},
         report_html: <p>Il seguente <a href="%{url}">contenuto</a> è stato nascosto automaticamente.</p>
-        subject: Una risorsa è stata cancellata automaticamente
+        subject: Un contenuto è stato cancellato automaticamente
       report:
         hello: Ciao %{name},
-        subject: Una risorsa è stata riportata
+        subject: Un contenuto è stato denunciato
     reports:
       create:
-        error: Si è verificato un errore durante la creazione del report. Per cortesia, prova ad effettuare nuovamente l'operazione.
-        success: OK, il report è stato creato e sarà revisionato da un amministratore.
+        error: Si è verificato un un errore. Ti preghiamo di riprovare.
+        success: Il report è stato creato e sarà rivisto da un amministratore.
     shared:
       action_authorization_modal:
         incomplete:
           cancel: Annulla
-          explanation: 'Anche se attualmente sei autorizzato con "%{authorization}", abbiamo bisogno che tu richieda una nuova autorizzazione poiché risultano mancanti i seguenti dati:'
-          reauthorize: Ri-autorizza
-          title: Per cortesia, occorre una nuova autorizzazione
+          explanation: 'Nonostante già sei autorizzato con "%{authorization}", abbiamo bisogno che tu richieda una nuova autorizzazione poiché risultano mancanti i seguenti dati:'
+          reauthorize: Ri-autorizzare
+          title: Per favore, occorre una nuova autorizzazione
         missing:
-          authorize: Autorizza con "%{authorization}"
-          explanation: Per effettuare questa operazione occorre che tu sia autorizzato con "%{authorization}".
-          title: E' necessaria l'autorizzazione
+          authorize: Autorizzare con "%{authorization}"
+          explanation: Per effettuare questa operazione devi disporre della autorizzazione "%{authorization}".
+          title: Autorizzazione richiesta
         unauthorized:
-          explanation: Mi spiace, non puoi effettuare questa operazione poiché i tuoi dati di autorizzazione non corrispondono.
-          invalid: "Il campo %{field} non risulta valido."
+          explanation: Non puoi eseguire questa azione poiché alcuni dei tuoi dati di autorizzazione non corrispondono.
+          invalid: "%{field} non è valido."
           title: Non autorizzato
       embed_modal:
         close_window: Chiudi la finestra
-        embed: Per cortesia incolla questo codice nella tua pagina
+        embed: Per favore, incolla questo codice nella tua pagina
         embed_link: Incorpora
       flag_modal:
-        already_reported: Questo contenuto è già stato riportato e sarà revisionato da parte di un amministratore.
+        already_reported: Questo contenuto è già stato riportato e sarà revisionato da un amministratore.
         close: Chiudi
         description: Questo contenuto è inappropriato?
-        does_not_belong: Contiene attività illegati, istigazione al suicidio, informazioni personali o riservate, minacce o altro che tu pensi che non sia appropriato per %{organization_name}.
+        does_not_belong: Contiene attività illegali, istigazione al suicidio, informazioni personali o riservate, o altre cose che tu credi che non sono appropriato per %{organization_name}.
         offensive: Contiene contenuti razzisti, diffamatori, sessisti, insulti o attacchi personali, minacce di morte, istigazioni al suicidio o altre forme di odio verbale.
-        spam: Contiene pubblicità, truffe, spam oppure ha come intento di attirare traffico internet e "click".
+        spam: Contiene clickbait, pubblicità, truffe o script bots.
         title: Segnala un problema
       login_modal:
-        please_sign_in: Per cortesia effettua l'accesso.
         sign_up: Registrazione
       share_modal:
         close_window: Chiudi questa finestra
         share: Condividi
-        share_link: Condividi questo link
+        share_link: Condividi link
   devise:
     invitations:
       edit:
@@ -201,48 +200,45 @@ it:
     mailer:
       invitation_instructions:
         accept: Accetta l'invito
-        accept_until: Questo invito sarà valido fino al %{due_date}.
+        accept_until: Questo invito scade il %{due_date}.
         hello: Ciao %{email},
         ignore: |-
-          Se non hai intenzione di accettare l'invito, per cortesia ignora questa email.<br />
-          Non verrà un account relativo al tuo profilo fino a che non effettuerai l'accesso al link precedente ed imposterai la tua password.
+          Se non desideri accettare l'invito, ignora questa email.<br /> Il tuo account non verrà creato finché non accedi al link precedente e imposti la tua password.
         invited_you_as_admin: "%{invited_by} ti ha invitato come amministratore di %{application}, puoi accettare l'invito tramite il seguente link."
-        someone_invited_you: Sei stato invitato per %{application}, puoi accettare l'invito tramite il seguente link.
-      invite_admin:
-        subject: Sei stato invitato per la gestione della sezione relativa all'organizzazione %{organization}
+        someone_invited_you: Sei stato invitato a %{application}, puoi accettare l'invito tramite il seguente link.
       invite_collaborator:
-        subject: Sei stato invitato a collaborare per la sezione relativa all'organizzazione %{organization}
+        subject: Sei stato invitato a collaborare nella %{organization}
       organization_admin_invitation_instructions:
-        subject: Sei stato invitato a gestire la sezione relativa all'organizzazione %{organization}
+        subject: Sei stato invitato a gestire %{organization}
       password_change:
         greeting: Ciao %{recipient}!
-        message: ti contattiamo per informarti che la tua password è stata modificata.
+        message: Ti contattiamo per informarti che la tua password è stata modificata.
         subject: Password modificata
   errors:
     messages:
       content_type_whitelist_error: Il tipo di file non è valido.
-      file_size_is_less_than_or_equal_to: La dimensione del file deve essere minore o uguale a %{count}
+      file_size_is_less_than_or_equal_to: la dimensione del file deve essere inferiore o uguale a %{count}
       invalid_manifest: Manifesto non valido
       invalid_participatory_process: Processo partecipativo non valido
       long_words: Contiene parole troppo lunghe
-      must_start_with_caps: Deve iniziare in maiuscolo
-      nesting_too_deep: Non può essere all'interno di una categoria (annidamento eccessivo)
-      too_many_marks: Uilizza troppi segni
-      too_much_caps: Utilizza troppe MAIUSCOLE
+      must_start_with_caps: Deve iniziare in maiuscola
+      nesting_too_deep: Non può stare all'interno di una subcategoria
+      too_many_marks: Sta utilizzando troppi segni di punteggiatura
+      too_much_caps: Sta utilizzando troppe maiuscole
       too_short: Il contenuto è troppo breve
   invisible_captcha:
     sentence_for_humans: Se sei una persona e non un computer, ignora questo campo
-    timestamp_error_message: Mi spiace, troppo veloce! Per cortesia sottoponi nuovamente il contenuto.
+    timestamp_error_message: Mi dispiace, troppo veloce! Per favore, invia di nuovo.
   layouts:
     decidim:
       cookie_warning:
-        description_html: Questo sito utilizza dei cookies. Se continui la navigazione significa che approvi i nostri termini di utilizzo dei cookies. Per ulteriori dettagli in proposito leggi %{link}.
+        description_html: Questo sito utilizza cookies. Se continui la navigazione significa che approvi i nostri termini di utilizzo di cookies. Per saperne di più, leggi %{link}.
         link_label: qui
         ok: OK, accetto
       footer:
-        made_with_open_source: 'Questo sito è su GitHub <a target="_blank" href="https://github.com/decidim/decidim">software libero</a>.'
+        made_with_open_source: 'Sito web creato con <a target="_blank" href="https://github.com/decidim/decidim">software libero</a>.'
       header:
-        close_menu: Chiudi questo menu
+        close_menu: Chiudere menu
         navigation: Navigazione
         sign_in: Accedi
         sign_up: Registrati
@@ -257,18 +253,18 @@ it:
         index:
           promoted_processes: Processi evidenziati
         no_processes_yet:
-          no_processes_yet: Non ci sono ancora dei processi partecipativi!
+          no_processes_yet: Non ci sono ancora processi partecipativi!
         order_by_processes:
           processes:
             one: "%{count} processo"
             other: "%{count} processi"
         participatory_process:
           active_step: 'Fase attuale:'
-          take_part: Unisciti
+          take_part: Partecipa
         promoted_process:
           active_step: 'Fase attuale:'
           more_info: Più informazioni
-          take_part: Unisciti
+          take_part: Partecipa
       process_header:
         process_menu_item: Il processo
         unfold: Espandi

data/db/migrate/20170725085104_add_show_statistics_to_participatory_processes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddShowStatisticsToParticipatoryProcesses < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_participatory_processes, :show_statistics, :boolean, default: true
+  end
+end

data/db/seeds.rb

@@ -55,25 +55,13 @@ if !Rails.env.production? || ENV["SEED"]
     replies_notifications: true
   )
 
-  3.times do
-    Decidim::User.find_each do |user|
-      user_group = Decidim::UserGroup.create!(
-        name: Faker::Company.name,
-        document_number: Faker::Number.number(10),
-        phone: Faker::PhoneNumber.phone_number,
-        verified_at: Time.current,
-        decidim_organization_id: user.organization.id
-      )
-
-      Decidim::UserGroupMembership.create!(
-        user: user,
-        user_group: user_group
-      )
-
+  Decidim::User.find_each do |user|
+    [nil, Time.current].each do |verified_at|
       user_group = Decidim::UserGroup.create!(
         name: Faker::Company.unique.name,
         document_number: Faker::Number.number(10),
         phone: Faker::PhoneNumber.phone_number,
+        verified_at: verified_at,
         decidim_organization_id: user.organization.id
       )
 
@@ -84,6 +72,8 @@ if !Rails.env.production? || ENV["SEED"]
     end
   end
 
+  seeds_root = File.join(__dir__, "seeds")
+
   process_groups = []
   3.times do
     process_groups << Decidim::ParticipatoryProcessGroup.create!(
@@ -91,7 +81,7 @@ if !Rails.env.production? || ENV["SEED"]
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
       end,
-      hero_image: File.new(File.join(__dir__, "seeds", "city.jpeg")),
+      hero_image: File.new(File.join(seeds_root, "city.jpeg")),
       organization: organization
     )
   end
@@ -108,8 +98,8 @@ if !Rails.env.production? || ENV["SEED"]
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
       end,
-      hero_image: File.new(File.join(__dir__, "seeds", "city.jpeg")),
-      banner_image: File.new(File.join(__dir__, "seeds", "city2.jpeg")),
+      hero_image: File.new(File.join(seeds_root, "city.jpeg")),
+      banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
       promoted: true,
       published_at: 2.weeks.ago,
       organization: organization,
@@ -153,21 +143,21 @@ if !Rails.env.production? || ENV["SEED"]
 
       Decidim::ParticipatoryProcessUserRole.create!(user: user, participatory_process: process, role: role)
     end
-  end
 
-  Decidim::ParticipatoryProcess.find_each do |process|
     Decidim::Attachment.create!(
       title: Decidim::Faker::Localized.sentence(2),
       description: Decidim::Faker::Localized.sentence(5),
-      file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
+      file: File.new(File.join(seeds_root, "city.jpeg")),
       attached_to: process
     )
+
     Decidim::Attachment.create!(
       title: Decidim::Faker::Localized.sentence(2),
       description: Decidim::Faker::Localized.sentence(5),
-      file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
+      file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
       attached_to: process
     )
+
     2.times do
       Decidim::Category.create!(
         name: Decidim::Faker::Localized.sentence(5),

data/lib/decidim/core.rb

@@ -43,19 +43,13 @@ module Decidim
     original_locale = I18n.available_locales
     I18n.available_locales = original_locale + [:en] unless original_locale.include?(:en)
 
-    railties = Rails.application.railties.to_a.uniq.select do |railtie|
-      railtie.respond_to?(:load_seed) && railtie.class.name.include?("Decidim::")
-    end
+    Rails.application.railties.to_a.uniq.each do |railtie|
+      next unless railtie.respond_to?(:load_seed) && railtie.class.name.include?("Decidim::")
 
-    railties.each do |railtie|
-      puts "Creating #{railtie.class.name} seeds..."
       railtie.load_seed
     end
 
-    Decidim.feature_manifests.each do |feature|
-      puts "Creating Feature (#{feature.name}) seeds..."
-      feature.seed!
-    end
+    Decidim.feature_manifests.each(&:seed!)
 
     I18n.available_locales = original_locale
   end

data/lib/decidim/core/engine.rb

@@ -142,7 +142,7 @@ module Decidim
           menu.item I18n.t("menu.home", scope: "decidim"),
                     decidim.root_path,
                     position: 1,
-                    active: ["decidim/pages" => :show]
+                    active: :exact
 
           menu.item I18n.t("menu.processes", scope: "decidim"),
                     decidim.participatory_processes_path,

data/lib/decidim/core/test/factories.rb

@@ -4,7 +4,7 @@ require "decidim/faker/localized"
 require "decidim/dev"
 
 FactoryGirl.define do
-  sequence :name do |n|
+  sequence(:name) do |n|
     "#{Faker::Name.name} #{n}"
   end
 
@@ -41,12 +41,12 @@ FactoryGirl.define do
     sequence(:host) { |n| "#{n}.lvh.me" }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
     welcome_text { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
-    homepage_image { test_file("city.jpeg", "image/jpeg") }
-    favicon { test_file("icon.png", "image/png") }
+    homepage_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+    favicon { Decidim::Dev.test_file("icon.png", "image/png") }
     default_locale { I18n.default_locale }
     available_locales { Decidim.available_locales }
-    official_img_header { test_file("avatar.jpg", "image/jpeg") }
-    official_img_footer { test_file("avatar.jpg", "image/jpeg") }
+    official_img_header { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
+    official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     official_url { Faker::Internet.url }
   end
 
@@ -56,8 +56,8 @@ FactoryGirl.define do
     subtitle { Decidim::Faker::Localized.sentence(1) }
     short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    hero_image { test_file("city.jpeg", "image/jpeg") }
-    banner_image { test_file("city2.jpeg", "image/jpeg") }
+    hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
     published_at { Time.current }
     organization
     meta_scope { Decidim::Faker::Localized.word }
@@ -67,6 +67,8 @@ FactoryGirl.define do
     participatory_scope { Decidim::Faker::Localized.sentence(1) }
     participatory_structure { Decidim::Faker::Localized.sentence(2) }
     end_date 2.month.from_now.at_midnight
+    show_statistics true
+
     trait :promoted do
       promoted true
     end
@@ -103,7 +105,7 @@ FactoryGirl.define do
   factory :participatory_process_group, class: Decidim::ParticipatoryProcessGroup do
     name { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    hero_image { test_file("city.jpeg", "image/jpeg") }
+    hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     organization
   end
 
@@ -133,7 +135,7 @@ FactoryGirl.define do
     organization
     locale { organization.default_locale }
     tos_agreement "1"
-    avatar { test_file("avatar.jpg", "image/jpeg") }
+    avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     comments_notifications true
     replies_notifications true
 
@@ -160,35 +162,19 @@ FactoryGirl.define do
                role: :admin
       end
     end
+  end
 
-    trait :process_collaborator do
-      transient { participatory_process nil }
-
-      after(:create) do |user, evaluator|
-        create :participatory_process_user_role,
-               user: user,
-               participatory_process: evaluator.participatory_process,
-               role: :collaborator
-      end
-    end
-
-    trait :process_moderator do
-      transient { participatory_process nil }
-
-      after(:create) do |user, evaluator|
-        create :participatory_process_user_role,
-               user: user,
-               participatory_process: evaluator.participatory_process,
-               role: :moderator
-      end
-    end
+  factory :participatory_process_user_role, class: Decidim::ParticipatoryProcessUserRole do
+    user
+    participatory_process
+    role "admin"
   end
 
   factory :user_group, class: Decidim::UserGroup do
     name { Faker::Educator.course }
     document_number { Faker::Number.number(8) + "X" }
     phone { Faker::PhoneNumber.phone_number }
-    avatar { test_file("avatar.jpg", "image/jpeg") }
+    avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     organization
 
     transient do
@@ -245,23 +231,23 @@ FactoryGirl.define do
   factory :attachment, class: Decidim::Attachment do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    file { test_file("city.jpeg", "image/jpeg") }
+    file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     attached_to { build(:participatory_process) }
 
     trait :with_image do
-      file { test_file("city.jpeg", "image/jpeg") }
+      file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     end
 
     trait :with_pdf do
-      file { test_file("Exampledocument.pdf", "application/pdf") }
+      file { Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf") }
     end
 
     trait :with_doc do
-      file { test_file("Exampledocument.doc", "application/msword") }
+      file { Decidim::Dev.test_file("Exampledocument.doc", "application/msword") }
     end
 
     trait :with_odt do
-      file { test_file("Exampledocument.odt", "application/vnd.oasis.opendocument") }
+      file { Decidim::Dev.test_file("Exampledocument.odt", "application/vnd.oasis.opendocument") }
     end
   end
 
@@ -271,10 +257,6 @@ FactoryGirl.define do
     manifest_name "dummy"
     published_at { Time.now }
 
-    after(:create) do |feature, _evaluator|
-      feature.participatory_process.steps.reload
-    end
-
     trait :unpublished do
       published_at { nil }
     end
@@ -293,7 +275,6 @@ FactoryGirl.define do
     title { generate(:name) }
     feature { create(:feature, manifest_name: "dummy") }
     author { create(:user, :confirmed, organization: feature.organization) }
-    category { create(:category, participatory_process: feature.participatory_process) }
   end
 
   factory :resource_link, class: Decidim::ResourceLink do
@@ -321,8 +302,3 @@ FactoryGirl.define do
     reason "spam"
   end
 end
-
-def test_file(filename, content_type)
-  asset = Decidim::Dev.asset(filename)
-  Rack::Test::UploadedFile.new(asset, content_type)
-end

data/lib/decidim/core/version.rb

@@ -3,7 +3,7 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.4.2"
+    "0.4.3"
   end
 
   def self.rails_version

data/lib/decidim/feature_manifest.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/features/settings_manifest"
-require_dependency "decidim/features/export_manifest"
+require "decidim/features/settings_manifest"
+require "decidim/features/export_manifest"
 
 module Decidim
   # This class handles all the logic associated to configuring a feature

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -466,70 +466,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -585,6 +585,7 @@ files:
 - app/assets/stylesheets/decidim/extras/_embed.scss
 - app/assets/stylesheets/decidim/extras/_label-required.scss
 - app/assets/stylesheets/decidim/extras/_leaflet.scss
+- app/assets/stylesheets/decidim/extras/_process_stats.scss
 - app/assets/stylesheets/decidim/extras/_quill.scss
 - app/assets/stylesheets/decidim/extras/_reference.scss
 - app/assets/stylesheets/decidim/extras/_register_form.scss
@@ -765,6 +766,7 @@ files:
 - app/presenters/decidim/home_stats_presenter.rb
 - app/presenters/decidim/menu_item_presenter.rb
 - app/presenters/decidim/menu_presenter.rb
+- app/presenters/decidim/participatory_process_stats_presenter.rb
 - app/presenters/decidim/resource_locator_presenter.rb
 - app/queries/decidim/highlighted_participatory_processes.rb
 - app/queries/decidim/organization_participatory_processes.rb
@@ -829,6 +831,7 @@ files:
 - app/views/decidim/participatory_processes/_order_by_processes.html.erb
 - app/views/decidim/participatory_processes/_participatory_process.html.erb
 - app/views/decidim/participatory_processes/_promoted_process.html.erb
+- app/views/decidim/participatory_processes/_statistics.html.erb
 - app/views/decidim/participatory_processes/index.html.erb
 - app/views/decidim/participatory_processes/show.html.erb
 - app/views/decidim/reported_mailer/hide.html.erb
@@ -974,6 +977,7 @@ files:
 - db/migrate/20170612100253_create_decidim_categorizations.rb
 - db/migrate/20170713131206_add_admin_to_users.rb
 - db/migrate/20170713131308_migrate_user_roles_to_participatory_process_roles.rb
+- db/migrate/20170725085104_add_show_statistics_to_participatory_processes.rb
 - db/seeds.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg