decidim-core 0.6.8 → 0.7.0

data/app/services/decidim/authorization_handler.rb

@@ -83,10 +83,13 @@ module Decidim
     # Returns an AuthorizationHandler descendant.
     # Returns nil when no handlers could be found.
     def self.handler_for(name, params = {})
-      return unless name
-      handler_klass = name.classify
-      return unless Decidim.authorization_handlers.map(&:to_s).include?(handler_klass)
-      handler_klass.constantize.from_params(params || {})
+      return unless active_handler?(name)
+
+      name.classify.constantize.from_params(params || {})
+    end
+
+    def self.active_handler?(name)
+      name && Decidim.authorization_handlers.include?(name.classify)
     end
   end
 end

data/app/services/decidim/static_map_generator.rb

@@ -15,7 +15,7 @@ module Decidim
     end
 
     def data
-      return if Decidim.geocoder.nil?
+      return if Decidim.geocoder.nil? || @resource.blank?
 
       Rails.cache.fetch(@resource.cache_key) do
         request = HTTParty.get(uri, headers: { "Referer" => organization.host })

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

@@ -1,2 +1,2 @@
-<%= form.password_field :password, value: form.object.password %>
-<%= form.password_field :password_confirmation, value: form.object.password_confirmation %>
+<%= form.password_field :password, value: form.object.password, autocomplete: "off" %>
+<%= form.password_field :password_confirmation, value: form.object.password_confirmation, autocomplete: "off" %>

data/app/views/decidim/authorizations/first_login.html.erb

@@ -13,7 +13,7 @@
             <% handlers.each do |handler| %>
               <%= link_to t("authorizations.first_login.actions.#{handler.handler_name}", scope: "decidim"), new_authorization_path(handler: handler.handler_name), class: "button expanded" %>
             <% end %>
-            <p class="text-center skip"><%= t("decidim.authorizations.skip_verification", link: link_to(t("decidim.authorizations.current_participatory_processes"), decidim_participatory_processes.participatory_processes_path).html_safe).html_safe %>.</p>
+            <p class="text-center skip"><%= t("decidim.authorizations.skip_verification", link: link_to(t("decidim.authorizations.start_exploring"), cta_button_path).html_safe).html_safe %>.</p>
           </div>
         </div>
       </div>

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

@@ -22,7 +22,9 @@
                 </div>
               <% end %>
             <% end %>
-            <p class="text-center skip"><%= t("decidim.authorizations.skip_verification", link: link_to(t("decidim.authorizations.current_participatory_processes"), stored_location).html_safe).html_safe %>.</p>
+            <p class="text-center skip">
+              <%= t("decidim.authorizations.skip_verification", link: link_to(t("decidim.authorizations.start_exploring"), cta_button_path).html_safe).html_safe %>.
+            </p>
           </div>
         </div>
       </div>

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

@@ -9,7 +9,7 @@
           <div class="social-register">
             <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(provider)}" do %>
               <span class="button--social__icon">
-                <%= icon normalize_provider_name(provider) %>
+                <%= oauth_icon provider %>
               </span>
               <%= t("devise.shared.links.sign_in_with_provider", provider: normalize_provider_name(provider).titleize) %>
             <% end %>

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

@@ -9,7 +9,7 @@
           <% 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) %>
+                <%= oauth_icon provider %>
               </span>
             <% end %>
           <% end %>

data/app/views/decidim/newsletter_mailer/newsletter.html.erb

@@ -1,5 +1,5 @@
-<%== @body %>
+<%= sanitize @body %>
 
 <% content_for :note do %>
-  <%== t ".note", organization_name: @organization.name, link: decidim.notifications_settings_url(host: @organization.host) %>
+  <%== t ".note", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>
 <% end %>

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

@@ -3,20 +3,24 @@
     <div class="columns">
       <div class="title-action" >
         <h1 class="heading1 title-action__title"><%= t("title", scope: "layouts.decidim.notifications_dashboard") %></h1>
