RubyGems - decidim-meetings - Versions diffs - 0.27.10 → 0.28.0.rc4 - Mend

decidim-meetings 0.27.10 → 0.28.0.rc4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (251) hide show

data/app/views/decidim/meetings/admin/meeting_closes/_form.html.erb CHANGED Viewed

@@ -1,43 +1,41 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :editor, :closing_report, autofocus: true, rows: 15 %>
-    </div>
-    <div class="row column">
-      <%= form.text_area :attending_organizations, rows: 5 %>
-    </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :editor, :closing_report, autofocus: true, rows: 15, aria: { label: :closing_report } %>
+      </div>
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.number_field :attendees_count, min: 0 %>
+      <div class="row column">
+        <%= form.text_area :attending_organizations, rows: 5 %>
       </div>
-      <div class="columns xlarge-6">
-        <%= form.number_field :contributions_count, min: 0 %>
+      <div class="row">
+        <div class="columns">
+          <%= form.number_field :attendees_count, min: 0 %>
+        </div>
+        <div class="columns">
+          <%= form.number_field :contributions_count, min: 0 %>
+        </div>
       </div>
-    </div>
     <% if Decidim::Meetings.enable_proposal_linking %>
       <div class="row column">
-        <%= proposals_picker(form, :proposals, proposals_picker_meeting_meeting_closes_path(meeting)) %>
+        <%= render partial: "decidim/proposals/proposals/proposals_picker", locals: { form:, field: :proposals } %>
       </div>
     <% end %>
-    <div class="row column">
-      <%= form.text_field :video_url %>
-    </div>
+      <div class="row column">
+        <%= form.text_field :video_url %>
+      </div>
-    <div class="row column">
-      <%= form.text_field :audio_url %>
-    </div>
+      <div class="row column">
+        <%= form.text_field :audio_url %>
+      </div>
-    <div class="row column">
-      <%= form.check_box :closing_visible %>
+      <div class="row column">
+        <%= form.check_box :closing_visible %>
+      </div>
     </div>
   </div>
 </div>

data/app/views/decidim/meetings/admin/meeting_closes/edit.html.erb CHANGED Viewed

@@ -1,7 +1,19 @@
-<%= decidim_form_for(@form, url: meeting_meeting_close_path(meeting, @form), html: { class: "form edit_close_meeting" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+<% add_decidim_page_title(t(".title")) %>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".close") %>
+<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: meeting_meeting_close_path(meeting, @form), html: { class: "form-defaults form edit_close_meeting" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".close"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/meetings/admin/meeting_copies/new.html.erb CHANGED Viewed

@@ -1,7 +1,18 @@
-<%= decidim_form_for(@form, url: meeting_copies_path(meeting), method: :post, html: { class: "form copy_meetings " }) do |f| %>
-  <%= render partial: "decidim/meetings/admin/meetings/form", object: f, locals: { title: t("meeting_copies.new.title", scope: "decidim.admin"), select: t("meeting_copies.new.select", scope: "decidim.admin") } %>
-  <div class="button--double form-general-submit">
-    <%= f.submit t("meeting_copies.new.copy", scope: "decidim.admin") %>
+<% add_decidim_page_title(t("meeting_copies.new.title", scope: "decidim.admin")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("meeting_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: meeting_copies_path(meeting), method: :post, html: { class: "form form-defaults copy_meetings " }) do |f| %>
+      <%= render partial: "decidim/meetings/admin/meetings/form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("meeting_copies.new.copy", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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>