decidim-conferences 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99821cad74f86b23d2243a063e9c5f347aff5a1c8e284e8c8c0cc250c726da59
-  data.tar.gz: 681fd61ed392ae35e2f580fac6e6ff49e6fad73f90e2e87585a5e343042ef73b
+  metadata.gz: e927274e7911f8f49d468aa0d0102712d9271549757ff974f97b65dee4f12800
+  data.tar.gz: f0a57fd51a3fcec014bd6dbb1ddedf1a646d7bd25a9d726248e1de5f254c9914
 SHA512:
-  metadata.gz: dd9b00dae882f1a7e7aba6aced3e95ae4812abc5e7f81e2abf3f10cfa425a26cea3b6fef3c706ceae59cca30008e86c1fc505130b963668c888b13eecf8af285
-  data.tar.gz: 4ad9c3cfa57db46f38e22da1310323249f955d6c2f95b467ba62cbc184a7db7ff6b74e4bd60eec1bc75346f05bbf744674d2e8dbc07b2c1559e9d93559d78c84
+  metadata.gz: 1fe6c3aea3cd56b87ff3771cb04965d3473f70553fbbef087dcacc7adbe097c3c7fa8501a79b390c29d81ae7781b3b1e3f511e9582ff08cf508d22ff1ac65455
+  data.tar.gz: b3f935e675ed4cc6ab24b81243b4b157ca238f57a0eb7674db1e1e44dcc55aa789f341454cb0278a81acae1aef1476024651aa613d63e8a25e48c0b46c13c64c

data/app/assets/images/decidim/conferences/conference.svg

@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8">
-  <path d="M2.91-.03a1 1 0 0 0-.13.03 1 1 0 0 0-.78 1v2a1 1 0 1 0 2 0v-2a1 1 0 0 0-1.09-1.03zm-2.56 2.03a.5.5 0 0 0-.34.5v.5c0 1.48 1.09 2.69 2.5 2.94v1.06h-.5c-.55 0-1 .45-1 1h4.01c0-.55-.45-1-1-1h-.5v-1.06c1.41-.24 2.5-1.46 2.5-2.94v-.5a.5.5 0 1 0-1 0v.5c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2v-.5a.5.5 0 0 0-.59-.5.5.5 0 0 0-.06 0z" transform="translate(1)"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M2.91-.03a1 1 0 0 0-.13.03 1 1 0 0 0-.78 1v2a1 1 0 1 0 2 0v-2a1 1 0 0 0-1.09-1.03zm-2.56 2.03a.5.5 0 0 0-.34.5v.5c0 1.48 1.09 2.69 2.5 2.94v1.06h-.5c-.55 0-1 .45-1 1h4.01c0-.55-.45-1-1-1h-.5v-1.06c1.41-.24 2.5-1.46 2.5-2.94v-.5a.5.5 0 1 0-1 0v.5c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2v-.5a.5.5 0 0 0-.59-.5.5.5 0 0 0-.06 0z" transform="translate(1)"/></svg>

data/app/cells/decidim/conferences/conference_m/footer.erb

@@ -3,7 +3,7 @@
     <%= link_to(
       t(model.cta_button_text_key, scope: "layouts.decidim.conferences.conference"),
       resource_path,
-      class: "card__button button button--sc secondary light small"
+      class: "card__button button button--sc small"
     ) %>
   </div>
 </div>

data/app/cells/decidim/conferences/conference_speaker/show.erb

@@ -1,7 +1,7 @@
 <div class="column conference-speaker js-conference">
   <div class="speaker-img-wrapper">
     <div class="speaker-img">
-      <%= image_tag avatar.url %>
+      <%= image_tag avatar.url, alt: "speaker-image" %>
     </div>
   </div>
   <div class="speaker-data">
@@ -26,7 +26,7 @@
       <div class="column medium-6">
         <div class="speaker-img-wrapper">
           <div class="speaker-img">
-            <%= image_tag avatar.url %>
+            <%= image_tag avatar.url, alt: "speaker-image" %>
           </div>
         </div>
         <div class="speaker-data">

data/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb

@@ -6,17 +6,13 @@
         large-up-4 card-grid">
         <% highlighted_conferences.each do |conference| %>
           <div class="column">
