decidim-conferences 0.27.4 → 0.28.0.rc5

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

@@ -1,67 +1,63 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class='card' id="registration_types">
-  <div class="card-divider">
-    <h2 class="card-title">
+<div class="card" id="registration_types">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t(".title") %>
       <% if allowed_to? :create, :registration_type %>
-         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.registration_type.name", scope: "decidim.admin")), new_conference_registration_type_path(current_conference), class: "button tiny button--title new" %>
+         <%= link_to t("actions.new_registration_type", scope: "decidim.admin"), new_conference_registration_type_path(current_conference), class: "button button__sm button__secondary new" %>
       <% end %>
     </h2>
   </div>
-
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="stack">
-        <thead>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("models.registration_type.fields.title", scope: "decidim.admin") %></th>
+          <th><%= t("models.registration_type.fields.price", scope: "decidim.admin") %></th>
+          <th><%= t("models.registration_type.fields.weight", scope: "decidim.admin") %></th>
+          <th><%= t("models.registration_type.fields.conference_meetings", scope: "decidim.admin") %></th>
+          <th><%= t("models.registration_type.fields.registrations_count", scope: "decidim.admin") %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @registration_types.each do |registration_type| %>
           <tr>
-            <th><%= t("models.registration_type.fields.title", scope: "decidim.admin") %></th>
-            <th><%= t("models.registration_type.fields.price", scope: "decidim.admin") %></th>
-            <th><%= t("models.registration_type.fields.weight", scope: "decidim.admin") %></th>
-            <th><%= t("models.registration_type.fields.conference_meetings", scope: "decidim.admin") %></th>
-            <th><%= t("models.registration_type.fields.registrations_count", scope: "decidim.admin") %></th>
-            <th class="actions"></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @registration_types.each do |registration_type| %>
-            <tr>
-              <td>
-                <%= translated_attribute(registration_type.title) %>
-              </td>
-              <td>
-                <%= registration_type.price %>
-              </td>
-              <td>
-                <%= registration_type.weight %>
-              </td>
-              <td>
-                <%= registration_type.conference_meeting_registration_types.count %>
-              </td>
-              <td>
-                <%= registration_type.conference_registrations.count %>
-              </td>
-              <td class="table-list__actions">
-                <% if allowed_to?(:update, :registration_type, registration_type: registration_type) && !registration_type.conference_registrations.any? %>
-                  <%= icon_link_to "pencil", edit_conference_registration_type_path(current_conference, registration_type), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
-                <% end %>
+            <td>
+              <%= translated_attribute(registration_type.title) %>
+            </td>
+            <td>
+              <%= registration_type.price %>
+            </td>
+            <td>
+              <%= registration_type.weight %>
+            </td>
+            <td>
+              <%= registration_type.conference_meeting_registration_types.count %>
+            </td>
+            <td>
+              <%= registration_type.conference_registrations.count %>
+            </td>
+            <td class="table-list__actions">
+              <% if allowed_to?(:update, :registration_type, registration_type: registration_type) && !registration_type.conference_registrations.any? %>
+                <%= icon_link_to "pencil-line", edit_conference_registration_type_path(current_conference, registration_type), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+              <% end %>
 
-                <% if allowed_to?(:update, :registration_type, registration_type: registration_type) %>
-                  <% if registration_type.published? %>
-                    <%= icon_link_to "x", conference_registration_type_publish_path(current_conference, registration_type), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :delete %>
-                  <% else %>
-                    <%= icon_link_to "check", conference_registration_type_publish_path(current_conference, registration_type), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :post %>
-                  <% end %>
+              <% if allowed_to?(:update, :registration_type, registration_type: registration_type) %>
+                <% if registration_type.published? %>
+                  <%= icon_link_to "close-circle-line", conference_registration_type_publish_path(current_conference, registration_type), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :delete %>
+                <% else %>
+                  <%= icon_link_to "check-line", conference_registration_type_publish_path(current_conference, registration_type), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :post %>
                 <% end %>