-        <%= link_to(
-          t("mark_all_as_read", scope: "layouts.decidim.notifications_dashboard"),
-          decidim.read_all_notifications_path,
-          class: "button title-action__action hollow mark-all-as-read-button",
-          method: :delete,
-          data: { disable: true },
-          remote: true
-        ) %>
+        <% if notifications.any? %>
+          <%= link_to(
+            t("mark_all_as_read", scope: "layouts.decidim.notifications_dashboard"),
+            decidim.read_all_notifications_path,
+            class: "button title-action__action hollow mark-all-as-read-button",
+            method: :delete,
+            data: { disable: true },
+            remote: true
+          ) %>
+        <% end %>
       </div>
     </div>
   </div>
   <div class="row">
     <div class="columns mediumlarge-12 large-12">
-      <p class="empty-notifications hide"><%= t("no_notifications", scope: "layouts.decidim.notifications_dashboard") %></p>
+      <div class="empty-notifications hide callout secondary">
+        <p><%= t("no_notifications", scope: "layouts.decidim.notifications_dashboard") %></p>
+      </div>
       <% if notifications.any? %>
         <section class="section" id="notifications-list">
           <div class="card card--list">

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

@@ -1,9 +1,9 @@
 <div class="address__details">
   <% if geolocalizable.respond_to? :location %>
-    <strong><%== translated_attribute geolocalizable.location %></strong><br />
+    <strong><%= translated_attribute geolocalizable.location %></strong><br />
   <% end %>
   <span><%= geolocalizable.address %></span><br />
   <% if geolocalizable.respond_to? :location_hints %>
-    <span><%== translated_attribute geolocalizable.location_hints %></span>
+    <span><%= translated_attribute geolocalizable.location_hints %></span>
   <% end %>
 </div>

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

@@ -1,5 +1,5 @@
 <div class="row column">
   <div class="callout secondary announcement">
-    <%== translated_attribute announcement %>
+    <%= sanitize translated_attribute announcement %>
   </div>
 </div>

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

@@ -1,5 +1,5 @@
-<% if current_user %>
-  <div id="follow-resource">
+<div id="follow-resource">
+  <% if current_user %>
     <% if current_user.follows?(followable) %>
       <%= button_to decidim.follow_path, class: "button secondary hollow expanded small button--icon follow-button", params: { follow: { followable_gid: followable.to_sgid.to_s }}, data: { disable: true }, method: :delete, remote: true do %>
         <%= icon "bell" %>
@@ -15,5 +15,20 @@
         </span>
       <% end %>
     <% end %>
-  </div>
-<% end %>
+  <% else %>
+    <%= button_to(
+      decidim.follow_path,
+      class: "button secondary hollow expanded small button--icon follow-button",
+      params: { follow: { followable_gid: followable.to_sgid.to_s }},
+      data: { tooltip: true, disable_hover: false },
+      :'aria-haspopup' => true,
+      title: t(".sign_in_before_follow"),
+      disabled: true,
+      remote: true) do %>
+      <%= icon "bell" %>
+      <span>
+        <%= t("follows.create.button", scope: "decidim") %>
+      </span>
+    <% end %>
+  <% end %>
+</div>

data/app/views/devise/mailer/invite_admin.html.erb

@@ -4,7 +4,7 @@
   <% if @resource.invited_by.present? %>
     <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
   <% end %>
 </p>
 

data/app/views/devise/mailer/invite_admin.text.erb

@@ -3,7 +3,7 @@
 <% if @resource.invited_by.present? %>
 <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.you_are_now_admin", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>

data/app/views/devise/mailer/invite_collaborator.html.erb

@@ -4,7 +4,7 @@
   <% if @resource.invited_by.present? %>
     <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
   <% end %>
 </p>
 

data/app/views/devise/mailer/invite_collaborator.text.erb

@@ -3,7 +3,7 @@
 <% if @resource.invited_by.present? %>
 <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.you_are_now_admin", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>

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

@@ -0,0 +1,5 @@
+<% if try(:current_feature) %>
+  <% current_feature.manifest.actions.each do |action| %>
+    <%= action_authorization_modal(action) %>
+  <% end %>
+<% end %>

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

@@ -22,4 +22,4 @@
 <%= javascript_include_tag 'application' %>
 
 <%= render partial: 'layouts/decidim/head_extra' %>
-<%== current_organization.header_snippets %>
+<%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>

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

@@ -98,7 +98,7 @@
       </div>
       <div class="mini-footer">
         <div class="row">
-          <div class="columns">
+          <div class="medium-3 large-4 column">
             <a rel="license" class="cc-badge"
                href="http://creativecommons.org/licenses/by-sa/4.0/"
                target="_blank">
