decidim-conferences 0.27.6 → 0.28.0.rc4

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

@@ -1,8 +1,19 @@
 <% add_decidim_page_title(t("conference_copies.new.title", scope: "decidim.admin")) %>
-<%= decidim_form_for(@form, url: conference_copies_path(current_conference), method: :post, html: { class: "form copy_conference" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("conference_copies.new.title", scope: "decidim.admin"), select: t("conference_copies.new.select", scope: "decidim.admin") } %>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t("conference_copies.new.copy", scope: "decidim.admin") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("conference_copies.new.title", scope: "decidim.admin") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: conference_copies_path(current_conference), method: :post, html: { class: "form form-defaults copy_conference" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("conference_copies.new.copy", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,32 +1,31 @@
-<div class="attendee-fields">
-  <div class="row column">
-    <fieldset class="check-radio-collection">
-      <legend><%= t(".attendee_type") %></legend>
-      <%= form.collection_radio_buttons(:existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], :last, :first) %>
-    </fieldset>
-  </div>
+<div class="form__wrapper">
+  <div class="card attendee-fields pt-4">
+    <div class="row column">
+      <fieldset class="check-radio-collection">
+        <legend><%= t(".attendee_type") %></legend>
+        <%= form.collection_radio_buttons(:existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], :last, :first) %>
+      </fieldset>
+    </div>
 
-  <div class="text-warning attendee-fields--new-user">
-    <p><%= t(".invite_explanation") %></p>
-  </div>
+    <div class="row column text-warning attendee-fields--new-user">
+      <p><%= t(".invite_explanation") %></p>
+    </div>
 
-  <div class="grid-x grid-margin-x">
-    <div class="auto cell attendee-fields--new-user">
+    <div class="row column auto cell attendee-fields--new-user">
       <%= form.text_field :name %>
     </div>
-    <div class="auto cell attendee-fields--new-user">
+    <div class="row column auto cell attendee-fields--new-user">
       <%= form.text_field :email %>
     </div>
 
-    <div class="auto cell attendee-fields--user-picker">
+    <div class="row column auto cell attendee-fields--user-picker">
         <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
         <%= form.autocomplete_select(:user_id, form.object.user.presence, { multiple: false, class: "autocomplete-field--results-inline" }, prompt_options) do |user|
           { value: user.id, label: "#{user.name} (@#{user.nickname})" }
         end %>
     </div>
-  </div>
-  <div class="grid-x grid-margin-x">
-    <div class="auto cell">
+
+    <div class="row column auto cell">
       <%= form.select :registration_type_id,
                       options_for_select(@form.registration_types_for_select),
                       { include_blank: false },
@@ -34,5 +33,4 @@
     </div>
   </div>
 </div>
-
-<%= javascript_pack_tag "decidim_conferences_admin" %>
+<%= append_javascript_pack_tag "decidim_conferences_admin" %>

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

@@ -1,88 +1,83 @@
 <% add_decidim_page_title(t(".invites")) %>
-<div class="filters row">
-  <div class="column medium-3">
-    <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
-    <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-click-open="true" data-close-on-click-inside="false">
-      <li class="is-dropdown-submenu-parent">
-        <a href="#">
-          <% if @status.present? %>
-            <%= t(".filter.#{@status}") %>
-          <% else %>
-            <%= t(".filter.all") %>
-          <% end %>
-        </a>
-        <ul class="menu is-dropdown-submenu">
-          <li><%= link_to t(".filter.sent"), url_for(status: "sent", q: @query) %></li>
-          <li><%= link_to t(".filter.accepted"), url_for(status: "accepted", q: @query) %></li>
-          <li><%= link_to t(".filter.rejected"), url_for(status: "rejected", q: @query) %></li>
-          <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
-        </ul>
-      </li>
-    </ul>
+
+<div class="card" id="conference-invites">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
+      <%= t(".invites") %>
+      <%= link_to t(".invite_attendee"), conference.registrations_enabled ? new_conference_conference_invite_path(conference) : "#", class: "button button__sm button__secondary #{"disabled" unless conference.registrations_enabled && allowed_to?(:invite_attendee, :conference, conference:)}" %>
+    </h2>
   </div>
-  <div class="column medium-4">
-    <%= form_tag "", method: :get do %>
-      <div class="filters__search">
+
+  <%# NOTE: this old filters section should be refactorized in order to use the shared admin_filter_selector method
+  it would require the definition of concerns similar to decidim-conferences/app/controllers/concerns/decidim/conferences/admin/filterable.rb %>
+  <div class="filters__section">
+    <div class="fcell">
+      <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+        <li class="is-dropdown-submenu-parent">
+          <a href="#" class="dropdown button">
+            <%= t("filter_label", scope: "decidim.admin.filters") %>
+            <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
+          </a>
+          <ul class="menu is-dropdown-submenu">
+            <li><%= link_to t(".filter.sent"), url_for(status: "sent", q: @query) %></li>
+            <li><%= link_to t(".filter.accepted"), url_for(status: "accepted", q: @query) %></li>
+            <li><%= link_to t(".filter.rejected"), url_for(status: "rejected", q: @query) %></li>
+            <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+    <div class="fcell search">
+      <%= form_tag "", method: :get do %>
         <div class="input-group">
           <%= 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">
-              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
+            <button type="submit" class="text-secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
+              <%= icon "search-line", class: "fill-secondary w-4 h-4" %>
             </button>
           </div>
         </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-
-<div class="card" id="conference-invites">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t(".invites") %>
-      <%= link_to t(".invite_attendee"), conference.registrations_enabled ? new_conference_conference_invite_path(conference) : "#", class: "button tiny button--title #{'disabled' unless conference.registrations_enabled && allowed_to?(:invite_attendee, :conference, conference: conference) }" %>
-    </h2>
+      <% end %>
+    </div>
   </div>
 
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= t("models.conference_invite.fields.name", scope: "decidim.conferences") %></th>
-            <th><%= t("models.conference_invite.fields.email", scope: "decidim.conferences") %></th>
-            <th><%= t("models.conference_invite.fields.sent_at", scope: "decidim.conferences") %></th>
-            <th><%= t("models.conference_invite.fields.status", scope: "decidim.conferences") %></th>
-            <th><%= t("models.conference_invite.fields.registration_type", scope: "decidim.conferences") %></th>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("models.conference_invite.fields.name", scope: "decidim.conferences") %></th>
+          <th><%= t("models.conference_invite.fields.email", scope: "decidim.conferences") %></th>
+          <th><%= t("models.conference_invite.fields.sent_at", scope: "decidim.conferences") %></th>
+          <th><%= t("models.conference_invite.fields.status", scope: "decidim.conferences") %></th>
+          <th><%= t("models.conference_invite.fields.registration_type", scope: "decidim.conferences") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @conference_invites.each do |invite| %>
+          <% presenter = Decidim::Conferences::ConferenceInvitePresenter.new(invite) %>
+          <tr data-id="<%= invite.id %>">
+            <td>
+              <%= invite.user.name %>
+            </td>
+            <td>
+              <%= invite.user.email %>
+            </td>
+            <td>
+              <% if invite.sent_at %>
+                <%= l invite.sent_at, format: :long %>
+              <% end %>
+            </td>
+            <td class="<%= presenter.status_html_class %>">
+              <%= presenter.status %>
+            </td>
+            <td>
+              <%= translated_attribute(invite.registration_type.title) %>
+            </td>
           </tr>
-        </thead>
-        <tbody>
-          <% @conference_invites.each do |invite| %>
-            <% presenter = Decidim::Conferences::ConferenceInvitePresenter.new(invite) %>
-            <tr data-id="<%= invite.id %>">
-              <td>
-                <%= invite.user.name %>
-              </td>
-              <td>
-                <%= invite.user.email %>
-              </td>
-              <td>
-                <% if invite.sent_at %>
-                  <%= l invite.sent_at, format: :long %>
-                <% end %>
-              </td>
-              <td class="<%= presenter.status_html_class %>">
-                <%= presenter.status %>
-              </td>
-              <td>
-                <%= translated_attribute(invite.registration_type.title) %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate @conference_invites, theme: "decidim" %>
-    </div>
+        <% end %>
+      </tbody>
+    </table>
   </div>
+  <%= decidim_paginate @conference_invites %>
 </div>

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

@@ -1,22 +1,26 @@
 <% add_decidim_page_title(t(".new_invite")) %>
-<h2 class="process-title-summary">
-  <%= t(".new_invite") %>
-</h2>
 
-<div class="section">
-  <div class="callout warning">
-    <p><%= t(".explanation") %></p>
-  </div>
-</div>
+<%= cell("decidim/announcement", t(".explanation"), callout_class: "warning") %>
 
-<%= decidim_form_for(@form, url: conference_conference_invites_path, method: :post, html: { class: "form new_conference_registration_invite" }) do |f| %>
-  <div class="card">
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
-  </div>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".new_invite") %>
+  </h2>
+</div>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".invite") %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: conference_conference_invites_path, method: :post, html: { class: "form form-defaults new_conference_registration_invite" }) do |f| %>
+      <div class="card">
+        <div class="card-section">
+          <%= render partial: "form", object: f %>
+        </div>
+      </div>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".invite"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,60 +1,60 @@
 <% add_decidim_page_title(t(".registrations")) %>
 <div class="card" id="conference-registrations">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t(".registrations") %>
       <% if allowed_to? :export_conference_registrations, :conference, conference: conference %>
