decidim-core 0.5.1 → 0.6.0

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

@@ -1,17 +1,10 @@
 <div class="row">
   <%= form_for(@notifications_settings, url: notifications_settings_path, method: :put, class: "user-form") do |f| %>
-    <div class="switch tiny switch-with-label comments_notifications">
+    <div class="switch tiny switch-with-label email_on_notification">
       <label>
-        <%= f.check_box :comments_notifications, label: false, class: "switch-input" %>
+        <%= f.check_box :email_on_notification, label: false, class: "switch-input" %>
         <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t('.comments_notifications') %></span>
-      </label>
-    </div>
-    <div class="switch tiny switch-with-label replies_notifications">
-      <label>
-        <%= f.check_box :replies_notifications, label: false, class: "switch-input" %>
-        <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t('.replies_notifications') %></span>
+        <span class="switch-label"><%= t('.email_on_notification') %></span>
       </label>
     </div>
     <div class="switch tiny switch-with-label newsletter_notifications">

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

@@ -0,0 +1,19 @@
+<% if current_user %>
+  <div id="follow-resource">
+    <% 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" %>
+        <span>
+          <%= t("follows.destroy.button", scope: "decidim") %>
+        </span>
+      <% 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: { disable: true }, remote: true do %>
+        <%= icon "bell" %>
+        <span>
+          <%= t("follows.create.button", scope: "decidim") %>
+        </span>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>

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

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

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

@@ -2,6 +2,13 @@
 This file is meant to be overriden by the app developers in order to
 include extra headers like tracking, error handling and such.
 
+Note that thie code you add here will be run for all organizations in
+your instance of Decidim. If you want to add code for a specific
+organization, add it to the organization's `header_snippets` field,
+which can be modified at the organization admin section.
+
+The `header_snippets` organization field will render *after* this file.
+
 Just copy your own version of the file under:
 `app/views/layouts/decidim/_head_extra.html.erb`
 %>

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

@@ -1,4 +1,5 @@
 <li><%= link_to t(".profile"), decidim.account_path %></li>
+<li><%= link_to t(".notifications"), decidim.notifications_path %></li>
 <% if can? :read, :admin_dashboard %>
   <li><%= link_to t(".admin_dashboard"), decidim_admin.root_path %></li>
 <% end %>

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

@@ -36,6 +36,9 @@
             </div>
             <% if current_user %>
               <div class="topbar__dropmenu topbar__user__logged">
+                <%= link_to decidim.notifications_path, class: "topbar__notifications #{current_user.notifications.any? ? "is-active" : ""}" do %>
+                  <%= icon "bell" %>
+                <% end %>
                 <ul class="dropdown menu" data-dropdown-menu>
                   <li class="is-dropdown-submenu-parent show-for-medium">
                     <%= link_to current_user.name, decidim.account_path %>

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

@@ -13,15 +13,15 @@
       <%= content_for(:header) %>
     <% else %>
       <div class="participatory-process">
-        <%= link_to translated_attribute(current_participatory_process.title), decidim.participatory_process_path(current_participatory_process), target: "_blank" %>
+        <%= link_to translated_attribute(current_participatory_space.title), polymorphic_path(current_participatory_space), target: "_blank" %>
       </div>
     <% end %>
     <div class="row collapse">
       <div class="column">
 
         <article class="card">
-          <% if current_participatory_process.banner_image %>
-            <div class="card__image-top" style="background-image: url(<%= current_participatory_process.banner_image.url %>)"></div>
+          <% if current_participatory_space.banner_image %>
+            <div class="card__image-top" style="background-image: url(<%= current_participatory_space.banner_image.url %>)"></div>
           <% end %>
 
           <div class="card__content">

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

@@ -13,7 +13,7 @@
     </div>
     <div class="row">
       <div class="columns small-centered small-6 medium-4 mediumlarge-3">
