decidim-core 0.3.2 → 0.4.0

data/app/helpers/decidim/application_helper.rb

@@ -3,6 +3,8 @@
 module Decidim
   # Main module to add application-wide helpers.
   module ApplicationHelper
+    include Decidim::OmniauthHelper
+
     # Truncates a given text respecting its HTML tags.
     #
     # text    - The String text to be truncated.
@@ -17,6 +19,7 @@ module Decidim
       options[:tail] = options.delete(:separator) || options[:tail] || "..."
       options[:count_tags] ||= false
       options[:count_tail] ||= false
+      options[:tail_before_final_tag] ||= true
 
       Truncato.truncate(text, options)
     end

data/app/helpers/decidim/feature_path_helper.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A helper to get the root path for a feature.
+  module FeaturePathHelper
+    # Returns the defined root path for a given feature.
+    #
+    # feature - the Feature we want to find the root path for.
+    #
+    # Returns a url.
+    def feature_path(feature)
+      feature_root_path_for(feature.manifest.engine, feature)
+    end
+
+    # Returns the defined admin root path for a given feature.
+    #
+    # feature - the Feature we want to find the root path for.
+    #
+    # Returns a url.
+    def manage_feature_path(feature)
+      feature_root_path_for(feature.manifest.admin_engine, feature)
+    end
+
+    private
+
+    def feature_root_path_for(engine, feature)
+      url_params = {
+        feature_id: feature.id,
+        participatory_process_id: feature.participatory_process.id
+      }
+
+      engine.routes.url_helpers.root_path(url_params)
+    end
+  end
+end

data/app/helpers/decidim/feature_reference_helper.rb

@@ -6,12 +6,14 @@ module Decidim
     # Displays the localized reference for the given feature.
     #
     # feature - the Feature that has the reference to display.
+    # options - An optional hash of options
+    #         * class: A string of extra css classes
     #
     # Returns a String.
-    def feature_reference(feature)
+    def feature_reference(feature, options = {})
       return unless feature.reference
       @reference = feature.reference
-      "<div class='reference'>#{localized_reference}</div>".html_safe
+      "<div class='reference #{options[:class]}'>#{localized_reference}</div>".html_safe
     end
 
     private

data/app/helpers/decidim/icon_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helpers related to icons
+  module IconHelper
+    # 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)
+      if feature.manifest.icon
+        external_icon feature.manifest.icon
+      else
+        icon "question-mark"
+      end
+    end
+  end
+end

data/app/helpers/decidim/menu_helper.rb

@@ -5,7 +5,7 @@ module Decidim
   module MenuHelper
     # Public: Returns the main menu presenter object
     def main_menu
-      @main_menu ||= MenuPresenter.new(
+      @main_menu ||= ::Decidim::MenuPresenter.new(
         :menu,
         self,
         element_class: "main-nav__link",

data/app/helpers/decidim/participatory_process_helper.rb

@@ -13,19 +13,5 @@ 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)
-      if feature.manifest.icon
-        external_icon feature.manifest.icon
-      else
-        icon "question-mark"
-      end
-    end
   end
 end

data/app/models/decidim/feature.rb

@@ -61,6 +61,14 @@ module Decidim
       self[:settings]["global"] = serialize_settings(settings_schema(:global), data)
     end
 
+    def default_step_settings
+      settings_schema(:step).new(self[:settings]["default_step"])
+    end
+
+    def default_step_settings=(data)
+      self[:settings]["default_step"] = serialize_settings(settings_schema(:step), data)
+    end
+
     def step_settings
       participatory_process.steps.each_with_object({}) do |step, result|
         result[step.id.to_s] = settings_schema(:step).new(self[:settings].dig("steps", step.id.to_s))
@@ -75,7 +83,7 @@ module Decidim
 
     def active_step_settings
       active_step = participatory_process.active_step
-      return nil unless active_step
+      return default_step_settings unless active_step
 
       step_settings.fetch(active_step.id.to_s)
     end

data/app/models/decidim/static_page.rb

@@ -11,6 +11,7 @@ module Decidim
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :static_pages
 
     validates :slug, presence: true, uniqueness: { scope: :organization }
+    validates :slug, format: { with: /\A[a-z0-9-]+/ }
 
     # These pages will be created by default when registering an organization
     # and cannot be deleted.

data/app/models/decidim/user.rb

@@ -28,6 +28,8 @@ module Decidim
     validate :all_roles_are_valid
     mount_uploader :avatar, Decidim::AvatarUploader
 
+    scope :not_deleted, -> { where(deleted_at: nil) }
+
     # Public: Allows customizing the invitation instruction email content when
     # inviting a user.
     #

data/app/queries/decidim/highlighted_participatory_processes.rb

@@ -5,7 +5,7 @@ module Decidim
   # public view.
   class HighlightedParticipatoryProcesses < Rectify::Query
     def query
-      Decidim::ParticipatoryProcess.order("promoted DESC").includes(:active_step).order("decidim_participatory_process_steps.end_date ASC").limit(8)
+      PrioritizedParticipatoryProcesses.new.query.limit(8)
     end
   end
 end

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

@@ -1,9 +1,7 @@
 <div class="row">
   <%= decidim_form_for(@account, url: account_path, method: :put, class: "user-form") do |f| %>
     <div class="columns large-4">
-      <%= image_tag current_user.avatar.big.url, width: "100%" %>
-      <%= f.file_field :avatar, label: false %>
-      <%= f.check_box :remove_avatar %>
+      <%= f.upload :avatar %>
     </div>
 
     <div class="columns large-8 end">

data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb

@@ -12,7 +12,7 @@
                 <%= icon normalize_provider_name(provider) %>
               </span>
               <%= t("devise.shared.links.sign_in_with_provider", provider: normalize_provider_name(provider).titleize) %>
-            <% end %> 
+            <% end %>
           </div>
         <% end %>
       <% end %>

data/app/views/decidim/devise/shared/_omniauth_buttons_mini.html.erb

@@ -0,0 +1,20 @@
+<% if Devise.mappings[:user].omniauthable? && any_social_provider_enabled? %>
+  <div class="row">
+    <div class="columns medium-8 medium-centered">
+      <span class="register__separator">
+        <span class="register__separator__text"><%= t('or', scope: "decidim.devise.shared.omniauth_buttons") %></span>
+      </span>
+      <div class="text-center">
+        <%- Decidim::User.omniauth_providers.each do |provider| %>
+          <% if social_provider_enabled? provider %>
+            <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(provider)} button--social--mini" do %>
+              <span class="button--social__icon">
+                <%= icon normalize_provider_name(provider) %>
+              </span>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/{pages/404.html.erb → decidim/errors/not_found.html.erb}