-
-                <% if allowed_to?(:destroy, :registration_type, registration_type: registration_type) && !registration_type.conference_registrations.any? %>
-                  <%= icon_link_to "circle-x", conference_registration_type_path(current_conference, registration_type), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate @registration_types, theme: "decidim" %>
-    </div>
+              <% end %>
+              <% if allowed_to?(:destroy, :registration_type, registration_type: registration_type) && !registration_type.conference_registrations.any? %>
+                <%= icon_link_to "delete-bin-line", conference_registration_type_path(current_conference, registration_type), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
+<%= decidim_paginate @registration_types %>

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

@@ -1,8 +1,18 @@
 <% add_decidim_page_title(t("registration_types.new.title", scope: "decidim.admin")) %>
-<%= decidim_form_for(@form, html: { class: "form new_registration_type" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("registration_types.new.title", scope: "decidim.admin") } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t("registration_types.new.create", scope: "decidim.admin") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("registration_types.new.title", scope: "decidim.admin") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form new_registration_type" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("registration_types.new.create", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb

@@ -8,9 +8,9 @@
         <div class="diploma__name small-10 small-centered">
           <h2><strong><%= translated_attribute(@conference.title) %></strong></h2>
           <h3><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance") %></h3>
-          <p><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance_description", user: @user.name, title: translated_attribute(@conference.title), location: @conference.location, start: l(@conference.start_date, format: :decidim_short), end: l(@conference.end_date, format: :decidim_short)  ).html_safe %></p>
+          <p><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance_description", user: @user.name, title: translated_attribute(@conference.title), location: @conference.location, start: l(@conference.start_date, format: :decidim_short), end: l(@conference.end_date, format: :decidim_short) ).html_safe %></p>
         </div>
-        <hr class="reset mt-m mb-m">
+        <hr class="mt-m mb-m">
         <div class="diploma__attendance">
           <strong><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.attendance_verified_by") %></strong>
           <div>

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

@@ -1,30 +1,27 @@
 <% if meetings.present? %>
-  <div class="row collapse">
-    <% categories = meetings.collect(&:category).uniq %>
-    <% seed = SecureRandom.hex(3).to_s %>
-    <% if categories.present? %>
-      <div class="row">
-        <div class="column medium-10 medium-push-2">
-          <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 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>
-        </div>
-      </div>
-    <% end %>
-    <div class="tabs-content" data-tabs-content="conference-row-<%= seed %>-tabs">
+  <div class="conference__program-item">
+    <div class="conference__program-time">
+      <%= start_time.to_s(:time) %> - <%= end_time.to_s(:time) %>
+    </div>
+    <div data-component="accordion" data-multiselectable="false" data-collapsible="false">
+      <% categories = meetings.map(&:category).uniq %>
+      <% seed = SecureRandom.hex(3).to_s %>
+      <% if categories.present? %>
+        <ul class="conference__program-category-container">
+          <% categories.each_with_index do |category, i| %>
+            <li>
+              <button id="conference-item-trigger-<%= seed %>-tab<%= i %>" class="conference__program-category" data-controls="conference-item-panel-<%= seed %>-tab<%= i %>" data-open="<%= "true" if i.zero? %>">
+                <%= category.present? ? translated_attribute(category.name) : "other" %>
+              </button>
+            </li>
+          <% end %>
+        </ul>
+      <% end %>
+
       <% meetings.group_by(&:category).each_with_index do |categories_block, i| %>
-        <div class="tabs-panel<%= " is-active" if i == 0 %>" id="conference-row-<%= seed %>-tab<%= i %>">
+        <div id="conference-item-panel-<%= seed %>-tab<%= i %>" class="conference__program-category-content">
           <% categories_block.last.each do |meeting| %>
-            <%= render partial: "program_meeting", locals: { end_time: end_time, start_time: start_time, meeting: meeting } %>
+            <%= render partial: "program_meeting", locals: { meeting: } %>
           <% end %>
         </div>
       <% end %>

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

@@ -1,67 +1,33 @@
-<div class="row programme-header">
-  <div class="column medium-2 programme-time">
-    <%= start_time.to_s(:time) %> - <%= end_time.to_s(:time) %>
-  </div>
-  <div class="column medium-10 programme-title">
-      <%= link_to present(meeting).title, resource_locator(meeting).path %>
-  </div>
-</div>
-<div class="row">
-  <div class="column medium-10 medium-push-2">
-    <% attribute = present(meeting).description %>
-    <div class="programme-extra">
-      <% conference_meeting = meeting.becomes(Decidim::ConferenceMeeting) %>
-      <% speakers = conference_meeting.conference_speakers %>
-      <% if speakers.any? %>
-        <div class="row speakers-list">
-          <div class="column medium-2">
-            <strong><%= t(".speakers") %></strong>
-          </div>
-          <div class="column medium-10">
-            <%= cell("decidim/conferences/conference_speaker", meeting, list: speakers, size: 3).(:speakers_list) %>
-          </div>
-        </div>
-      <% end %>
+<%= link_to resource_locator(meeting).path, class: "", data: { "conference-program-title": "" } do %>
+  <h2 class="h3 text-secondary"><%= decidim_sanitize(present(meeting).title) %></h2>
+<% end %>
+
+<div class="conference__program-attribute-container">
+  <% conference_meeting = meeting.becomes(Decidim::ConferenceMeeting) %>
+  <% speakers = conference_meeting.conference_speakers %>
+  <% if speakers.any? %>
+    <div class="conference__program-attribute">
+      <div>
+        <% speakers.each do |speaker| %>
+          <%= cell("decidim/author", present(speaker)) %>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+
+  <%= cell("decidim/address", meeting) if translated_attribute(meeting.location).present? %>
 
-      <div class="row">
-        <div class="column medium-2">
-          <strong><%= t(".location") %></strong>
-        </div>
-        <div class="column medium-10">
-          <% if meeting.respond_to? :location %>
-            <u><%= translated_attribute meeting.location %></u>&nbsp;
-          <% end %>
-          <span><%= meeting.address %></span>
-          <% if meeting.respond_to? :location_hints %>
-            <span>&nbsp;<%= translated_attribute meeting.location_hints %></span>
-          <% end %>
-        </div>
+  <% if meeting.closing_visible? && (meeting.video_url.presence || meeting.audio_url.presence) %>
+    <div class="conference__program-attribute">
+      <%= icon "link", class: "w-3.5 h-3.5 text-gray fill-current" %>
+      <div class="conference__program-attribute-url">
+        <% if meeting.video_url.presence %>
+          <%= link_to meeting.video_url, meeting.video_url, target: "_blank" %>
+        <% end %>
+        <% if meeting.audio_url.presence %>
+          <%= link_to meeting.audio_url, meeting.audio_url, target: "_blank" %>
+        <% end %>
       </div>
-      <% if meeting.description.present? %>
-        <div class="row">
-          <div class="column medium-2">
-            <strong><%= t(".content") %></strong>
-          </div>
-          <div class="column medium-10">
-            <%= decidim_sanitize_editor(present(meeting).description(links: true)) %>
-          </div>
-        </div>
-      <% end %>
-      <% if meeting.closing_visible? && (meeting.video_url.presence || meeting.audio_url.presence) %>
-        <div class="row">
-          <div class="column medium-2">
-            <strong><%= t(".streaming") %></strong>
-          </div>
-          <div class="column medium-10">
-            <% if meeting.video_url.presence %>
-              <u><%= link_to meeting.video_url, meeting.video_url, target: "_blank" %></u>
-            <% end %>
-            <% if meeting.audio_url.presence %>
-              <u><%= link_to meeting.audio_url, meeting.audio_url, target: "_blank" %></u>
-            <% end %>
-          </div>
-        </div>
-      <% end %>
     </div>
-  </div>
+  <% end %>
 </div>

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

@@ -5,50 +5,38 @@ if respond_to?(:meeting_component) && meeting_component
     :read,
     :component,
     component: meeting_component,
-    current_participatory_space: current_participatory_space
+    current_participatory_space:
   )
 end
 %>
 <% add_decidim_meta_tags(title: t("conference_program.index.title", scope: "decidim")) %>