-        <%= link_to t('.participate'), participatory_processes_path, class: "hero-cta button expanded large button--sc" %>
+        <%= link_to t('.participate'), decidim_participatory_processes.participatory_processes_path, class: "hero-cta button expanded large button--sc" %>
       </div>
     </div>
   </div>

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

@@ -7,12 +7,12 @@
         <% highlighted_participatory_processes.each do |process| %>
           <div class="column">
             <article class="card card--process card--mini">
-              <%= link_to participatory_process_path(process), class: "card__link" do %>
+              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
                 <div class="card__image-top"
                      style="background-image:url(<%= process.hero_image.url %>)"></div>
               <% end %>
               <div class="card__content">
-                <%= link_to participatory_process_path(process), class: "card__link" do %>
+                <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
                   <h4 class="card__title"><%= translated_attribute process.title %></h4>
                 <% end %>
                 <% if process.active_step %>
@@ -31,7 +31,7 @@
   <div class="row">
     <div class="columns small-centered small-12
                 smallmedium-8 medium-6 large-4">
-      <%= link_to t(".see_all_processes"), participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
+      <%= link_to t(".see_all_processes"), decidim_participatory_processes.participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
     </div>
   </div>
 </section>

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ ca:
         user_group_phone: Telèfon de l'organització
   booleans:
     'false': 'No'
-    'true': 'Sí'
+    'true': Sí
   carrierwave:
     errors:
       image_too_big: La imatge és massa gran
@@ -126,6 +127,14 @@ ca:
         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
+    events:
+      email_event:
+        email_greeting: Hola %{user_name},
+        email_intro: 'Hi ha hagut una actualització a "%{resource_title}". Es pot veure en aquesta pàgina:'
+        email_outro: Has rebut aquesta notificació perquè que segueixes "%{resource_title}". El pots deixar de seguir al link anterior.
+        email_subject: Una actualització a %{resource_title}
+      notification_event:
+        notification_title: S'ha produït un esdeveniment a <a href="%{resource_path}">%{resource_title}</a>.
     export_mailer:
       export:
         ready: S'adjunta una versió comprimida de l'exportació.
@@ -152,26 +161,32 @@ ca:
         project: Projectes
         proposal: propostes
         result: Resultats
+    follows:
+      create:
+        button: Seguir
+        error: Hi ha hagut un error seguint aquest recurs.
+      destroy:
+        button: Deixar de seguir
+        error: Hi ha hagut un error deixar seguint aquest recurs.
     forms:
       current_file: Fitxer actual
       current_image: Imatge actual
       default_image: Imatge predeterminada
       errors:
         error: Hi ha un error en aquest camp.
+      remove_this_file: Eliminar aquest arxiu
     managed_users:
       expired_session: La sessió de suplantació actual ha caducat.
     menu:
       home: Inici
       more_information: Més informació
-      processes: Processos
     newsletter_mailer:
       newsletter:
         note: Has rebut aquest missatge perquè estàs subscrit a butlletins de notícies a %{organization_name}. Pots canviar la configuració a la teva <a href="%{link}">pàgina de notificacions</a>.
     notifications_settings:
       show:
-        comments_notifications: Vull rebre notificacions quan algú comenta a les meves publicacions.
+        email_on_notification: Vull rebre un correu electrònic cada vegada que rebi una notificació.
         newsletter_notifications: Vull rebre informació sobre activitat rellevant
-        replies_notifications: Vull rebre notificacions per correu electrònic quan algú respon als meus comentaris.
         update_notifications_settings: Guardar canvis
       update:
         error: Hi ha hagut un error en actualitzar la configuració de les notificacions.
@@ -184,43 +199,6 @@ ca:
     pages:
       index:
         title: Més informació