@@ -8,6 +8,6 @@
           <%= link_to t(".back_home"), root_path, class: "button" %>
         </div>
       </div>
+    </div>
   </div>
-</div>
 </main>

data/app/views/decidim/shared/_login_modal.html.erb

@@ -24,6 +24,10 @@
       <p class="text-center">
         <%= link_to t('.sign_up'), decidim.new_user_registration_path, class: "sign-up-link" %>
       </p>
+      <p class="text-center">
+        <%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
+      </p>
     </div>
+    <%= render "decidim/devise/shared/omniauth_buttons_mini" %>
   </div>
 </div>

data/app/views/decidim/shared/_share_modal.html.erb

@@ -29,5 +29,5 @@
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <h4 class="heading4"><%= "#{content_for(:meta_url)}" %></h4>
+  <h4 class="heading4"><%= "#{decidim_meta_url}" %></h4>
 </div>

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

@@ -48,8 +48,8 @@
 
             <% current_participatory_process.features.each do |feature| %>
               <% if feature.published? || feature == self.try(:current_feature) %>
-                <li class="<%= "is-active" if is_active_link?(decidim.feature_path(current_participatory_process, feature), :inclusive) %>">
-                  <%= active_link_to decidim.feature_path(current_participatory_process, feature), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
+                <li class="<%= "is-active" if is_active_link?(feature_path(feature), :inclusive) %>">
+                  <%= active_link_to feature_path(feature), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
                     <%= feature_icon(feature) %>
 
                     <%= translated_attribute(feature.name) %>

data/config/i18n-tasks.yml

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

data/config/initializers/invisible_captcha.rb

@@ -2,9 +2,9 @@
 
 InvisibleCaptcha.setup do |config|
   config.honeypots << "another_fake_attribute"
-  config.visual_honeypots    = false
+  config.visual_honeypots = false
   config.timestamp_threshold = 4
-  config.timestamp_enabled   = false
+  config.timestamp_enabled = false
   # Leave these unset if you want to use I18n (see below)
   # config.sentence_for_humans     = 'If you are a human, ignore this field'
   # config.timestamp_error_message = 'Sorry, that was too quick! Please resubmit.'

data/config/locales/ca.yml

@@ -118,6 +118,14 @@ ca:
       shared:
         omniauth_buttons:
           or: O
+    errors:
+      internal_server_error:
+        title: Hi ha hagut un problema amb el nostre servidor
+        try_later: Si us plau, torna-ho a intentar més tard.
+      not_found:
+        back_home: Tornar a l'inici
+        content_doesnt_exist: Aquesta adreça és incorrecta o ha estat eliminada.
+        title: No s'ha trobat la pàgina que busques
     export_mailer:
       export:
         ready: S'adjunta una versió comprimida de l'exportació.
@@ -145,6 +153,9 @@ ca:
         proposal: propostes
         result: Resultats
     forms:
+      current_file: Fitxer actual
+      current_image: Imatge actual
+      default_image: Imatge predeterminada
       errors:
         error: Hi ha un error en aquest camp.
     menu:
@@ -284,6 +295,8 @@ ca:
       too_many_marks: Està utilitzant massa símbols d'exclamació o interrogació
       too_much_caps: Està utilitzant massa majúscules
       too_short: És massa curt
