decidim-conferences 0.19.1 → 0.23.0

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>
@@ -63,6 +63,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @conference_speakers, theme: "decidim" %>
     </div>
   </div>
 </div>

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

@@ -60,6 +60,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @conference_user_roles, theme: "decidim" %>
     </div>
   </div>
 </div>

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

@@ -1,17 +1,18 @@
-<div class="card" id="conferences">
+<div class="card with-overflow" id="conferences">
   <div class="card-divider">
     <h2 class="card-title">
       <%= t "decidim.admin.titles.conferences" %>
       <%= link_to t("actions.new_conference", scope: "decidim.admin"), new_conference_path, class: "button tiny button--title" if allowed_to? :create, :conference %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
             <th><%= t("models.conference.fields.title", scope: "decidim.admin") %></th>
-            <th><%= t("models.conference.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= sort_link(query, :created_at, t("models.conference.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
             <th class="table-list__actions"><%= t("models.conference.fields.published", scope: "decidim.admin") %></th>
             <th></th>
           </tr>
@@ -22,11 +23,13 @@
               <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 %>
                   <%= link_to translated_attribute(conference.title), edit_conference_path(conference) %><br>
+                <% elsif allowed_to? :read, :component, conference: conference %>
+                  <%= link_to translated_attribute(conference.title), components_path(conference) %><br>
                 <% elsif allowed_to? :preview, :conference, conference: conference %>
                   <%= link_to translated_attribute(conference.title), decidim_conferences.conference_path(conference) %><br>
                 <% elsif allowed_to? :read, :moderation, conference: conference %>
@@ -60,6 +63,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @conferences, theme: "decidim" %>
     </div>
   </div>
 </div>

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

@@ -51,6 +51,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @partners, theme: "decidim" %>
     </div>
   </div>
 </div>

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

@@ -60,6 +60,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @registration_types, theme: "decidim" %>
     </div>
   </div>
 </div>

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_registration_mailer/confirmation.html.erb

@@ -3,7 +3,7 @@
 <p><%= t(".details_1", registration_type: translated_attribute(@registration_type.title), price: number_to_currency((@registration_type.price || 0), locale: I18n.locale, unit: Decidim.currency_unit)) %></p>
 
 <ul>
-  <% @registration_type.conference_meetings.each do |conference_meeting| %>
+  <% @registration_type.conference_meetings.order(:start_time).each do |conference_meeting| %>
     <li><%= present(conference_meeting).title %> </li>
   <% end %>
 </ul>

data/app/views/decidim/conferences/conference_registration_mailer/pending_validation.html.erb

@@ -3,7 +3,7 @@
 <p><%= t(".details", registration_type: translated_attribute(@registration_type.title), price: number_to_currency((@registration_type.price || 0), locale: I18n.locale, unit: Decidim.currency_unit)) %></p>
 
 <ul>
-  <% @registration_type.conference_meetings.each do |conference_meeting| %>
+  <% @registration_type.conference_meetings.order(:start_time).each do |conference_meeting| %>
     <li><%= present(conference_meeting).title %> </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 %>

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

@@ -16,11 +16,11 @@
       active: is_active_link?(decidim_conferences.conference_conference_speakers_path(current_participatory_space), :inclusive)
     } : nil
   ] + meeting_components.map do |component|
-    {
+    Decidim::Meetings::Meeting.visible_meeting_for(current_user).any? ? {
       name: translated_attribute(component.name),
       url: decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id),
       active: is_active_link?(decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id), :inclusive)