@@ -106,6 +106,15 @@
             </a>
             <%= t('layouts.decidim.footer.made_with_open_source').html_safe %>
           </div>
+          <div class="medium-3 large-2 column">
+            <div class="decidim-logo">
+              <a rel="decidim"
+                 href="https://decidim.org/"
+                 target="_blank">
+                <%= image_tag("decidim/decidim-logo.svg", alt: "Decidim Logo" ) %>
+              </a>
+            </div>
+          </div>
         </div>
       </div>
     </div><!--/.off-canvas-content-->

data/app/views/pages/decidim_page.html.erb

@@ -10,7 +10,7 @@
   <div class="row">
     <div class="columns large-8">
       <div class="static__content">
-        <%== translated_attribute page.content %>
+        <%= sanitize translated_attribute page.content %>
       </div>
     </div>
   </div>

data/app/views/pages/home/_footer_sub_hero.html.erb

@@ -1,4 +1,4 @@
-<section class="footer__subhero extended subhero home-section">
+<section class="footer__subhero extended subhero<%= " home-section" if current_organization.show_statistics? %>">
   <div class="row">
     <div class="columns small-centered large-10">
       <h2 class="heading3"><%= t(".footer_sub_hero_headline", organization: current_organization.name) %></h2>

data/app/views/pages/home/_hero.html.erb

@@ -6,14 +6,14 @@
           <% if translated_attribute(current_organization.welcome_text).blank? %>
             <%= t('.welcome', organization: current_organization.name) %>
           <% else %>
-            <%== translated_attribute current_organization.welcome_text %>
+            <%= sanitize translated_attribute current_organization.welcome_text %>
           <% end %>
         </h1>
       </div>
     </div>
     <div class="row">
       <div class="columns small-centered small-6 medium-4 mediumlarge-3">
-        <%= link_to t('.participate'), decidim_participatory_processes.participatory_processes_path, class: "hero-cta button expanded large button--sc" %>
+        <%= cta_button %>
       </div>
     </div>
   </div>

data/app/views/pages/home/_sub_hero.html.erb

@@ -1,7 +1,7 @@
   <section class="extended subhero home-section">
     <div class="row">
       <div class="columns small-centered large-10">
-        <h2 class="heading3"><%== translated_attribute current_organization.description %></h2>
+        <h2 class="heading3"><%= sanitize translated_attribute current_organization.description %></h2>
         <%= link_to new_user_registration_path, class: "button--sc link subhero-cta" do %>
           <%= t(".register") %>
           <%= icon "chevron-right", aria_hidden: true %>

data/config/initializers/devise.rb

@@ -300,6 +300,9 @@ Devise.setup do |config|
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
+  if Rails.application.secrets.dig(:omniauth, :developer).present?
+    config.omniauth :developer
+  end
   if Rails.application.secrets.dig(:omniauth, :facebook).present?
     config.omniauth :facebook,
                     Rails.application.secrets.omniauth[:facebook][:app_id],

data/config/locales/ca.yml

@@ -76,7 +76,6 @@ ca:
       create:
         error: S'ha produït un error en crear l'autorització.
         success: Has estat autoritzat/da correctament.
-      current_participatory_processes: fer una ullada als processos actuals
       first_login:
         actions:
           decidim/dummy_authorization_handler: Verificar contra l'exemple d'autorització
@@ -86,6 +85,7 @@ ca:
         authorize: Enviar
         authorize_with: Verificar-me amb %{authorizer}
       skip_verification: Pots saltar-te aquest pas per ara i %{link}
+      start_exploring: començar a explorar
     core:
       actions:
         unauthorized: No tens permís per realitzar aquesta acció
@@ -157,6 +157,7 @@ ca:
     filters:
       linked_classes:
         all: Tots
+        dummyresource: Recursos de prova
         meeting: Trobades
         project: Projectes
         proposal: propostes
@@ -243,6 +244,8 @@ ca:
         report: Denuncia
         spam: Conté "clickbait", publicitat o estafes.
         title: Denuncia un problema
+      follow_button:
+        sign_in_before_follow: Inicia sessió abans de realitzar aquesta acció
       login_modal:
         please_sign_in: Si us plau, inicia sessió
         sign_up: Donar-se d'alta