-            <article class="card card--conference card--mini">
-              <%= link_to decidim_conferences.conference_path(conference), class: "card__link" do %>
-                <div class="card__image-top"
-                  style="background-image:url(<%= conference.hero_image.url %>)"></div>
-              <% end %>
+            <%= link_to decidim_conferences.conference_path(conference), class: "card card--conference card--mini" do %>
+              <div aria-hidden="true" class="card__image-top"
+                style="background-image:url(<%= conference.hero_image.url %>)"></div>
               <div class="card__content">
-                <%= link_to decidim_conferences.conference_path(conference), class: "card__link" do %>
-                  <h4 class="card__title"><%= translated_attribute conference.title %></h4>
-                <% end %>
+                <span class="card__title card__link"><%= translated_attribute conference.title %></span>
               </div>
-            </article>
+            <% end %>
           </div>
         <% end %>
       </div>
@@ -25,7 +21,10 @@
   <div class="row" id="see-all-conferences">
     <div class="columns small-centered small-12
       smallmedium-8 medium-6 large-4">
-      <%= link_to t("see_all_conferences", scope: i18n_scope), decidim_conferences.conferences_path, class: "button expanded hollow button--sc home-section__cta" %>
+      <%= link_to t("see_all_conferences", scope: i18n_scope),
+                  decidim_conferences.conferences_path,
+                  class: "button expanded hollow button--sc home-section__cta",
+                  title: t("conferences_button_title", scope: i18n_scope) %>
     </div>
   </div>
 </section>

data/app/cells/decidim/conferences/media_link/show.erb

@@ -1,9 +1,9 @@
 <li>
-  <%= icon "external-link" %>
+  <%= icon "external-link", role: "img", "aria-hidden": true %>
   <div>
     <%= link_to model.link, target: "_blank" do %>
       <strong><%= translated_attribute(model.title) %> </strong>
     <% end %>
-    <div class="text-small"><%= l(model.date, format: :decidim_short_with_month_name_short) %> · <%= model.link %></small>
+    <div class="text-small"><%= l(model.date, format: :decidim_short_with_month_name_short) %> · <%= model.link %></div>
   </div>
 </li>

data/app/cells/decidim/conferences/partner_cell.rb

@@ -19,7 +19,7 @@ module Decidim
       def logo
         return unless model.logo.presence
 
-        "<div class='card p-m flex--cc'> #{image_tag model.logo.medium.url} </div>"
+        "<div class='card p-m flex--cc'> #{image_tag model.logo.medium.url, alt: "logo"} </div>"
       end
     end
   end

data/app/cells/decidim/conferences/photo/show.erb

@@ -1,15 +1,13 @@
 <div class="column">
-  <article class="card" data-open="media-picture-<%= index %>">
+  <div class="card" data-open="media-picture-<%= index %>">
     <div class="picture__content">
       <%= image_thumb %>
-      <h5 class="card__title">
-        <strong><%= title %></strong>
-      </h5>
+        <strong class="card__title"><%= title %></strong>
       <div class="text-small">
         <%= short_description %>
       </div>
     </div>
-  </article>
+  </div>
   <div id="media-picture-<%= index %>" class="reveal picture__modal" data-reveal>
     <div class="reveal__header">
       <h3 class="reveal__title"><%= t("conferences.photo.show.photo", scope: "decidim") %></h3>

data/app/cells/decidim/conferences/photo_cell.rb

@@ -18,11 +18,11 @@ module Decidim
       end
 
       def image_thumb
-        image_tag model.thumbnail_url
+        image_tag model.thumbnail_url, alt: t("alt", scope: "decidim.conferences.photo.image.attributes")
       end
 
       def image_big
-        image_tag model.big_url
+        image_tag model.big_url, alt: t("alt", scope: "decidim.conferences.photo.image.attributes")
       end
 
       def title

data/app/cells/decidim/conferences/photos_list/show.erb

@@ -1,5 +1,5 @@
 <div class="section images">
-  <h4 class="section-heading"><%= t("conferences.photos_list.show.related_photos", scope: "decidim") %></h4>
+  <h3 class="section-heading"><%= t("conferences.photos_list.show.related_photos", scope: "decidim") %></h3>
   <div class="row small-up-1 smallmedium-up-2 card-grid">
     <% model.each_with_index do |photo, index| %>
       <%= cell "decidim/conferences/photo", photo, index: index %>

data/app/cells/decidim/conferences/registration_type/join_conference.erb

@@ -13,7 +13,7 @@
   <% else %>
     <%= render :registration_confirm %>
     <% if allowed? %>
-      <%= button_to i18n_join_text, "",
+      <%= button_to i18n_join_text, "#",
           class: button_classes,
           disabled: !conference.has_available_slots? || conference.has_registration_for?(current_user),
           style: "margin-bottom: 0;",

data/app/commands/decidim/conferences/admin/create_conference_admin.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new conference
       # admin in the system.
-      class CreateConferenceAdmin < Rectify::Command
+      class CreateConferenceAdmin < NotifyRoleAssignedToConference
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -57,6 +57,7 @@ module Decidim
               conference: @conference
             )
           end
+          send_notification user
         end
 
         def existing_user

data/app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # A command to notify users when a role is assigned for a Conference
+      class NotifyRoleAssignedToConference < Rectify::Command
+        def send_notification(user)
+          Decidim::EventsManager.publish(
+            event: "decidim.events.conferences.role_assigned",
+            event_class: Decidim::Conferences::ConferenceRoleAssignedEvent,
+            resource: form.current_participatory_space,
+            affected_users: [user],
+            extra: {
+              role: form.role
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/conferences/admin/update_conference_admin.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updated a participatory
       # process admin in the system.
-      class UpdateConferenceAdmin < Rectify::Command
+      class UpdateConferenceAdmin < NotifyRoleAssignedToConference
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -45,6 +45,7 @@ module Decidim
             { role: form.role },
             log_info
           )
+          send_notification user_role.user
         end
       end
     end

data/app/events/decidim/conferences/conference_role_assigned_event.rb

@@ -0,0 +1,30 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Conferences
+    class ConferenceRoleAssignedEvent < Decidim::Events::SimpleEvent
+      include Decidim::Events::NotificationEvent
+      include Decidim::Events::AuthorEvent
+
+      def notification_title
+        I18n.t("notification_title", i18n_options).html_safe
+      end
+
+      def i18n_role
+        I18n.t(extra["role"], "decidim.admin.models.conference_user_role.roles", default: extra["role"])
+      end
+
+      def i18n_options
+        {
+          resource_path: resource_path,
+          resource_title: resource_title,
+          resource_url: resource_url,
+          scope: event_name,
+          participatory_space_title: participatory_space_title,
+          participatory_space_url: participatory_space_url,
+          role: i18n_role
+        }
+      end
+    end
+  end
+end

data/app/jobs/decidim/conferences/admin/send_conference_diploma_job.rb

@@ -11,7 +11,7 @@ module Decidim
           return unless confirmed_registrations.any?
 
           confirmed_registrations.each do |registration_confirmed|
-            SendConferenceDiplomaMailer.diploma(conference, registration_confirmed.user).deliver_now
+            SendConferenceDiplomaMailer.diploma(conference, registration_confirmed.user).deliver_later
           end
         end
       end

data/app/presenters/decidim/conferences/conference_stats_presenter.rb

@@ -38,7 +38,7 @@ module Decidim
 
       def render_stats_data(component_manifest, name, data, index)
         safe_join([
-                    index.zero? ? manifest_icon(component_manifest) : " /&nbsp".html_safe,
+                    index.zero? ? manifest_icon(component_manifest, role: "img", "aria-hidden": true) : " /&nbsp".html_safe,
                     content_tag(:span, "#{number_with_delimiter(data)} " + I18n.t(name, scope: "decidim.conferences.statistics"),
                                 class: "#{name} process_stats-text")
                   ])

data/app/views/decidim/conferences/_order_by_conferences.html.erb

@@ -1,3 +1,3 @@
 <div class="row collapse order-by">
-  <h2 class="order-by__text section-heading"><%= t("conferences.order_by_conferences.conferences", scope: "layouts.decidim", count: collection.count) %></h2>
+  <h3 class="order-by__text section-heading"><%= t("conferences.order_by_conferences.conferences", scope: "layouts.decidim", count: collection.count) %></h3>
 </div>

data/app/views/decidim/conferences/admin/conference_invites/index.html.erb

@@ -26,8 +26,8 @@
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <%= hidden_field_tag :state, @state %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>

data/app/views/decidim/conferences/admin/conference_speakers/index.html.erb

@@ -5,8 +5,8 @@
         <div class="input-group">
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>

data/app/views/decidim/conferences/admin/conferences/index.html.erb

@@ -23,7 +23,7 @@
               <td>
                 <% if conference.promoted? %>
                   <span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.conference.fields.promoted", scope: "decidim.admin") %>">
-                    <%= icon "star" %>
+                    <%= icon "star", aria_label: t("models.conference.fields.promoted", scope: "decidim.admin"), role: "img" %>
                   </span>
                 <% end %>
                 <% if allowed_to? :update, :conference, conference: conference %>

data/app/views/decidim/conferences/conference_program/_program_item.html.erb

@@ -8,10 +8,12 @@
           <ul class="tabs buttons__row" id="conference-row-<%= seed %>-tabs" data-tabs>
             <% categories.each_with_index do |category, i| %>
               <li class="tabs-title<%= " is-active" if i == 0 %>">
-                <!-- Wrap button in an anchor to make foundation tabs work -->
-                <a href="#conference-row-<%= seed %>-tab<%= i %>">
-                  <button class="button button--shadow secondary tiny light"><%= category.present? ? translated_attribute(category.name) : "other" %></button>
-                </a>
+                <!-- Wrap the anchor inside a div to keep correct button styling -->
+                <div>
+                  <a href="#conference-row-<%= seed %>-tab<%= i %>" class="button button--shadow tiny hollow">
+                    <%= category.present? ? translated_attribute(category.name) : "other" %>
+                  </a>
+                </div>
               </li>
             <% end %>
           </ul>

data/app/views/decidim/conferences/conference_program/show.html.erb

@@ -12,7 +12,7 @@ end
 <% add_decidim_meta_tags(title: t("conference_program.index.title", scope: "decidim")) %>
 <div class="section row">
   <div class="columns mediumlarge-12">
-    <h1 class="section-heading"><%= t(".program") %></h1>
+    <h3 class="section-heading"><%= t(".program") %></h3>
     <div class="conference-programme">
       <div class="row collapse programme-selector">
         <div class="column medium-2">
@@ -28,12 +28,12 @@ end
               data-tabs>
               <% meeting_days.each_with_index do |day, i| %>
                 <li class="tabs-title <%= "is-active" if i == 0 %>">
-                  <!-- Wrap button in an anchor to make foundation tabs work -->
-                  <a href="#conference-day-tab-<%= i %>">
-                    <button class="button button--nomargin button--sc secondary light">
+                  <!-- Wrap the anchor inside a div to keep correct button styling -->
+                  <div>
+                    <a href="#conference-day-tab-<%= i %>" class="button button--nomargin button--sc hollow">
                       <%= l day, format: :decidim_with_day_and_month_name %>
-                    </button>
-                  </a>
+                    </a>
+                  </div>
                 </li>
               <% end %>
             </ul>

data/app/views/decidim/conferences/conference_speakers/index.html.erb

@@ -11,7 +11,7 @@ edit_link(
 
 <section class="" id="conference_speakers-grid">
   <div class="row column">
-    <h2 class="section-heading"><%= t(".speakers") %></h2>
+    <h3 class="section-heading"><%= t(".speakers") %></h3>
     <div class="row small-up-2 medium-up-5 mb-l">
       <%= render(collection) %>
     </div>

data/app/views/decidim/conferences/conferences/_partners.html.erb

@@ -3,7 +3,7 @@
     <% conference.partners.group_by(&:partner_type).each do |partner_type, partners| %>
       <hr class="reset mt-none mb-m">
       <section class="section">
-        <h1 class="section-heading"><%= t(".#{partner_type.pluralize}") %></h1>
+        <h3 class="section-heading"><%= t(".#{partner_type.pluralize}") %></h3>
         <div class="row small-up-2 medium-up-3 card-grid">
           <% partners.each do |partner| %>
             <%= cell "decidim/conferences/partner", partner %>

data/app/views/decidim/conferences/conferences/_promoted_conference.html.erb

@@ -1,4 +1,4 @@
-<article class="card card--full card--process">
+<div class="card card--full card--process">
   <div class="row collapse card--process__row">
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card__content">
@@ -6,7 +6,7 @@
           <h2 class="card__title"><%= translated_attribute promoted_conference.title %></h2>
         <% end %>
         <%= decidim_sanitize html_truncate(translated_attribute(promoted_conference.short_description), length: 630, separator: "...") %>
-        <%= link_to conference_path(promoted_conference), class: "button secondary small hollow card__button" do %>
+        <%= link_to conference_path(promoted_conference), class: "button small hollow card__button" do %>
           <%= t("conferences.promoted_conference.more_info", scope: "layouts.decidim") %>
         <% end %>
       </div>
@@ -24,4 +24,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

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

@@ -19,28 +19,24 @@ edit_link(
 <div class="row">
   <div class="columns mediumlarge-12">
     <section class="section">
-      <h4 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h4>
+      <h3 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h3>
       <%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
     </section>
     <hr class="reset mt-none mb-m">
     <section class="section">
-      <h4 class="section-heading"><%= t("conferences.show.details", scope: "decidim") %></h4>
+      <h3 class="section-heading"><%= t("conferences.show.details", scope: "decidim") %></h3>
       <%= decidim_sanitize translated_attribute(current_participatory_space.description) %>
       <div class="row mt-l mb-l">
         <div class="column medium-9 medium-centered">
           <% if current_participatory_space.registrations_enabled? %>
             <div class="column medium-6">
-              <%= link_to decidim_conferences.conference_registration_types_path(current_participatory_space) do %>
-                <button type="button" class="button button--sc light expanded"><%= t(".register") %></button>
-              <% end %>
+              <%= link_to t(".register"), decidim_conferences.conference_registration_types_path(current_participatory_space), class:"button button--sc light expanded" %>
             </div>
           <% end %>
           <% current_participatory_space.components.where(manifest_name: "meetings").each do |component_meeting| %>
             <% if component_meeting.published? || component_meeting == self.try(:current_component) %>
               <div class="column medium-6 end">
-                <%= link_to decidim_conferences.conference_conference_program_path(current_participatory_space, id: component_meeting.id) do %>
-                  <button type="button" class="button button--sc secondary light expanded"><%= translated_attribute(component_meeting.name) %></button>
-                <% end %>
+                <%= link_to translated_attribute(component_meeting.name), decidim_conferences.conference_conference_program_path(current_participatory_space, id: component_meeting.id), class:"button button--sc secondary light expanded" %>
               </div>
             <% end %>
           <% end %>
@@ -55,15 +51,13 @@ edit_link(
     <% if current_participatory_space.registrations_enabled? %>
       <hr class="reset mt-none mb-m">
       <section class="section">
-        <h4 class="section-heading"><%= t(".register") %></h4>
+        <h3 class="section-heading"><%= t(".register") %></h3>
         <% if current_user.present? %>
           <div class="card p-m text-center">
             <p><%= t(".login_as", name: current_user.name, email: current_user.email ) %></p>
             <p><%= t(".make_conference_registration") %></p>
             <div class="medium-3" style="margin: 0 auto;">
-              <%= link_to decidim_conferences.conference_registration_types_path(current_participatory_space) do %>
-                <button type="button" class="button button--sc light expanded"><%= t(".register") %></button>
-              <% end %>
+              <%= link_to t(".register"), decidim_conferences.conference_registration_types_path(current_participatory_space), class:"button button--sc light expanded" %>
             </div>
           </div>
         <% else %>
@@ -76,7 +70,7 @@ edit_link(
 
     <% unless translated_attribute(current_participatory_space.objectives).blank? %>
       <section class="section">
-        <h4 class="section-heading"><%= t("conferences.show.objectives", scope: "decidim") %></h4>
+        <h3 class="section-heading"><%= t("conferences.show.objectives", scope: "decidim") %></h3>
         <%= decidim_sanitize translated_attribute(current_participatory_space.objectives) %>
       </section>
     <% end %>