decidim-meetings 0.27.4 → 0.28.0.rc5

data/app/views/decidim/meetings/admin/meetings/_form.html.erb

@@ -1,107 +1,100 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-  <div class="card-section">
-    <div class="row column hashtags__container">
-      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
-    </div>
-
-    <div class="row column hashtags__container">
-      <%= form.translated :editor, :description, hashtaggable: true %>
-    </div>
-
-    <div class="row column">
-      <%= form.select :type_of_meeting,
-        @form.type_of_meeting_select,
-        { include_blank: t(".select_a_meeting_type") },
-        { multiple: false } %>
-    </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column hashtags__container">
+        <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
+      </div>
 
-    <div class="field" data-meeting-type="in_person">
-      <%= form.geocoding_field :address %>
-      <p class="help-text"><%= t(".address_help") %></p>
-    </div>
+      <div class="row column hashtags__container">
+        <%= form.translated :editor, :description, hashtaggable: true, aria: { label: :description } %>
+      </div>
 
-    <div class="field" data-meeting-type="in_person">
-      <%= form.translated :text_area, :location %>
-      <p class="help-text"><%= t(".location_help") %></p>
-    </div>
+      <div class="row column">
+        <%= form.select :type_of_meeting,
+                        @form.type_of_meeting_select,
+                        { include_blank: t(".select_a_meeting_type") },
+                        { multiple: false } %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :text_area, :location_hints %>
-      <p class="help-text"><%= t(".location_hints_help") %></p>
-    </div>
+      <div class="row column field" data-meeting-type="in_person">
+        <%= form.geocoding_field :address, help_text: t(".address_help") %>
+      </div>
 
-    <div class="field" data-meeting-type="online">
-      <%= form.text_field :online_meeting_url %>
-      <p class="help-text"><%= t(".online_meeting_url_help") %></p>
-    </div>
+      <div class="row column field" data-meeting-type="in_person">
+        <%= form.translated :text_area, :location, help_text: t(".location_help") %>
+      </div>
 
-    <div class="iframe-fields">
-      <div class="row column field iframe-fields--embed-type" id="meeting_iframe_embed_type" data-meeting-type="online">
-        <%= form.select :iframe_embed_type,
-          @form.iframe_embed_type_select,
-          { multiple: false } %>
-        <p class="help-text"><%= t(".show_embedded_iframe_help", domains: Decidim::Meetings.embeddable_services&.join(" ")) %></p>
+      <div class="row column">
+        <%= form.translated :text_area, :location_hints, help_text: t(".location_hints_help") %>
       </div>
 
-      <div class="row column field iframe-fields--access-level" data-meeting-type="online-access-level">
-        <%= form.select :iframe_access_level,
-          @form.iframe_access_level_select,
-          { include_blank: t(".select_an_iframe_access_level") },
-          { multiple: false } %>
+      <div class="row column field" data-meeting-type="online">
+        <%= form.text_field :online_meeting_url, help_text: t(".online_meeting_url_help") %>
       </div>
-    </div>
 
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.datetime_field :start_time %>
+      <div class="iframe-fields">
+        <div class="row column field iframe-fields--embed-type" id="meeting_iframe_embed_type" data-meeting-type="online">
+          <%= form.select :iframe_embed_type,
+                          @form.iframe_embed_type_select,
+                          {
+                            multiple: false,
+                            help_text: t(".iframe_embed_type_html", domains: Decidim::Meetings.embeddable_services&.join(" "))
+                          } %>
+        </div>
+
+        <div class="row column field iframe-fields--access-level" data-meeting-type="online-access-level">
+          <%= form.select :iframe_access_level,
+                          @form.iframe_access_level_select,
+                          { include_blank: t(".select_an_iframe_access_level") },
+                          { multiple: false } %>
+        </div>
       </div>
 
-      <div class="columns xlarge-6">
-        <%= form.datetime_field :end_time %>
+      <div class="row">
+        <div class="columns">
+          <%= form.datetime_field :start_time %>
+        </div>
+
+        <div class="columns">
+          <%= form.datetime_field :end_time %>
+        </div>
       </div>
-    </div>
-    <div class="row">
-      <% if current_component.has_subscopes? %>
-        <div class="columns xlarge-6">
-          <%= scopes_picker_field form, :decidim_scope_id, root: current_component.scope %>
+      <div class="row">
+        <% if current_component.has_subscopes? %>
+          <div class="columns">
+            <%= scopes_select_field form, :decidim_scope_id, root: current_component.scope %>
+          </div>
+        <% end %>
+
+        <div class="columns">
+          <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
         </div>