@@ -267,9 +270,9 @@ ca:
         ignore: |-
           Si no vols acceptar la invitació, ignora aquest correu.<br />
           El teu compte no es crearà fins que no accedeixis a l'enllaç de sota i triïs la teva contrasenya.
-        invited_you_as_admin: "%{invited_by} t'ha convidat com un administrador de %{application}, pots acceptar-ho mitjançant el següent enllaç."
-        someone_invited_you: Algú t'ha convidat a %{application}, pots acceptar la invitació amb l'enllaç a continuació.
-        you_are_now_admin: Ara ets administrador
+        invited_you_as_admin: "%{invited_by} t'ha convidat com a administrador de %{application}. Pots acceptar-ho a través de l'enllaç següent."
+        someone_invited_you: Algú t'ha convidat a %{application}. Pots acceptar-ho a través de l'enllaç següent.
+        someone_invited_you_as_admin: Algú t'ha convidat com a administrador de %{application}, pots acceptar-lo a través de l'enllaç següent.
       invite_admin:
         subject: Has estat convidat a gestionar %{organization}
       invite_collaborator:
@@ -341,13 +344,13 @@ ca:
     home:
       extended:
         debates: Debats
-        debates_explanation: Anem a conèixer, debatre i compartir el que pensem que és important per a la nostra ciutat.
+        debates_explanation: Debat i discuteix, comparteix les teves opinions i enriqueix els temes rellevants.
         how_to_participate: Com participo en un procés?
         meetings: Trobades
-        meetings_explanation: Anem a conèixer, debatre i compartir el que pensem que és important per a la nostra ciutat.
+        meetings_explanation: Esbrina on i quan pots participar en trobades públiques.
         more_info: Més informació
         proposals: Propostes
-        proposals_explanation: Espai obert de propostes dels ciutadans sobre quin tipus de ciutat volem viure.
+        proposals_explanation: Realitza propostes, recolza les ja existents i promociona els canvis que vols veure.
       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: Benvinguda i benvingut a la plataforma participativa %{organization}.

data/config/locales/en.yml

@@ -76,7 +76,6 @@ en:
       create:
         error: There was an error creating the authorization.
         success: You've been successfully authorized.
-      current_participatory_processes: take a look at the current processes
       first_login:
         actions:
           decidim/dummy_authorization_handler: Verify against the example authorization
@@ -86,6 +85,7 @@ en:
         authorize: Send
         authorize_with: Verify with %{authorizer}
       skip_verification: You can skip this for now and %{link}
+      start_exploring: start exploring
     core:
       actions:
         unauthorized: You are not authorized to perform this action
@@ -157,6 +157,7 @@ en:
     filters:
       linked_classes:
         all: All
+        dummyresource: Dummy resources
         meeting: Meetings
         project: Projects
         proposal: Proposals
@@ -243,6 +244,8 @@ en:
         report: Report
         spam: Contains clickbait, advertising, scams or script bots.
         title: Report a problem
+      follow_button:
+        sign_in_before_follow: Please sign in before performing this action
       login_modal:
         please_sign_in: Please sign in
         sign_up: Sign up
@@ -267,9 +270,9 @@ en:
         ignore: |-
           If you don't want to accept the invitation, please ignore this email.<br />
           Your account won't be created until you access the link above and set your password.
-        invited_you_as_admin: "%{invited_by} has invited you as an admin of %{application}, you can accept it through the link below."
-        someone_invited_you: Someone has invited you to %{application}, you can accept it through the link below.
-        you_are_now_admin: You are now an admin
+        invited_you_as_admin: "%{invited_by} has invited you as an admin of %{application}. You can accept it through the link below."
+        someone_invited_you: Someone has invited you to %{application}. You can accept it through the link below.
+        someone_invited_you_as_admin: Someone has invited you as an admin of %{application}, you can accept it through the link below.
       invite_admin:
         subject: You've been invited to manage %{organization}
       invite_collaborator:
@@ -339,13 +342,13 @@ en:
     home:
       extended:
         debates: Debates
-        debates_explanation: Let's meet, debate and share what we think it's important for our city.
+        debates_explanation: Debate and discuss, share your views and enrich the relevant topics.
         how_to_participate: How do I take part in a process?
         meetings: Meetings