-<div class="section row">
-  <div class="columns mediumlarge-12">
-    <h3 class="section-heading"><%= t(".program") %></h3>
-    <div class="conference-programme">
-      <div class="row collapse programme-selector">
-        <div class="column medium-2">
-          <%= t(".day") %>
-        </div>
-        <div class="column medium-10">
-          <% if meeting_days.any? %>
-            <ul class="tabs" id="conference-day-tabs"
-              data-deep-link="true"
-              data-update-history="true"
-              data-deep-link-smudge="true"
-              data-deep-link-smudge-delay="500"
-              data-tabs>
-              <% meeting_days.each_with_index do |day, i| %>
-                <li class="tabs-title <%= "is-active" if i == 0 %>">
-                  <!-- 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 %>
-                    </a>
-                  </div>
-                </li>
-              <% end %>
-            </ul>
-          <% end %>
-        </div>
-      </div>
-      <div class="tabs-content" data-tabs-content="conference-day-tabs">
+
+<%# NOTE: this page does not use a regular layout %>
+<main class="container">
+  <h1 class="title-decorator my-12">
+    <span class="not-sr-only"><%= t(".program") %></span>
+    <span class="sr-only"><%= t(".program") %> (<%= translated_attribute current_participatory_space.title %>)</span>
+  </h1>
+
+  <div data-component="accordion" data-multiselectable="false" data-collapsible="false">
+    <% if meeting_days.any? %>
+      <ul class="conference__program-selector">
         <% meeting_days.each_with_index do |day, i| %>