-        <span class="exports dropdown tiny button button--simple button--title" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></span>
+        <span class="exports button button__sm button__secondary button--simple button--title" data-toggle="export-dropdown">
+          <%= t "actions.export", scope: "decidim.admin" %>
+          <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
+        </span>
         <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
           <ul class="vertical menu add-components">
-            <% %w{CSV JSON Excel}.each do |format| %>
-              <li class="exports--format--<%= format.downcase %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.admin.conferences.exports.registrations"), export_format: format), export_conference_conference_registrations_path(conference_id: conference, format: format) %></li>
+            <% %w(CSV JSON Excel).each do |format| %>
+              <li class="exports--format--<%= format.downcase %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.admin.conferences.exports.registrations"), export_format: format), export_conference_conference_registrations_path(conference_id: conference, format:) %></li>
             <% end %>
           </ul>
         </div>
       <% end %>
     </h2>
   </div>
-
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= t("models.conference_registration.fields.name", scope: "decidim.conferences") %></th>
-            <th><%= t("models.conference_registration.fields.email", scope: "decidim.conferences") %></th>
-            <th><%= t("models.conference_registration.fields.registration_type", scope: "decidim.conferences") %></th>
-            <th><%= t("models.conference_registration.fields.state", scope: "decidim.conferences") %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @conference_registrations.each do |registration| %>
-            <tr data-id="<%= registration.id %>">
-              <td>
-                <%= registration.user.name %>
-              </td>
-              <td>
-                <%= registration.user.email %>
-              </td>
-              <td>
-                <%= translated_attribute(registration.registration_type.title) %>
-              </td>
-              <td>
-                <%= t("models.conference_registration.fields.states.#{registration.confirmed? ? "confirmed" : "pending"}", scope: "decidim.conferences") %>
-              </td>
-              <td>
-                <% if allowed_to?(:confirm, :conference_registration, conference_registration: registration) %>
-                  <% if !registration.confirmed? %>
-                    <%= icon_link_to "check", confirm_conference_conference_registration_path(current_conference, registration), t("actions.confirm", scope: "decidim.admin"), class: "action-icon--publish", method: :post %>
-                  <% end %>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("models.conference_registration.fields.name", scope: "decidim.conferences") %></th>
+          <th><%= t("models.conference_registration.fields.email", scope: "decidim.conferences") %></th>
+          <th><%= t("models.conference_registration.fields.registration_type", scope: "decidim.conferences") %></th>
+          <th><%= t("models.conference_registration.fields.state", scope: "decidim.conferences") %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @conference_registrations.each do |registration| %>
+          <tr data-id="<%= registration.id %>">
+            <td>
+              <%= registration.user.name %>
+            </td>
+            <td>
+              <%= registration.user.email %>
+            </td>
+            <td>
+              <%= translated_attribute(registration.registration_type.title) %>
+            </td>
+            <td>
+              <%= t("models.conference_registration.fields.states.#{registration.confirmed? ? "confirmed" : "pending"}", scope: "decidim.conferences") %>
+            </td>
+            <td>
+              <% if allowed_to?(:confirm, :conference_registration, conference_registration: registration) %>
+                <% if !registration.confirmed? %>
+                  <%= icon_link_to "check-line", confirm_conference_conference_registration_path(current_conference, registration), t("actions.confirm", scope: "decidim.admin"), class: "action-icon--publish", method: :post %>
                 <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate @conference_registrations, theme: "decidim" %>
