decidim 0.5.1 → 0.6.0

data/decidim-meetings/app/views/decidim/meetings/admin/registrations/_form.html.erb

@@ -0,0 +1,33 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= title %>
+      <span class="exports dropdown tiny button button--simple button--title" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></span>
+      <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
+        <ul class="vertical menu add-features">
+          <% %w{csv json}.each do |format| %>
+            <li class="exports--format--<%= format %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{current_feature.manifest.name}.admin.exports.registrations"), export_format: format.upcase), export_meeting_registrations_path(meeting_id: meeting, format: format) %></li>
+          <% end %>
+        </ul>
+      </div>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.check_box :registrations_enabled %>
+    </div>
+
+    <div class="row column">
+      <p><%= t(".registrations_count", count: meeting.registrations.count) %></p>
+      <%= form.number_field :available_slots %>
+      <p class="help-text"><%= t(".available_slots_help") %></p>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :editor, :registration_terms %>
+    </div>
+  </div>
+</div>
+
+<%= javascript_include_tag "decidim/meetings/admin/registrations_form" %>

data/decidim-meetings/app/views/decidim/meetings/admin/registrations/edit.html.erb

@@ -0,0 +1,8 @@
+<%=  decidim_form_for(@form, url: meeting_registrations_path, html: { class: "form edit_meeting_registrations" })  do |f| %>
+  <%= render partial: 'form', object: f %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".save") %>
+  </div>
+<% end %>
+

data/decidim-meetings/app/views/decidim/meetings/meetings/_filters.html.erb

@@ -16,8 +16,8 @@
     <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
   <% end %>
 
-  <% if current_participatory_process.has_subscopes? %>
-    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope, include_root: true), multiple: true %>
+  <% if current_participatory_space.has_subscopes? %>
+    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope, include_root: true), multiple: true %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/decidim-meetings/app/views/decidim/meetings/meetings/_registration_confirm.html.erb

@@ -0,0 +1,15 @@
+<div class="reveal" data-reveal id="meeting-registration-confirm">
+  <div class="row">
+    <div class="columns medium-10 medium-offset-1 help-text">
+      <%== translated_attribute(meeting.registration_terms) %>
+    </div>
+  </div>
+  <div class="row">
+    <div class="columns medium-8 medium-offset-2">
+      <%= button_to t('.confirm'), meeting_registration_path(meeting), class: "button expanded" %>
+    </div>
+  </div>
+  <div class="text-center">
+    <button class="link" data-close><%= t('.cancel') %></button>
+  </div>
+</div>

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

@@ -20,7 +20,17 @@
         <div class="extra__time">
           <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
         </div>
-      </div>
+        <% if !meeting.closed? && meeting.registrations_enabled? %>
+          <% if meeting.has_registration_for? current_user %>
+            <%= action_authorized_button_to :leave, t('.going'), meeting_registration_path(meeting), method: :delete, class: "button expanded button--sc success" %>
+          <% else %>
+            <%= action_authorized_button_to :join, meeting.has_available_slots? ? t('.join') : t('.no_slots_available'), "", class: "button expanded button--sc", disabled: !meeting.has_available_slots?, data: { toggle: current_user.present? ? "meeting-registration-confirm" : "loginModal" } %>
+          <% end %>
+          <% if meeting.available_slots.positive? %>
+            <span><%= t(".remaining_slots", count: meeting.remaining_slots) %></span>
+          <% end %>
+        <% end %>
+        <%= render partial: "decidim/shared/follow_button", locals: { followable: meeting } %>
       </div>
       <% if meeting.closed? %>
         <div class="card card--secondary extra definition-data">
@@ -45,6 +55,7 @@
           </div>
         </div>
       <% end %>
+    </div>
     <%= feature_reference(meeting) %>
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for meeting_meeting_widget_url(meeting, format: :js) %>
@@ -66,6 +77,9 @@
   </div>
 </div>
 <%= attachments_for meeting %>