-          <div class="programme-day tabs-panel<%= " is-active" if i == 0 %>" id="conference-day-tab-<%= i %>">
-            <% meetings_for_day(meeting_component, day, current_user).each do |meeting_days, meetings| %>
-              <%= render partial: "program_item", locals: { start_time: meeting_days[:start_time], end_time: meeting_days[:end_time], meetings: meetings.pluck(:meeting) } %>
-            <% end %>
-          </div>
+          <li>
+            <button id="conference-trigger<%= i %>" class="button button__sm md:button__lg button__transparent-secondary" data-controls="conference-panel<%= i %>" data-open="<%= "true" if i.zero? %>">
+              <%= l day, format: :decidim_with_day_and_month_name %>
+            </button>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
+
+    <% meeting_days.each_with_index do |day, i| %>
+      <div id="conference-panel<%= i %>" class="conference__program" data-conference-program-day>
+        <% meetings_for_day(meeting_component, day, current_user).each do |meeting_days, meetings| %>
+          <%= render partial: "program_item", locals: { start_time: meeting_days[:start_time], end_time: meeting_days[:end_time], meetings: meetings.pluck(:meeting) } %>
         <% end %>
       </div>
-    </div>
+    <% end %>
   </div>
-</div>
+</main>

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

@@ -9,11 +9,17 @@ edit_link(
 )
 %>
 
-<section class="" id="conference_speakers-grid">
-  <div class="row column">
-    <h3 class="section-heading"><%= t(".speakers") %></h3>
-    <div class="row small-up-2 medium-up-5 mb-l">
+<%# NOTE: this page does not use a regular layout %>
+<main class="container">
+
+  <section id="conference_speakers-grid">
+    <h1 class="title-decorator my-12">
+      <span class="not-sr-only"><%= t("decidim.conferences.conference_speakers.index.speakers", count: "") %></span>
+      <span class="sr-only"><%= t("decidim.conferences.conference_speakers.index.speakers", count: "") %> (<%= translated_attribute current_participatory_space.title %>)</span>
+    </h1>
+    <div class="conference__speaker__container">
       <%= render(collection) %>
     </div>
-  </div>
-</section>
+  </section>
+
+</main>

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