-    participatory_process_groups:
-      show:
-        group_participatory_processes: Processos per a %{group}
-        title: Grup de processos participatius
-    participatory_process_steps:
-      index:
-        process_steps: Fases del procés
-        title: Fases del procés participatiu
-    participatory_processes:
-      index:
-        title: Processos participatius
-      participatory_process_groups:
-        none: cap
-      scopes:
-        global: Àmbit global
-      show:
-        developer_group: Grup promotor
-        end_date: Data de finalització
-        local_area: Àrees municipals
-        participatory_scope: Àmbit participatiu
-        participatory_structure: Estructura participativa
-        scope: Àmbit
-        target: A qui va dirigit?
-      statistics:
-        answers_count: Respostes
-        comments_count: Comentaris
-        headline: Activitat
-        meetings_count: Trobades
-        orders_count: Vots
-        pages_count: Pàgines
-        processes_count: Processos
-        projects_count: Projectes
-        proposals_count: Propostes
-        results_count: Resultats
-        surveys_count: Enquestes
-        users_count: Participants
-        votes_count: Suports
     reported_mailer:
       hide:
         hello: Hola %{name},
@@ -236,8 +214,6 @@ ca:
       create:
         error: S'ha produït un error en denunciar. Torna-ho a intentar.
         success: La denúncia s'ha creat amb èxit i serà revisada per un administrador.
-    scopes:
-      global: Àmbit global
     shared:
       action_authorization_modal:
         incomplete:
@@ -293,6 +269,7 @@ ca:
           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
       invite_admin:
         subject: Has estat convidat a gestionar %{organization}
       invite_collaborator:
@@ -324,11 +301,13 @@ ca:
   layouts:
     decidim:
       cookie_warning:
-        description_html: "Aquest lloc web fa servir cookies pròpies i de tercers per millorar l’experiència de navegació, i oferir continguts i serveis d’interès.\nEn continuar la navegació entenem que s’accepta la nostra política de cookies. Per a més informació consulta %{link}."
+        description_html: |-
+          Aquest lloc web fa servir cookies pròpies i de tercers per millorar l’experiència de navegació, i oferir continguts i serveis d’interès.
+          En continuar la navegació entenem que s’accepta la nostra política de cookies. Per a més informació consulta %{link}.
         link_label: aquí
         ok: Hi estic d'acord
       footer:
-        made_with_open_source: 'Web feta amb <a target="_blank" href="https://github.com/decidim/decidim">programari lliure</a>.'
+        made_with_open_source: Web feta amb <a target="_blank" href="https://github.com/decidim/decidim">programari lliure</a>.
       header:
         close_menu: Tancar menú
         navigation: Navegació
@@ -338,37 +317,13 @@ ca:
         close_session: Tanca la sessió
         description_html: Esteu suplantant l'usuari <b>%{user_name}</b>.
         expire_time_html: La vostra sessió caducarà en <b><span class="minutes">%{minutes}</span> minutes</b>.
-      participatory_process_groups:
-        participatory_process_group:
-          browse: Explorar
-      participatory_process_widgets:
-        show:
-          active_step: Fase activa
-          take_part: Participa
-      participatory_processes:
-        index:
-          promoted_processes: Processos destacats
-        no_processes_yet:
-          no_processes_yet: Encara no hi ha cap procés participatiu!
-        order_by_processes:
-          processes:
-            one: "%{count} procés"
-            other: "%{count} processos"
-        participatory_process:
-          active_step: 'Fase actual:'
-          take_part: Participa
-        promoted_process:
-          active_step: 'Fase actual:'
-          more_info: Més informació
-          take_part: Participa
-      process_header:
-        process_menu_item: El procés
-        unfold: Desplegar
-      process_header_steps:
-        step: Fase %{current} de %{total}
-        view_steps: Veure les fases
+      notifications_dashboard:
+        mark_all_as_read: Marca tots com a llegits
+        no_notifications: Encara no hi ha notificacions.
+        title: Notificacions
       user_menu:
         admin_dashboard: Tauler d'administració
+        notifications: Notificacions
         profile: El meu compte
         sign_out: Surt
       user_profile:

data/config/locales/en.yml

@@ -127,6 +127,14 @@ en:
         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