+<%= comments_for meeting %>
+
+<%= render partial: "registration_confirm" %>
 
 <%= javascript_include_tag "decidim/proposals/social_share" %>
 <%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/decidim-meetings/app/views/decidim/meetings/registration_mailer/confirmation.html.erb

@@ -0,0 +1,3 @@
+<p><%= t(".confirmed_html", title: translated_attribute(@meeting.title), url: @locator.url) %></p>
+
+<p><%= t(".details") %></p>

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

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -20,7 +21,16 @@ ca:
   decidim:
     features:
       meetings:
+        actions:
+          join: Inscriu-t'hi
         name: Trobades
+        settings:
+          global:
+            announcement: Avís
+            comments_enabled: Comentaris habilitats
+          step:
+            announcement: Avís
+            comments_blocked: Comentaris bloquejats
     meetings:
       actions:
         attachments: Adjunts
@@ -30,8 +40,11 @@ ca:
         edit: Edita
         new: Nova
         preview: Previsualitzar
+        registrations: Inscripcions
         title: Accions
       admin:
+        exports:
+          registrations: Inscripcions
         meeting_closes:
           edit:
             close: Tancar
@@ -58,6 +71,47 @@ ca:
         models:
           meeting:
             name: Trobada
+        registrations:
+          edit:
+            save: Desa
+          form:
+            available_slots_help: Deixeu-lo a 0 si teniu espais il·limitats disponibles.
+            registrations_count:
+              one: Hi ha hagut 1 inscripció.
+              other: Hi ha hagut %{count} inscripcions.
+          update:
+            invalid: S'ha produït un problema en desar la configuració de la inscripció.
+            success: La configuració de les inscripcions de la trobada s'ha desat correctament.
+      events:
+        close_meeting_event:
+          email_intro: 'La trobada de "%{resource_title}" ha estat tancada. Podeu llegir les conclusions a la seva pàgina:'
+          email_outro: Has rebut aquesta notificació, perquè estàs seguint la trobada "%{resource_title}". Pots deixar-la de seguir des del seu enllaç.
+          email_subject: S'ha tancat la trobada "%{resource_title}"
+          notification_title: La trobada de <a href="%{resource_path}">%{resource_title}</a> s'ha tancat.
+        meeting_registrations_enabled:
+          email_intro: 'La trobada "%{resource_title}" ha activat inscripcions. Pots registrar-te a la seva pàgina:'
+          email_outro: Has rebut aquesta notificació perquè estàs seguint la trobada "%{resource_title}". Pots deixar-la de seguir a l'enllaç anterior.
+          email_subject: La trobada de "%{resource_title}" ha permès inscripcions.
+          notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> ha activat inscripcions.
+        meeting_registrations_over_percentage:
+          email_intro: La disponibilitat d'espais a la trobada "%{resource_title}" està per sobre del %{percentage}%.
+          email_outro: Has rebut aquesta notificació perquè ets un administrador de l'espai participatiu d'aquesta trobada.
+          email_subject: L'espai ocupat per la trobada "%{resource_title}" està per sobre del %{percentage}%
+          notification_title: L'espai ocupat per la trobada <a href="%{resource_path}">%{resource_title}</a> està per sobre del %{percentage}%.
+        upcoming_meeting_event:
+          email_intro: En menys de 48 hores s'iniciarà la trobada "%{resource_title}".
+          email_outro: Has rebut aquesta notificació perquè estàs seguint la trobada "%{resource_title}". Pots deixar-la de seguir a l'enllaç anterior.
+          email_subject: En menys de 48 hores s'iniciarà la trobada "%{resource_title}".
+          notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> començarà en menys de 48 hores.
+        update_meeting_event:
+          email_intro: 'La trobada de "%{resource_title}" ha estat actualitzada. Pots llegir-ne la nova versió a la seva pàgina:'
+          email_outro: Has rebut aquesta notificació perquè estàs seguint la trobada "%{resource_title}". Pots deixar-la de seguir des de l'enllaç anterior.
+          email_subject: La trobada "%{resource_title}" s'ha actualitzat
+          notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> ha estat actualitzada.
+      mailer:
+        registration_mailer:
+          confirmation:
+            subject: La teva inscripció a la trobada ha estat confirmada
       meetings:
         filters:
           category: Categoria