-    }
+    } : nil
   end + [
     current_participatory_space.partners.any? ? {
       name: t(".conference_partners_menu_item"),

data/app/views/layouts/decidim/admin/conference.html.erb

@@ -10,9 +10,9 @@
       <% if allowed_to? :read, :component, conference: current_participatory_space %>
         <li <% if is_active_link?(decidim_admin_conferences.components_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.conferences_submenu"), decidim_admin_conferences.components_path(current_participatory_space) %>
-          <ul>
+          <ul id="components-list">
             <% current_participatory_space.components.each do |component| %>
-              <% if component.manifest.admin_engine %>
+              <% if component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name) %>
                 <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_conferences.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_conferences.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
                   <%= link_to manage_component_path(component) do %>
                     <%= translated_attribute component.name %>

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

@@ -8,11 +8,10 @@
 <%= render "layouts/decidim/application" do %>
   <%= render partial: "layouts/decidim/conference_hero" %>
   <%= render partial: "layouts/decidim/conferences_nav" %>
-  <section>
-    <div class="wrapper">
-      <%= yield %>
-    </div>
-  </section>
+  <%= cell "decidim/translation_bar", current_organization %>
+  <div class="wrapper">
+    <%= yield %>
+  </div>
 
   <% if content_for? :expanded %>
     <div class="expanded">

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/ar.yml

@@ -16,7 +16,7 @@ ar:
         promoted: سلط الضوء
         published_at: نشرت في
         scope_id: نطاق
-        scopes_enabled: تم تمكين النطاقات
+        scopes_enabled: النطاقات المُفعّلَة
         short_description: وصف قصير
         show_statistics: عرض الإحصائيات
         slogan: شعار
@@ -161,6 +161,7 @@ ar:
           attachments: مرفقات
           categories: الاقسام
           components: المكونات
+          conference_admins: المشرفون على المؤتمر
           conference_invites: تدعو
           conference_speakers: مكبرات الصوت
           diploma: شهادة حضور
@@ -384,7 +385,7 @@ ar:
           registration: التسجيل
       conference_program:
         program_meeting:
-          content: يحتوى
+          content: المحتوى
           location: موقعك
           speakers: مكبرات الصوت
           streaming: تدفق
@@ -395,6 +396,7 @@ ar:
         confirmation:
           confirmed_html: تم تأكيد تسجيلك للمؤتمر <a href="%{url}">%{title}</a>.
           details_1: 'أنت مسجل في المؤتمر مع %{registration_type} نوع. تبلغ تكلفتها %{price} ويمكنك حضور الأحداث التالية:'
+          details_2: سوف تجد تفاصيل المحاضرة في المرفقات.
         pending_validation:
           confirmation_pending: سوف تتلقى التأكيد قريبا
           details: 'لقد قمت بالتسجيل إلى %{registration_type} نوع بتكلفة %{price} ويمكنك حضور الأحداث التالية:'

data/config/locales/bg-BG.yml

@@ -0,0 +1,7 @@
+bg:
+  activemodel:
+    attributes:
+      conference:
+        assemblies_ids: Свързани събрания
+        banner_image: Банер изображение
+        consultations_ids: Свързани консултации

data/config/locales/bg.yml

@@ -0,0 +1,7 @@
+bg:
+  activemodel:
+    attributes:
+      conference:
+        assemblies_ids: Свързани събрания
+        banner_image: Банер изображение
+        consultations_ids: Свързани консултации

data/config/locales/ca.yml

@@ -183,6 +183,7 @@ ca:
             admin: Administradora
             collaborator: Col·laboradora
             moderator: Moderadora
+            valuator: Avaluadora
         media_link:
           fields:
             date: Data
@@ -461,6 +462,9 @@ ca:
             active_conferences: Jornades actives
             see_all_conferences: Veure totes les jornades
       photo:
+        image:
+          attributes:
+            alt: Imatge
         show:
           close_modal: Tanca el modal
           photo: Imatge
@@ -471,6 +475,7 @@ ca:
         index:
           choose_an_option: 'Tria el teu tipus d''inscripció:'
           login_as: Has iniciat la sessió com a %{name} <%{email}>
+          no_registrations: Sense insripcions
           register: Inscriu-te
           title: Tipus d'inscripció
       shared:
@@ -524,6 +529,11 @@ ca:
           email_outro: Has rebut aquesta notificació perquè segueixes la jornada "%{resource_title}". Pots deixar de seguir-la des de l'enllaç anterior.
           email_subject: S'han activat les inscripcions per a la jornada "%{resource_title}".
           notification_title: S'han habilitat les inscripcions a la jornada <a href="%{resource_path}">%{resource_title}</a>.
+        role_assigned:
+          email_intro: T'han assignat el rol de %{role} a la jornada "%{resource_title}".
+          email_outro: Reps aquesta notificació perquè se t'ha assignat el rol de %{role} a la jornada "%{resource_title}".
+          email_subject: Se t'ha assignat el rol de %{role} a "%{resource_title}".
+          notification_title: Se t'ha assignat el rol de %{role} a la jornada <a href="%{resource_url}">%{resource_title}</a>.
         upcoming_conference:
           email_intro: 'La jornada "%{resource_title}" es durà a terme en 2 dies. Pots llegir-ne la descripció des de la pàgina:'
           email_outro: Has rebut aquesta notificació perquè estàs seguint la jornada "%{resource_title}". Podeu deixar-la de seguir-a des de l'enllaç anterior.