-      <% end %>
+      </div>
 
-      <div class="columns xlarge-6">
-        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
+      <div class="row column">
+        <%= form.select :registration_type,
+                        @form.registration_type_select,
+                        { include_blank: t(".select_a_registration_type") },
+                        { multiple: false } %>
       </div>
-    </div>
 
-    <div class="row column">
-      <%= form.select :registration_type,
-        @form.registration_type_select,
-        { include_blank: t(".select_a_registration_type") },
-        { multiple: false } %>
-    </div>
+      <div class="row column" id="meeting_registration_url">
+        <%= form.text_field :registration_url, help_text: t(".registration_url_help") %>
+        <%= cell("decidim/announcement", t(".disclaimer", organization: current_component.organization.name), callout_class: "alert" ) %>
+      </div>
 
-    <div class="field" id="meeting_registration_url">
-      <%= form.text_field :registration_url %>
-      <p class="help-text"><%= t(".registration_url_help") %></p>
-      <div class="callout alert">
-        <%= t(".disclaimer", organization: current_component.organization.name) %>
+      <div class="row column" id="private_meeting">
+        <%= form.check_box :private_meeting %>
       </div>
-    </div>
 
-    <div class="row column" id="private_meeting">
-      <%= form.check_box :private_meeting %>
-    </div>
+      <div class="row column" id="transparent">
+        <%= form.check_box :transparent %>
+      </div>
 
-    <div class="row column" id="transparent">
-      <%= form.check_box :transparent %>
+      <%= render partial: "decidim/comments/admin/shared/availability_fields", locals: { form: } %>
     </div>
-
-    <%= render partial: "decidim/comments/admin/shared/availability_fields", locals: { form: form } %>
   </div>
+  <%= render "decidim/meetings/admin/meetings/services", form: , id: tabs_id_for_service(blank_service) %>
 </div>
 
-<%= render "decidim/meetings/admin/meetings/services", form: form, id: tabs_id_for_service(blank_service) %>
-
-<%= javascript_pack_tag "decidim_meetings_admin" %>
+<%= append_javascript_pack_tag "decidim_meetings_admin" %>

data/app/views/decidim/meetings/admin/meetings/_service.html.erb

@@ -2,20 +2,24 @@
 
 <div class="card meeting-service" id="<%= id %>-field">
   <div class="card-divider service-divider">
-    <h2 class="card-title">
+    <h2 class="card-title mb-4">
       <span><%= t(".service") %></span>
 
-      <button class="button small alert hollow move-up-service button--title">
-        <%== "#{icon("arrow-top")} #{t(".up")}" %>
-      </button>
+      <div class="ml-auto flex gap-x-4">
+        <button class="button button__sm button__transparent-secondary small alert hollow move-up-service button--title">
+          <%= icon "arrow-up-line" %>
+          <%= t(".up") %>
+        </button>
 
-      <button class="button small alert hollow move-down-service button--title">
-        <%== "#{icon("arrow-bottom")} #{t(".down")}" %>
-      </button>
+        <button class="button button__sm button__transparent-secondary small alert hollow move-down-service button--title">
+          <%= icon "arrow-down-line" %>
+          <%= t(".down") %>
+        </button>
 
-      <button class="button small alert hollow remove-service button--title">
-        <%= t(".remove") %>
-      </button>
+        <button class="button button__sm button__transparent-secondary small alert hollow remove-service button--title">
+          <%= t(".remove") %>
+        </button>
+      </div>
     </h2>
   </div>
 

data/app/views/decidim/meetings/admin/meetings/_services.html.erb

@@ -1,10 +1,14 @@
-<div class="card">
+<div class="card" data-component="accordion" id="accordion-services">
   <div class="card-divider">
-    <h2 class="card-title"><%= t(".services") %></h2>
+    <button class="card-divider-button" data-open="true" data-controls="panel-services" type="button">
+      <%= icon "arrow-right-s-line" %>
+      <h2 class="card-title" id="services"><%= t(".services") %>
+      </h2>
+    </button>
   </div>
 
-  <div class="card-section">
-    <div class="meeting-services">
+  <div id="panel-services" class="card-section">
+    <div class="meeting-services row column">
       <script type="text/template" class="decidim-template">
         <%= fields_for "meeting[services][#{blank_service.to_param}]", blank_service do |service_form| %>
           <%= render "decidim/meetings/admin/meetings/service", form: service_form, id: tabs_id_for_service(blank_service) %>
@@ -19,7 +23,7 @@
         <% end %>
       </div>
 