+  forms:
+    required: Obligatori
   invisible_captcha:
     sentence_for_humans: Si ets un humà, pots ignorar aquest camp
     timestamp_error_message: Ho sentim, has estat massa ràpid! Torna a enviar-ho.
@@ -345,13 +358,6 @@ ca:
   locale:
     name: Català
   pages:
-    '404':
-      back_home: Tornar a l'inici
-      content_doesnt_exist: Aquesta adreça és incorrecta o ha estat eliminada.
-      title: No s'ha trobat la pàgina que busques!
-    '500':
-      title: Hi ha hagut un problema amb el nostre servidor
-      try_later: Si us plau, torna-ho a intentar més tard.
     home:
       extended:
         debates: Debats
@@ -364,7 +370,7 @@ ca:
         proposals_explanation: Espai obert de propostes dels ciutadans sobre quin tipus de ciutat volem viure.
       footer_sub_hero:
         footer_sub_hero_body: Construïm una societat més oberta, transparent i col·laborativa.<br />Uneix-te, participa i decideix.
-        footer_sub_hero_headline: Benvingut a la plataforma participativa %{organization}.
+        footer_sub_hero_headline: Bienvenida y bienvenido a la plataforma participativa %{organization}.
         register: Registra't
       hero:
         participate: Participa

data/config/locales/en.yml

@@ -119,6 +119,14 @@ en:
       shared:
         omniauth_buttons:
           or: Or
+    errors:
+      internal_server_error:
+        title: There was a problem with our server
+        try_later: Please try again later.
+      not_found:
+        back_home: Back home
+        content_doesnt_exist: This address is incorrect or has been removed.
+        title: The page you're looking for can't be found
     export_mailer:
       export:
         ready: Please find attached a zipped version of your export.
@@ -146,6 +154,9 @@ en:
         proposal: Proposals
         result: Results
     forms:
+      current_file: Current file
+      current_image: Current image
+      default_image: Default image
       errors:
         error: There's an error in this field.
     menu:
@@ -285,6 +296,8 @@ en:
       too_many_marks: Is using too many marks
       too_much_caps: Is using too much caps
       too_short: Is too short
+  forms:
+    required: Required
   invisible_captcha:
     sentence_for_humans: If you are human, ignore this field
     timestamp_error_message: Sorry, that was too quick! Please resubmit.
@@ -346,13 +359,6 @@ en:
   locale:
     name: English
   pages:
-    '404':
-      back_home: Back home
-      content_doesnt_exist: This address is incorrect or has been removed.
-      title: The page you're looking for can't be found
-    '500':
-      title: There was a problem with our server
-      try_later: Please try again later.
     home:
       extended:
         debates: Debates

data/config/locales/es.yml

@@ -118,6 +118,14 @@ es:
       shared:
         omniauth_buttons:
           or: O
+    errors:
+      internal_server_error:
+        title: Ha habido un problema con nuestro servidor
+        try_later: Por favor, vuelve a intentarlo más tarde.
+      not_found:
+        back_home: Volver al inicio
+        content_doesnt_exist: Esta dirección es incorrecta o ha sido eliminada.
+        title: No se ha encontrado la página que buscas
     export_mailer:
       export:
         ready: Adjunto encontrará una versión comprimida de su exportación.
@@ -145,6 +153,9 @@ es:
         proposal: Propuestas
         result: Resultados
     forms:
+      current_file: Archivo actual
+      current_image: Imagen actual
+      default_image: Imagen predeterminada
       errors:
         error: Hay un error en este campo.
     menu:
@@ -284,6 +295,8 @@ es:
       too_many_marks: Está utilizando demasiados símbolos de interrogación o exclamación
       too_much_caps: Está usando demasiadas mayúsculas
       too_short: Es demasiado corto
+  forms:
+    required: Obligatorio
   invisible_captcha:
     sentence_for_humans: Si eres humano, ignora este campo
     timestamp_error_message: Lo siento, has sido demasiado rápido! Por favor, vuelva a enviar.
@@ -345,13 +358,6 @@ es:
   locale:
     name: Castellano
   pages:
-    '404':
-      back_home: Volver al inicio
-      content_doesnt_exist: Esta dirección es incorrecta o ha sido eliminada.
-      title: '¡No se ha encontrado la página que buscas!'
-    '500':
-      title: Ha habido un problema con nuestro servidor
-      try_later: Por favor, vuelve a intentarlo más tarde.
     home:
       extended:
         debates: Debates

data/config/locales/eu.yml

@@ -323,13 +323,6 @@ eu:
   locale:
     name: Euskera
   pages:
-    '404':
-      back_home: Itzuli hasierara
-      content_doesnt_exist: Helbide okerra da edo ezabatu da.
-      title: Ez dugu aurkitu bilatzen duzun orria!
-    '500':
-      title: Arazo bat izan da gure zerbitzariarekin
-      try_later: Mesedez, berriz saiatu geroago.
     home:
       extended:
         debates: Eztabaidak