+    events:
+      email_event:
+        email_greeting: Hello %{user_name},
+        email_intro: 'There has been an update to "%{resource_title}". You can see it from this page:'
+        email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
+        email_subject: An update to %{resource_title}
+      notification_event:
+        notification_title: An event occured to <a href="%{resource_path}">%{resource_title}</a>.
     export_mailer:
       export:
         ready: Please find attached a zipped version of your export.
@@ -153,26 +161,32 @@ en:
         project: Projects
         proposal: Proposals
         result: Results
+    follows:
+      create:
+        button: Follow
+        error: There has been an error following this resource.
+      destroy:
+        button: Stop following
+        error: There has been an error unfollowing this resource.
     forms:
       current_file: Current file
       current_image: Current image
       default_image: Default image
       errors:
         error: There's an error in this field.
+      remove_this_file: Remove this file
     managed_users:
       expired_session: The current impersonation session has expired.
     menu:
       home: Home
       more_information: More information
-      processes: Processes
     newsletter_mailer:
       newsletter:
         note: You received this email because you're subscribed to newsletters on %{organization_name}. You can change your settings on your <a href="%{link}">notifications page</a>.
     notifications_settings:
       show:
-        comments_notifications: I want to receive email notifications when someone comments in my publications.
+        email_on_notification: I want to receive an email every time I receive a notification.
         newsletter_notifications: I want to receive information about relevant activity
-        replies_notifications: I want to receive email notifications when someone replies my comments.
         update_notifications_settings: Save changes
       update:
         error: There's been an error updating your notifications settings.
@@ -185,43 +199,6 @@ en:
     pages:
       index:
         title: More information
-    participatory_process_groups:
-      show:
-        group_participatory_processes: Processes for %{group}
-        title: Title
-    participatory_process_steps:
-      index:
-        process_steps: Process steps
-        title: Participatory process steps
-    participatory_processes:
-      index:
-        title: Participatory processes
-      participatory_process_groups:
-        none: None
-      scopes:
-        global: Global scope
-      show:
-        developer_group: Developer group
-        end_date: End date
-        local_area: Local area
-        participatory_scope: Participatory scope
-        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},
@@ -237,8 +214,6 @@ en:
       create:
         error: An error ocurred while creating the report. Please, try it again.
         success: The report has been created successfully and it will be reviewed by an admin.
-    scopes:
-      global: Global scope
     shared:
       action_authorization_modal:
         incomplete:
@@ -294,6 +269,7 @@ en:
           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
       invite_admin:
         subject: You've been invited to manage %{organization}
       invite_collaborator:
@@ -339,37 +315,13 @@ en:
         close_session: Close session
         description_html: You are impersonating the user <b>%{user_name}</b>.
         expire_time_html: Your session will expire in <b><span class="minutes">%{minutes}</span> minutes</b>.
-      participatory_process_groups:
-        participatory_process_group:
-          browse: Browse
-      participatory_process_widgets:
-        show:
-          active_step: Active step
-          take_part: Take part
-      participatory_processes:
-        index:
-          promoted_processes: Highlighted processes
-        no_processes_yet:
-          no_processes_yet: No participatory processes yet!
-        order_by_processes:
-          processes:
-            one: "%{count} process"
-            other: "%{count} processes"
-        participatory_process:
-          active_step: 'Current step:'
-          take_part: Take part
-        promoted_process:
-          active_step: 'Current step:'
-          more_info: More info
-          take_part: Take part
-      process_header:
-        process_menu_item: The process
-        unfold: Unfold
-      process_header_steps:
-        step: Step %{current} of %{total}
-        view_steps: View steps
+      notifications_dashboard:
+        mark_all_as_read: Mark all as read
+        no_notifications: No notifications yet.
+        title: Notifications
       user_menu:
         admin_dashboard: Admin dashboard
+        notifications: Notifications
         profile: My account
         sign_out: Sign out
       user_profile: