decidim-conferences 0.21.0 → 0.23.2

data/app/models/decidim/conference.rb

@@ -10,13 +10,17 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
-    include Decidim::Scopable
+    include Decidim::ScopableParticipatorySpace
     include Decidim::Followable
     include Decidim::HasReference
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::Searchable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :slogan, :short_description, :description, :objectives, :registration_terms
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -51,9 +55,16 @@ module Decidim
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::Conference.slug_format }
 
+    validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
+
+    validates_upload :banner_image
     mount_uploader :banner_image, Decidim::HomepageImageUploader
+
+    validates_upload :main_logo
     mount_uploader :main_logo, Decidim::Conferences::DiplomaUploader
+
+    validates_upload :signature
     mount_uploader :signature, Decidim::Conferences::DiplomaUploader
 
     searchable_fields({
@@ -124,6 +135,10 @@ module Decidim
       roles.where(role: role_name)
     end
 
+    def attachment_context
+      :admin
+    end
+
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     ransacker :title do |parent|
       Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))

data/app/models/decidim/conference_speaker.rb

@@ -6,16 +6,19 @@ module Decidim
   class ConferenceSpeaker < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :position, :affiliation, :short_bio
 
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
     belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
     has_many :conference_speaker_conference_meetings, dependent: :destroy
     has_many :conference_meetings, through: :conference_speaker_conference_meetings, foreign_key: "conference_speaker_id", class_name: "Decidim::ConferenceMeeting"
 
-    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
-
     default_scope { order(full_name: :asc, created_at: :asc) }
 
+    validates_avatar
     mount_uploader :avatar, Decidim::AvatarUploader
 
     delegate :organization, to: :conference

data/app/models/decidim/conferences/media_link.rb

@@ -6,6 +6,9 @@ module Decidim
     class MediaLink < ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
 

data/app/models/decidim/conferences/partner.rb

@@ -6,15 +6,19 @@ module Decidim
     class Partner < ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::HasUploadValidations
 
       TYPES = %w(main_promotor collaborator).freeze
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
-      validates :logo, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
 
       default_scope { order(partner_type: :desc, weight: :asc) }
+
+      validates_avatar :logo
       mount_uploader :logo, Decidim::Conferences::PartnerLogoUploader
 
+      delegate :organization, to: :conference
+
       alias participatory_space conference
 
       def self.log_presenter_class_for(_log)

data/app/models/decidim/conferences/registration_type.rb

@@ -7,6 +7,9 @@ module Decidim
       include Decidim::Publicable
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       has_many :conference_meeting_registration_types, dependent: :destroy

data/app/presenters/decidim/conferences/admin_log/{conferences_presenter.rb → conference_presenter.rb}

@@ -48,8 +48,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "unpublish" || super
+        def diff_actions
+          super + %w(unpublish)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/conference_registration_presenter.rb

@@ -34,8 +34,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/conference_speaker_presenter.rb

@@ -43,8 +43,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/{conferences_user_role_presenter.rb → conference_user_role_presenter.rb}

@@ -44,8 +44,8 @@ module Decidim
           ).changeset
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/media_link_presenter.rb

@@ -36,8 +36,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/partner_presenter.rb

@@ -38,8 +38,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/registration_type_presenter.rb

@@ -36,8 +36,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         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 %>

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

@@ -13,17 +13,17 @@ edit_link(
   <div class="columns mediumlarge-12 conference-media">
     <% if @media_links.any? %>
       <section>
-        <h1 class="section-heading"><%= t("media.index.title", scope: "decidim") %></h1>
+        <h3 class="section-heading"><%= t("media.index.title", scope: "decidim") %></h3>
         <p><%= t("media.index.description", scope: "decidim") %></p>
       </section>
       <hr class="reset mt-none mb-s">
-      <section class="media-links">
+      <div class="media-links">
         <ul class="list-reset">
           <% @media_links.each do |media_link| %>
             <%= cell "decidim/conferences/media_link", media_link %>
           <% end %>
         </ul>
-      </section>
+      </div>
       <hr class="reset mt-none mb-s">
     <% end %>
     <%= attachments_for_conference current_participatory_space %>

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

@@ -23,7 +23,7 @@ edit_link(
           <%= cell "decidim/conferences/registration_type", registration_type, allowed: allowed_to?(:join, :conference, conference: current_participatory_space) %>
         <% end %>
       <% else %>
-        No registrations
+        <%= t("registration_types.index.no_registrations", scope: "decidim.conferences") %>
       <% end %>
     </section>
   </div>

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

@@ -6,14 +6,14 @@
         <h1 class="text-highlight hero-heading mb-none">
           <%= translated_attribute(current_participatory_space.title) %>
         </h1>
-        <h3 class="text-highlight">
+        <h2 class="text-highlight">
           <% if current_participatory_space.hashtag.present? %>
             <span class="process-header__hashtag card__link">
               <%= link_to "##{current_participatory_space.hashtag}", "https://twitter.com/hashtag/#{current_participatory_space.hashtag}", target: "_blank" %>
             </span>
           <% end %>
           <%= translated_attribute(current_participatory_space.slogan) %>
-        </h3>
+        </h2>
       </div>
     </div>
     <div class="row">
@@ -26,17 +26,13 @@
         </div>
         <% if current_participatory_space.registrations_enabled? %>
           <div class="column medium-3 end">
-            <%= 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-3 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 light hollow expanded" %>
             </div>
           <% end %>
         <% end %>