-      <button class="button add-service" type="button"><%= t(".add_service") %></button>
+      <button class="button button__sm button__secondary add-service" type="button"><%= t(".add_service") %></button>
     </div>
   </div>
 </div>

data/app/views/decidim/meetings/admin/meetings/edit.html.erb

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

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

@@ -1,160 +1,164 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t(".title") %>
-      <div class="button--title">
-        <%= link_to t("actions.new", scope: "decidim.meetings", name: t("models.meeting.name", scope: "decidim.meetings.admin")), new_meeting_path, class: "button tiny button--simple" if allowed_to? :create, :meeting %>
-        <%= export_dropdown %>
-      </div>
+      <%= export_dropdowns(query) %>
+      <%= link_to t("actions.new_meeting", scope: "decidim.meetings"), new_meeting_path, class: "button button__sm button__secondary" if allowed_to? :create, :meeting %>
+      <%= render partial: "decidim/admin/components/resource_action" %>
     </h2>
   </div>
 
   <%= admin_filter_selector(:meetings) %>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th>
-              <%= sort_link(query, :id, t("models.meeting.fields.id", scope: "decidim.meetings"), default_order: :desc ) %>
-            </th>
-            <th>
-              <%= sort_link(query, :translated_title, t("models.meeting.fields.title", scope: "decidim.meetings"), default_order: :desc ) %>
-            </th>
-            <th>
-              <%= sort_link(query, :start_time, t("models.meeting.fields.start_time", scope: "decidim.meetings"), default_order: :desc ) %>
-            </th>
-            <th>
-              <%= sort_link(query, :end_time, t("models.meeting.fields.end_time", scope: "decidim.meetings"), default_order: :desc ) %>
-            </th>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th>
+            <%= sort_link(query, :id, t("models.meeting.fields.id", scope: "decidim.meetings"), default_order: :desc ) %>
+          </th>
+          <th>
+            <%= sort_link(query, :translated_title, t("models.meeting.fields.title", scope: "decidim.meetings"), default_order: :desc ) %>
+          </th>
+          <th>
+            <%= sort_link(query, :start_time, t("models.meeting.fields.start_time", scope: "decidim.meetings"), default_order: :desc ) %>
+          </th>
+          <th>
+            <%= sort_link(query, :end_time, t("models.meeting.fields.end_time", scope: "decidim.meetings"), default_order: :desc ) %>
+          </th>
+          <th>
+            <%= sort_link(query, :closed, t("models.meeting.fields.closed", scope: "decidim.meetings"), default_order: :desc ) %>
+          </th>
+          <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
+            <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
+          <% end %>
+          <% if resource_with_scopes_enabled? %>
             <th>
-              <%= sort_link(query, :closed, t("models.meeting.fields.closed", scope: "decidim.meetings"), default_order: :desc ) %>
+              <%= sort_link(query, :scope_name, t("models.proposal.fields.scope", scope: "decidim.proposals") ) %>
             </th>
-            <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
-              <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
-            <% end %>
-            <% if resource_with_scopes_enabled? %>
-              <th>
-                <%= sort_link(query, :scope_name, t("models.proposal.fields.scope", scope: "decidim.proposals") ) %>
-              </th>
-            <% end %>
-            <th class="actions"><%= t("actions.title", scope: "decidim.meetings") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% meetings.each do |meeting| %>
-            <tr data-id="<%= meeting.id %>">
-              <td>
-                <%= meeting.id %><br>
-              </td>
-              <td>
+          <% end %>
+          <th class="actions"><%= t("actions.title", scope: "decidim.meetings") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% meetings.each do |meeting| %>
+          <tr data-id="<%= meeting.id %>">
+            <td>
+              <%= meeting.id %><br>
+            </td>
+            <td>
+              <% if allowed_to? :update, :meeting, meeting: meeting %>
+                <%= link_to present(meeting).title(html_escape: true), edit_meeting_path(meeting) %>
+              <% else %>
                 <%= present(meeting).title(html_escape: true) %><br>
-              </td>
-              <td>
-                <% if meeting.start_time %>
-                  <%= l meeting.start_time, format: :long %>
-                <% end %>
-              </td>
-              <td>
-                <% if meeting.end_time %>
-                  <%= l meeting.end_time, format: :long %>
-                <% end %>
-              </td>
+              <% end %>
+            </td>
+            <td>
+              <% if meeting.start_time %>
+                <%= l meeting.start_time, format: :long %>
+              <% end %>
+            </td>
+            <td>
+              <% if meeting.end_time %>
+                <%= l meeting.end_time, format: :long %>
+              <% end %>
+            </td>
+            <td>
+              <%= humanize_boolean meeting.closed? %>
+            </td>
+            <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
               <td>
-                <%= humanize_boolean meeting.closed? %>
+                <%= static_map_link(meeting, {}, { class: "static-map__admin" }) unless meeting.online? %>
               </td>
-              <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
-                <td>
-                  <%= static_map_link(meeting) %>
-                </td>
+            <% end %>
+            <%= td_resource_scope_for(meeting.scope) %>
+            <td class="table-list__actions">
+              <% if allowed_to? :update, :meeting, meeting: meeting %>
+                <%= icon_link_to "pencil-line", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>
+              <% else %>
+                <span class="action-space icon"></span>
               <% end %>
-              <%= td_resource_scope_for(meeting.scope) %>
-              <td class="table-list__actions">
-                <% if allowed_to? :update, :meeting, meeting: meeting %>
-                  <% if meeting.published? %>
-                    <%= icon_link_to "x", unpublish_meeting_path(meeting), t("actions.unpublish", scope: "decidim.admin"), method: :put, class: "action-icon--unpublish", data: { confirm: t("actions.unpublish", scope: "decidim.admin") } %>
-                  <% else %>
-                    <%= icon_link_to "check", publish_meeting_path(meeting), t("actions.publish", scope: "decidim.admin"), method: :put, class: "action-icon--publish" %>
-                  <% end %>
-                <% else %>
-                  <span class="action-space icon"></span>
-                <% end %>
 
-                <%= icon_link_to "eye", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
+              <% if allowed_to? :copy, :meeting, meeting: meeting %>
+                <%= icon_link_to "file-copy-line", new_meeting_copy_path(meeting), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-                <% if allowed_to? :copy, :meeting, meeting: meeting %>
-                  <%= icon_link_to "clipboard", new_meeting_copy_path(meeting), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
-                <% else %>
-                  <span class="action-space icon"></span>
-                <% end %>
+              <% if allowed_to? :update, :meeting, meeting: meeting %>
+                <%= icon_link_to "folder-line", meeting_attachment_collections_path(meeting), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-                <% if allowed_to? :update, :meeting, meeting: meeting %>
-                  <% if meeting.registration_disabled? %>
-                    <%= icon "people", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.registrations", scope: "decidim.meetings") %>
-                  <% else %>
-                    <%= icon_link_to "people", meeting.on_this_platform? ? edit_meeting_registrations_path(meeting) : meeting.registration_url, t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
-                  <% end %>
-                <% end %>
+              <% if allowed_to? :update, :meeting, meeting: meeting %>
+                <%= icon_link_to "attachment-line", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-                <% if allowed_to? :update, :meeting, meeting: meeting %>
-                  <%= icon_link_to "pencil", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>
-                  <%= icon_link_to "calendar", meeting.agenda.present? ? edit_meeting_agenda_path(meeting, meeting.agenda) : new_meeting_agenda_path(meeting), t("actions.agenda", scope: "decidim.meetings"), class: "action-icon--agenda" %>
-                  <%= icon_link_to "list", edit_meeting_poll_path(meeting), t("actions.manage_poll", scope: "decidim.meetings"), class: "action-icon--manage-poll-questionnaire" %>
+              <% if allowed_to? :update, :meeting, meeting: meeting %>
+                <% if meeting.registration_disabled? %>
+                  <%= icon "group-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.registrations", scope: "decidim.meetings") %>
                 <% else %>
-                  <span class="action-space icon"></span>
-                  <span class="action-space icon"></span>
-                  <span class="action-space icon"></span>
+                  <%= icon_link_to "group-line", meeting.on_this_platform? ? edit_meeting_registrations_path(meeting) : meeting.registration_url, t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
                 <% end %>
+              <% end %>
 
-                <% if allowed_to? :close, :meeting, meeting: meeting %>
-                  <%= icon_link_to "lock-locked", edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), t("actions.close", scope: "decidim.meetings"), class: "action-icon--close" %>
-                <% else %>
-                    <span class="action-space icon"></span>
-                <% end %>
+              <% if allowed_to? :update, :meeting, meeting: meeting %>
+                <%= icon_link_to "calendar-line", meeting.agenda.present? ? edit_meeting_agenda_path(meeting, meeting.agenda) : new_meeting_agenda_path(meeting), t("actions.agenda", scope: "decidim.meetings"), class: "action-icon--agenda" %>
+                <%= icon_link_to "list-check", edit_meeting_poll_path(meeting), t("actions.manage_poll", scope: "decidim.meetings"), class: "action-icon--manage-poll-questionnaire" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-                <% if allowed_to? :update, :meeting, meeting: meeting %>
-                    <%= icon_link_to "folder", meeting_attachment_collections_path(meeting), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
-                <% else %>
-                    <span class="action-space icon"></span>
-                <% end %>
+              <% if allowed_to? :close, :meeting, meeting: meeting %>
+                <%= icon_link_to "lock-line" , edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), t("actions.close", scope: "decidim.meetings"), class: "action-icon--close" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-                <% if allowed_to? :update, :meeting, meeting: meeting %>
-                  <%= icon_link_to "paperclip", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
+              <% if allowed_to? :update, :meeting, meeting: meeting %>
+                <% if meeting.published? %>
+                  <%= icon_link_to "close-circle-line", unpublish_meeting_path(meeting), t("actions.unpublish", scope: "decidim.admin"), method: :put, class: "action-icon--unpublish", data: { confirm: t("actions.unpublish", scope: "decidim.admin") } %>
                 <% else %>
-                  <span class="action-space icon"></span>
+                  <%= icon_link_to "check-line", publish_meeting_path(meeting), t("actions.publish", scope: "decidim.admin"), method: :put, class: "action-icon--publish" %>
                 <% end %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-                <%= resource_permissions_link(meeting) %>
+              <%= icon_link_to "eye-line", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
 
-                <% if allowed_to? :destroy, :meeting, meeting: meeting %>
-                  <% if present(meeting).authored_proposals.empty? %>
-                    <%= icon_link_to "circle-x", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
-                  <% else %>
-                    <%=
-                      content_tag(:button,
-                                  class: ["action-icon", "action-icon--remove", "destroy-meeting-alert"],
-                                  "data-invalid-destroy-message" => t("actions.invalid_destroy.proposals_count", count: present(meeting).authored_proposals.size, scope: "decidim.meetings"),
-                                  "data-proposal-titles" => present(meeting).formatted_proposals_titles) do
-                        content_tag(:span,
-                                    data: { tooltip: true, disable_hover: false, click_open: false },
-                                    title: t("actions.destroy", scope: "decidim.meetings")) do
-                          icon("circle-x")
-                        end
-                      end
-                    %>
-                  <% end %>
+              <%= resource_permissions_link(meeting) %>
+
+              <% if allowed_to? :destroy, :meeting, meeting: meeting %>
+                <% if present(meeting).authored_proposals.empty? %>
+                  <%= icon_link_to "delete-bin-line", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
                 <% else %>
-                  <span class="action-space icon"></span>
+                  <%=
+                    content_tag(:button,
+                                class: ["action-icon", "action-icon--remove", "destroy-meeting-alert"],
+                                "data-invalid-destroy-message" => t("actions.invalid_destroy.proposals_count", count: present(meeting).authored_proposals.size, scope: "decidim.meetings"),
+                                "data-proposal-titles" => present(meeting).formatted_proposals_titles) do
+                      content_tag(:span,
+                                  data: { tooltip: true, disable_hover: false, click_open: false },
+                                  title: t("actions.destroy", scope: "decidim.meetings")) do
+                        icon("delete-bin-line")
+                      end
+                    end
+                  %>
                 <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate meetings, theme: "decidim" %>
-    </div>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_meetings_admin" %>
+<%= decidim_paginate meetings %>
+<%= append_javascript_pack_tag "decidim_meetings_admin" %>

data/app/views/decidim/meetings/admin/meetings/new.html.erb

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

data/app/views/decidim/meetings/admin/poll/_answer_option.html.erb

@@ -5,7 +5,8 @@
     <h2 class="card-title">
     <span><%= t("answer_option", scope: "decidim.forms.admin.questionnaires.answer_option") %></span>
     <% if editable %>
-      <button class="button small alert hollow remove-answer-option button--title">
+      <button class="button button__sm button__transparent-secondary small alert hollow remove-answer-option button--title mb-2">
+        <%= icon("delete-bin-line") %>
         <%= t("remove", scope: "decidim.forms.admin.questionnaires.answer_option") %>
       </button>
     <% end %>

data/app/views/decidim/meetings/admin/poll/_answer_option_template.html.erb

@@ -2,6 +2,6 @@
 
 <script type="text/template" class="decidim-answer-option-template decidim-template" id="<%= template_id %>">
   <%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", blank_answer_option do |answer_option_form| %>
-    <%= render "decidim/meetings/admin/poll/answer_option", form: answer_option_form, question: question, editable: editable %>
+    <%= render "decidim/meetings/admin/poll/answer_option", form: answer_option_form, question:, editable: %>
   <% end %>
 </script>