-    </div>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
+  <%= decidim_paginate @conference_registrations %>
 </div>

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

@@ -1,61 +1,57 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= title %>
-    </h2>
-  </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="user-fields">
+        <div class="row column">
+          <%= form.select :existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], label: t(".user_type") %>
+        </div>
+
+        <div class="row column user-fields--full-name">
+          <%= form.text_field :full_name, autofocus: true %>
+        </div>
+
+        <div class="row column user-fields--user-picker">
+          <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
+          <%= form.autocomplete_select(:user_id, form.object.user.presence, { multiple: false }, prompt_options) do |user|
+            { value: user.id, label: "#{user.name} (@#{user.nickname})" }
+          end %>
+        </div>
+      </div>
 
-  <div class="card-section">
-    <div class="user-fields">
       <div class="row column">
-        <%= form.select :existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], label: t(".user_type") %>
+        <% if @form.meetings %>
+          <%= form.select :conference_meeting_ids,
+                          options_for_select(@form.meetings, selected: meetings_selected ),
+                          { include_blank: true },
+                          { multiple: true, class: "chosen-select" } %>
+        <% end %>
       </div>
 
-      <div class="row column user-fields--full-name">
-        <%= form.text_field :full_name, autofocus: true %>
+      <div class="row column">
+        <%= form.translated :text_field, :position, aria: { label: :position } %>
       </div>
 
-      <div class="row column user-fields--user-picker">
-        <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
-        <%= form.autocomplete_select(:user_id, form.object.user.presence,  { multiple: false }, prompt_options) do |user|
-          { value: user.id, label: "#{user.name} (@#{user.nickname})" }
-        end %>
+      <div class="row column">
+        <%= form.translated :text_field, :affiliation, aria: { label: :affiliation } %>
       </div>
-    </div>
-
-    <div class="row column">
-      <% if @form.meetings %>
-        <%= form.select :conference_meeting_ids,
-                        options_for_select(@form.meetings, selected: meetings_selected ),
-                        { include_blank: true },
-                        { multiple: true, class: "chosen-select" } %>
-      <% end %>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :text_field, :position %>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :text_field, :affiliation %>
-    </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :short_bio %>
-    </div>
+      <div class="row column">
+        <%= form.translated :editor, :short_bio, aria: { label: :short_bio } %>
+      </div>
 
-    <div class="row column">
-      <%= form.text_field :twitter_handle %>
-    </div>
+      <div class="row column">
+        <%= form.text_field :twitter_handle %>
+      </div>
 
-    <div class="row column">
-      <%= form.url_field :personal_url %>
-    </div>
+      <div class="row column">
+        <%= form.url_field :personal_url %>
+      </div>
 
-    <div class="row column">
-      <%= form.upload :avatar %>
+      <div class="row column">
+        <%= form.upload :avatar, button_class: "button button__sm button__transparent-secondary" %>
+      </div>
     </div>
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_conferences_admin" %>
+<%= append_javascript_pack_tag "decidim_conferences_admin" %>

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

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