@@ -78,11 +132,20 @@ ca:
         meetings:
           no_meetings_warning: No hi ha trobades que coincideixin amb el criteri de cerca o no hi ha cap trobada programada.
           upcoming_meetings_warning: Actualment no hi ha trobades programades, però pots veure les anteriors trobades.
+        registration_confirm:
+          cancel: Cancel·lar
+          confirm: Confirmar
         show:
           attendees: Nombre d'assistents
           contributions: Nombre d'aportacions
+          going: Inscrit
+          join: Inscriu-te a la reunió
           meeting_report: Informe de la trobada
+          no_slots_available: No hi ha lloc disponible
           organizations: Llista d'organitzacions que han atès
+          remaining_slots:
+            one: 1 espai reservat restant
+            other: "%{count} inscripcions restants"
       models:
         meeting:
           fields:
@@ -92,6 +155,17 @@ ca:
             start_time: Data d'inici
             title: Títol
       read_more: "(Llegeix més)"
+      registration_mailer:
+        confirmation:
+          confirmed_html: La teva inscripció a la trobada <a href="%{url}">%{title}</a> ha estat confirmada.
+          details: A l'arxiu adjunt trobaràs els detalls de la reunió.
+      registrations:
+        create:
+          invalid: Hi ha hagut un problema en inscriure's a aquesta reunió.
+          success: T'has inscrit a la reunió amb èxit.
+        destroy:
+          invalid: Hi ha hagut un problema en sortir d'aquesta trobada.
+          success: Heu deixat la trobada amb èxit.
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Resultats relacionats:'

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

@@ -21,12 +21,16 @@ en:
   decidim:
     features:
       meetings:
+        actions:
+          join: Join
         name: Meetings
         settings:
           global:
             announcement: Announcement
+            comments_enabled: Comments enabled
           step:
             announcement: Announcement
+            comments_blocked: Comments blocked
     meetings:
       actions:
         attachments: Attachments
@@ -36,8 +40,11 @@ en:
         edit: Edit
         new: New
         preview: Preview
+        registrations: Registrations
         title: Actions
       admin:
+        exports:
+          registrations: Registrations
         meeting_closes:
           edit:
             close: Close
@@ -64,6 +71,48 @@ en:
         models:
           meeting:
             name: Meeting
+        registrations:
+          edit:
+            save: Save
+          form:
+            available_slots_help: Leave it to 0 if you have unlimited slots available.
+            registrations_count:
+              one: There has been 1 registration.
+              other: There has been %{count} registrations.
+              zero: There has not been registrations yet.
+          update:
+            invalid: There's been a problem saving the registration settings.
+            success: Meeting registrations settings successfully saved.
+      events:
+        close_meeting_event:
+          email_intro: 'The "%{resource_title}" meeting was closed. You can read the conclusions from its page:'
+          email_outro: You have received this notification because you are following the "%{resource_title}" meeting. You can unfollow it from the previous link.
+          email_subject: The "%{resource_title}" meeting was closed
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting was closed.
+        meeting_registrations_enabled:
+          email_intro: 'The "%{resource_title}" meeting has enabled registrations. You can register yourself on its page:'
+          email_outro: You have received this notification because you are following the "%{resource_title}" meeting. You can unfollow it from the previous link.
+          email_subject: The "%{resource_title}" meeting has enabled registrations.
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting has enabled registrations.
+        meeting_registrations_over_percentage:
+          email_intro: The "%{resource_title}" meeting occupied slots are over %{percentage}%.
+          email_outro: You have received this notification because you are an admin of the meeting's participatory space.
+          email_subject: The "%{resource_title}" meeting occupied slots are over %{percentage}%
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting occupied slots are over %{percentage}%.
+        upcoming_meeting_event:
+          email_intro: The "%{resource_title}" meeting will start in less than 48h.
+          email_outro: You have received this notification because you are following the "%{resource_title}" meeting. You can unfollow it from the previous link.
+          email_subject: The "%{resource_title}" meeting will start in less than 48h.
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting will start in less than 48h.
+        update_meeting_event:
+          email_intro: 'The "%{resource_title}" meeting was updated. You can read the new version from its page:'
+          email_outro: You have received this notification because you are following the "%{resource_title}" meeting. You can unfollow it from the previous link.
+          email_subject: The "%{resource_title}" meeting was updated
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting was updated.
+      mailer:
+        registration_mailer:
+          confirmation:
+            subject: Your meeting's registration has been confirmed
       meetings:
         filters:
           category: Category
@@ -82,15 +131,23 @@ en:
         index:
           view_meeting: View meeting
         meetings:
-          no_meetings_warning: No meetings match your search criteria or there isn't
-            any meeting scheduled.
-          upcoming_meetings_warning: Currently, there are no scheduled meetings, but
-            here you can find all the past meetings listed.
+          no_meetings_warning: No meetings match your search criteria or there isn't any meeting scheduled.
+          upcoming_meetings_warning: Currently, there are no scheduled meetings, but here you can find all the past meetings listed.
+        registration_confirm:
+          cancel: Cancel
+          confirm: Confirm
         show:
           attendees: Attendees count
           contributions: Contributions count
+          going: Going
+          join: Join meeting
           meeting_report: Meeting report
+          no_slots_available: No slots available
           organizations: Attending organizations
+          remaining_slots:
+            one: 1 slot remaining
+            other: "%{count} slots remaining"
+            zero: No slots remaining
       models:
         meeting:
           fields:
@@ -100,6 +157,17 @@ en:
             start_time: Start date
             title: Title
       read_more: "(read more)"
+      registration_mailer:
+        confirmation:
+          confirmed_html: Your registration for the meeting <a href="%{url}">%{title}</a> has been confirmed.
+          details: You will find the meeting's details in the attachment.
+      registrations:
+        create:
+          invalid: There's been a problem joining this meeting.
+          success: You have joined the meeting successfully.
+        destroy:
+          invalid: There's been a problem leaving this meeting.
+          success: You have left the meeting successfully.
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Related results:'

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

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -20,18 +21,30 @@ es:
   decidim:
     features:
       meetings:
+        actions:
+          join: Unirse
         name: Lista de encuentros
+        settings:
+          global:
+            announcement: Aviso
+            comments_enabled: Comentarios habilitados
+          step:
+            announcement: Aviso
+            comments_blocked: Comentarios bloqueados
     meetings:
       actions:
         attachments: Archivos adjuntos
         close: Cerrar
-        confirm_destroy: '¿Está seguro de que quiere eliminar este encuentro?'
+        confirm_destroy: "¿Está seguro de que quiere eliminar este encuentro?"
         destroy: Borrar
         edit: Editar
         new: Nuevo
         preview: Previsualizar
+        registrations: Inscripciones
         title: Acciones
       admin:
+        exports:
+          registrations: Inscripciones
         meeting_closes:
           edit:
             close: Cerrar
@@ -58,6 +71,47 @@ es:
         models:
           meeting:
             name: Encuentro
+        registrations:
+          edit:
+            save: Guardar
+          form:
+            available_slots_help: Déjalo a 0 si tiene inscripciones ilimitadas.
+            registrations_count:
+              one: Ha habido 1 inscripción.
+              other: Ha habido %{count} inscripciones.
+          update:
+            invalid: Se ha producido un problema al guardar la configuración de la inscripción.
+            success: Se han guardado correctamente las configuraciones de inscripciones de encuentros.
+      events:
+        close_meeting_event:
+          email_intro: 'Se ha cerrado la reunión "%{resource_title}". Puedes leer las conclusiones en su página:'
+          email_outro: Has recibido esta notificación porque sigues la reunión "%{resource_title}". Puedes dejar de seguirla en el enlace anterior.
+          email_subject: Se ha cerrado la reunión "%{resource_title}"
+          notification_title: La reunión <a href="%{resource_path}">%{resource_title}</a> ha sido cerrada.
+        meeting_registrations_enabled:
+          email_intro: 'La reunión "%{resource_title}" ha ha activado inscripciones. Puedes inscribirte en su página:'
+          email_outro: Ha recibido esta notificación porque usted sigue el encuentro "%{resource_title}". Puedes dejar de seguirlo en el enlace anterior.
+          email_subject: El encuentro "%{resource_title}" ha activado inscripciones.
+          notification_title: El encuentro <a href="%{resource_path}">%{resource_title}</a> ha activado inscripciones.
+        meeting_registrations_over_percentage:
+          email_intro: Las inscripciones ocupadas en "%{resource_title}" son %{percentage}%.
+          email_outro: Has recibido esta notificación porque eres es un administrador del espacio participativo de la reunión.
+          email_subject: Las inscripciones ocupadas de "%{resource_title}" son %{percentage}%
+          notification_title: Las inscripciones ocupadas de <a href="%{resource_path}">%{resource_title}</a> son %{percentage}%.
+        upcoming_meeting_event:
+          email_intro: La reunión "%{resource_title}" se iniciará en menos de 48h.
+          email_outro: Has recibido esta notificación porque sigues la reunión "%{resource_title}". Puedes dejar de seguirla en el enlace anterior.
+          email_subject: La reunión "%{resource_title}" comenzará en menos de 48h.
+          notification_title: La reunión de <a href="%{resource_path}">%{resource_title}</a> comenzará en menos de 48h.
+        update_meeting_event:
+          email_intro: 'La reunión "%{resource_title}" fue actualizada. Puedes leer la nueva versión en su página:'
+          email_outro: Has recibido esta notificación porque sigues la reunión "%{resource_title}". Puedes dejar de seguirla en el enlace anterior.
+          email_subject: La reunión "%{resource_title}" ha sido actualizada
+          notification_title: La reunión <a href="%{resource_path}">%{resource_title}</a> ha sido actualizada.
+      mailer:
+        registration_mailer:
+          confirmation:
+            subject: La inscripción a tu encuentro ha sido confirmada
       meetings:
         filters:
           category: Categoría
@@ -78,11 +132,20 @@ es:
         meetings:
           no_meetings_warning: No hay encuentros que coincidan con el criterio de búsqueda o no hay ningún encuentro programado.
           upcoming_meetings_warning: Actualmente no hay encuentros programados, pero puedes ver los encuentros anteriores.
+        registration_confirm:
+          cancel: Cancelar
+          confirm: Confirmar
         show:
           attendees: Número de asistentes
           contributions: Número de contribuciones
+          going: Yendo
+          join: Inscribirse al encuentro
           meeting_report: Informe del encuentro
+          no_slots_available: No hay espacio disponible
           organizations: Organizaciones que han asistido
+          remaining_slots:
+            one: 1 inscripción disponible
+            other: "%{count} inscripciones disponibles"
       models:
         meeting:
           fields:
@@ -92,6 +155,17 @@ es:
             start_time: Fecha de inicio
             title: Título
       read_more: "(leer más)"
+      registration_mailer:
+        confirmation:
+          confirmed_html: Se ha confirmado su inscripción para el encuentro <a href="%{url}">%{title}</a>.
+          details: Encontrarás detalles del encuentro en el archivo adjunto.
+      registrations:
+        create:
+          invalid: Ha habido un problema al unirse a este encuentro.
+          success: Te has inscrito al encuentro con éxito.
+        destroy:
+          invalid: Ha habido un problema al salir de esta encuentro.
+          success: Has salido del encuentro con éxito.
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Resultados relacionados:'