@@ -0,0 +1,33 @@
+<section style="background-image:url('<%= current_participatory_space.attached_uploader(:banner_image).path %>');" data-conference-hero>
+  <div class="conference__hero">
+    <div class="conference__hero-text">
+      <h1 class="h1 text-5xl">
+        <%= translated_attribute(current_participatory_space.title) %>
+      </h1>
+      <p class="conference__hero-slogan">
+        <% if current_participatory_space.hashtag.present? %>
+          <span>
+            <%= link_to "##{current_participatory_space.hashtag}", twitter_hashtag_url(current_participatory_space.hashtag), target: "_blank" %>
+          </span>
+        <% end %>
+        <%= translated_attribute(current_participatory_space.slogan) %>
+      </p>
+      <p class="conference__hero-location">
+        <%= participatory_space_helpers.render_date(current_participatory_space) %>
+        <%= " @ " + current_participatory_space.location.to_s if current_participatory_space.location %>
+      </p>
+      <% if current_participatory_space.registrations_enabled? %>
+        <% if current_participatory_space.has_registration_for?(current_user) %>
+          <%= link_to t("layouts.decidim.conference_hero.manage_registration"), decidim_conferences.conference_registration_types_path(current_participatory_space), class: "button button__lg button__primary" %>
+        <% else %>
+          <%= link_to t("layouts.decidim.conference_hero.register"), decidim_conferences.conference_registration_types_path(current_participatory_space), class: "button button__lg button__secondary" %>
+        <% end %>
+      <% end %>
+
+      <% component_meeting = current_participatory_space.components.where(manifest_name: "meetings").published.first || self.try(:current_component) %>
+      <% if component_meeting.present? %>
+        <%= link_to translated_attribute(component_meeting.name), decidim_conferences.conference_conference_program_path(current_participatory_space, id: component_meeting.id), class: "button button__lg button__transparent" %>
+      <% end %>
+    </div>
+  </div>
+</section>

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

@@ -1,15 +1,12 @@
 <% if conference.partners.any? %>
-  <div id="conference-partners">
-    <% conference.partners.group_by(&:partner_type).each do |partner_type, partners| %>
-      <hr class="reset mt-none mb-m">
-      <section class="section">
-        <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 %>
-          <% end %>
-        </div>
-      </section>
-    <% end %>
-  </div>
+  <% conference.partners.group_by(&:partner_type).each do |partner_type, partners| %>
+    <section id="conference-partners-<%= partner_type %>" class="content-block">
+      <h2 class="h2 decorator"><%= t(".#{partner_type.pluralize}") %></h2>
+      <div class="conference__grid">
+        <% partners.each do |partner| %>
+          <%= cell "decidim/conferences/partner", partner %>
+        <% end %>
+      </div>
+    </section>
+  <% end %>
 <% end %>

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

@@ -8,18 +8,28 @@ edit_link(
 )
 %>
 
-<%= participatory_space_wrapper do %>
+<% content_for :aside do %>
+  <h1 class="title-decorator"><%= t("decidim.conferences.index.title") %></h1>
+<% end %>
+
+<%= render layout:"layouts/decidim/shared/layout_two_col" do %>
+  <%= participatory_space_floating_help %>
+
   <% if promoted_conferences.any? %>
-    <section id="highlighted-conferences" class="row section">
-      <h1 class="section-heading"><%= t("conferences.index.promoted_conferences", scope: "layouts.decidim") %></h1>
-      <%= render partial: "promoted_conference", collection: promoted_conferences, as: :promoted_conference %>
+    <section id="highlighted-conferences" class="layout-main__section layout-main__heading">
+      <h2 class="h3 decorator"><%= t("conferences.index.promoted_conferences", scope: "layouts.decidim") %></h2>
+      <% promoted_conferences.each do |promoted_conference| %>
+        <%= card_for promoted_conference, highlight: true %>
+      <% end %>
     </section>
   <% end %>
 
-  <section id="conferences-grid" class="section row collapse">
-    <%= render partial: "decidim/conferences/order_by_conferences" %>
-    <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
+  <section id="conferences-grid" class="layout-main__section layout-main__heading">
+    <h2 class="h3 decorator"><%= t("conferences.order_by_conferences.conferences", scope: "layouts.decidim", count: conferences.size) %></h2>
+    <div class="card__grid-grid">
       <%= render(collection) %>
     </div>
+
+    <%= decidim_paginate collection %>
   </section>
 <% end %>