-        meetings_explanation: Let's meet, debate and share what we think it's important for our city.
+        meetings_explanation: Find out where and when you can participate in public meetings.
         more_info: More info
         proposals: Proposals
-        proposals_explanation: Open space for citizen proposals about what kind of city we want to live in.
+        proposals_explanation: Make proposals, support existing ones and promote the changes you want to see.
       footer_sub_hero:
         footer_sub_hero_body: Let's build a more open, transparent and collaborative society.<br /> Join, participate and decide.
         footer_sub_hero_headline: Welcome to %{organization} participatory platform.
@@ -362,7 +365,7 @@ en:
         comments_count: Comments
         headline: Current state of %{organization}
         meetings_count: Meetings
-        orders_count: Orders
+        orders_count: Votes
         pages_count: Pages
         processes_count: Processes
         projects_count: Projects

data/config/locales/es.yml

@@ -76,7 +76,6 @@ es:
       create:
         error: Se ha producido un error al crear la autorización.
         success: Has sido autorizado/a correctamente.
-      current_participatory_processes: echar un vistazo a los procesos actuales
       first_login:
         actions:
           decidim/dummy_authorization_handler: Verificar ejemplo autorización en contra de la
@@ -86,6 +85,7 @@ es:
         authorize: Enviar
         authorize_with: Verificarme con %{authorizer}
       skip_verification: Puedes saltarte este paso por ahora y %{link}
+      start_exploring: empezar a explorar
     core:
       actions:
         unauthorized: No tienes permiso para realizar esta acción.
@@ -157,6 +157,7 @@ es:
     filters:
       linked_classes:
         all: Todas
+        dummyresource: Recursos ficticios
         meeting: Encuentros
         project: Proyectos
         proposal: Propuestas
@@ -243,6 +244,8 @@ es:
         report: Denunciar
         spam: Contiene clickbait, publicidad o estafas.
         title: Denunciar un problema
+      follow_button:
+        sign_in_before_follow: Inicia sesión antes de realizar esta acción
       login_modal:
         please_sign_in: Por favor, regístrate
         sign_up: Regístrate
@@ -267,9 +270,9 @@ es:
         ignore: |-
           Si no quieres aceptar la invitación ignora este correo.<br />
           Tu cuenta no se creará hasta que accedas al enlance de abajo y escojas tu contraseña.
-        invited_you_as_admin: "%{invited_by} te ha invitado como administrador de %{application}, puedes aceptar a través del siguiente enlace."
-        someone_invited_you: Alguien te ha invitado a %{application}, puedes aceptar la invitación con el enlace a continuación.
-        you_are_now_admin: Ahora eres un administrador
+        invited_you_as_admin: "%{invited_by} te ha invitado como administrador de %{application}. Puedes aceptarlo a través del siguiente enlace."
+        someone_invited_you: Alguien te ha invitado a %{application}. Puedes aceptar la invitación a través del siguiente enlace.
+        someone_invited_you_as_admin: Alguien te ha invitado como administrador de %{application}, puedes aceptar a través del siguiente enlace.
       invite_admin:
         subject: Has sido invitado para gestionar %{organization}
       invite_collaborator:
@@ -339,13 +342,13 @@ es:
     home:
       extended:
         debates: Debates
-        debates_explanation: Vamos a conocer, debatir y compartir lo que pensamos que es importante para nuestra ciudad.
+        debates_explanation: Debate y discute, comparte tus opiniones y enriquece los temas relevantes.
         how_to_participate: "¿Cómo tomo parte en un proceso?"
         meetings: Encuentros
-        meetings_explanation: Vamos a conocer, debatir y compartir lo que pensamos que es importante para nuestra ciudad.
+        meetings_explanation: Averigua dónde y cuándo puedes participar en encuentros públicos.
         more_info: Más información
         proposals: Propuestas
-        proposals_explanation: Espacio abierto de propuestas de los ciudadanos sobre en qué tipo de ciudad queremos vivir.
+        proposals_explanation: Haz propuestas, apoya las existentes y promueve los cambios que deseas ver.
       footer_sub_hero:
         footer_sub_hero_body: Construyamos una sociedad más abierta, transparente y colaborativa. <br /> Únete, participa y decide.
         footer_sub_hero_headline: Bienvenido a la plataforma participativa %{organization}.