decidim-meetings 0.27.4 → 0.28.0.rc5

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

@@ -1,63 +1,48 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= edit_questionnaire_title %>
-      <% if questionnaire.answers.any? %>
-        <div class="button--title">
-          <%= export_dropdown(current_component, questionnaire.id) if allowed_to?(:export_answers, :questionnaire) %>
-        </div>
-      <% else %>
-        <button class="button tiny button--title" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></button>
-      <% end %>
-    </h2>
-  </div>
-</div>
-
 <div class="questionnaire-questions">
   <div class="row column text-center">
-    <button type="button" class="button collapse-all"><%= t("collapse", scope: "decidim.forms.admin.questionnaires.form") %></button>
-    <button type="button" class="button expand-all"><%= t("expand", scope: "decidim.forms.admin.questionnaires.form") %></button>
+    <button type="button" class="button button__sm button__secondary collapse-all"><%= t("collapse", scope: "decidim.forms.admin.questionnaires.form") %></button>
+    <button type="button" class="button button__sm button__secondary expand-all"><%= t("expand", scope: "decidim.forms.admin.questionnaires.form") %></button>
   </div>
 
   <% if questionnaire.questions_editable? %>
     <%= fields_for "questionnaire[questions][#{blank_question.to_param}]", blank_question do |question_form| %>
       <script type="text/template" class="decidim-question-template decidim-template" id="question-template">
         <%= render "decidim/meetings/admin/poll/question",
-              form: question_form,
-              id: tabs_id_for_question(blank_question),
-              editable: questionnaire.questions_editable?,
-              answer_option_template_selector: "#answer-option-template-dummy" %>
+                   form: question_form,
+                   id: tabs_id_for_question(blank_question),
+                   editable: questionnaire.questions_editable?,
+                   answer_option_template_selector: "#answer-option-template-dummy" %>
       </script>
       <%= render "decidim/meetings/admin/poll/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-dummy" %>
     <% end %>
   <% else %>
-    <div class="callout warning">
-      <%= t("already_answered_warning", scope: "decidim.forms.admin.questionnaires.form") %>
-    </div>
+    <%= cell("decidim/announcement", t("already_answered_warning", scope: "decidim.forms.admin.questionnaires.form"), callout_class: "warning" ) %>
   <% end %>
 
-  <div class="questionnaire-questions-list">
+  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0">
     <% @form.questions.each_with_index do |question, index| %>
       <%= fields_for "questionnaire[questions][]", question do |question_form| %>
         <%= render "decidim/meetings/admin/poll/question",
-              form: question_form,
-              id: tabs_id_for_question(question),
-              editable: questionnaire.questions_editable?,
-              answer_option_template_selector: "#answer-option-template-#{index}" %>
+                   form: question_form,
+                   id: tabs_id_for_question(question),
+                   editable: questionnaire.questions_editable?,
+                   answer_option_template_selector: "#answer-option-template-#{index}" %>
         <%= render "decidim/meetings/admin/poll/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-#{index}" %>
       <% end %>
     <% end %>
   </div>
 
   <% if questionnaire.questions_editable? %>
-    <button class="button add-question"><%= t("add_question", scope: "decidim.forms.admin.questionnaires.form") %></button>
+    <button class="button button__sm button__secondary add-question"><%= t("add_question", scope: "decidim.forms.admin.questionnaires.form") %></button>
   <% end %>
 </div>
 
-<%= javascript_pack_tag "decidim_forms_admin", defer: false %>
+<%= append_javascript_pack_tag "decidim_forms_admin" %>
 
 <% if questionnaire.questions_editable? %>
   <script>
-    window.Decidim.createEditableForm()
+    document.addEventListener("DOMContentLoaded", function () {
+      window.Decidim.createEditableForm()
+    })
   </script>
 <% end %>

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

@@ -1,96 +1,102 @@
 <% question = form.object %>
 <% is_expanded = question.errors.any? %>
-
 <div class="card questionnaire-question" id="<%= id %>-field">
-  <div class="card-divider question-divider">
-    <h2 class="card-title">
-      <span>
-        <% if editable %>
-          <%== icon("move") %>
-        <% end %>
-        <%= dynamic_title(translated_attribute(question.body), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t("question", scope: "decidim.forms.admin.questionnaires.question")) %>
-      </span>
-
-      <button type="button" class="button small secondary button--title question--collapse" data-toggle="<%= id %>-question-card button--collapse-question-<%= id %> button--expand-question-<%= id %>">
-        <span id="button--collapse-question-<%= id %>" data-toggler=".hide" class="icon-collapse <%= "hide" unless is_expanded %>">
-          <%== icon("caret-top", aria_label: t("collapse", scope: "decidim.forms.admin.questionnaires.question"), role: "img") %>
+  <div class="form__wrapper" data-component="accordion">
+    <div class="card-divider question-divider">
+      <h2 class="card-title">
+        <span>
+          <% if editable %>
+            <%== icon("drag-move-2-fill") %>
+          <% end %>
+          <%= dynamic_title(translated_attribute(question.body), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t("question", scope: "decidim.forms.admin.questionnaires.question")) %>
         </span>
 
-        <span id="button--expand-question-<%= id %>" data-toggler=".hide" class="icon-expand <%= "hide" if is_expanded %>">
-          <%== icon("caret-bottom", aria_label: t("expand", scope: "decidim.forms.admin.questionnaires.question"), role: "img") %>
-        </span>
-      </button>
+        <span class="ml-auto flex flex-row-reverse items-center gap-2">
+          <button id="<%= id %>-button" type="button" class="question--collapse <%= "question-error" if is_expanded %>" data-controls="panel-<%= id %>-question-card">
+            <span class="icon-collapse">
+              <%== icon "arrow-up-s-line", aria_label: t("collapse", scope: "decidim.forms.admin.questionnaires.question"), role: "img" %>
+            </span>
 
-      <% if editable %>
-        <button class="button small alert hollow move-up-question button--title">
-          <%== "#{icon("arrow-top")} #{t("up", scope: "decidim.forms.admin.questionnaires.question")}" %>
-        </button>
+            <span class="icon-expand">
+              <%== icon "arrow-down-s-line", aria_label: t("expand", scope: "decidim.forms.admin.questionnaires.question"), role: "img" %>
+            </span>
+          </button>
 
-        <button class="button small alert hollow move-down-question button--title">
-          <%== "#{icon("arrow-bottom")} #{t("down", scope: "decidim.forms.admin.questionnaires.question")}" %>
-        </button>
+          <% if editable %>
+            <button class="button button__sm button__transparent-secondary small alert hollow move-up-question button--title">
+              <%= icon "arrow-up-line" %>
+              <span><%= t("up", scope: "decidim.forms.admin.questionnaires.question") %></span>
+            </button>
 
-        <button class="button small alert hollow remove-question button--title">
-          <%= t("remove", scope: "decidim.forms.admin.questionnaires.question") %>
-        </button>
-      <% end %>
-    </h2>
-  </div>
+            <button class="button button__sm button__transparent-secondary small alert hollow move-down-question button--title">
+              <%= icon "arrow-down-line" %>
+              <span><%= t("down", scope: "decidim.forms.admin.questionnaires.question") %></span>
+            </button>
 
-  <div class="card-section collapsible <%= "hide" unless is_expanded %>" data-toggler=".hide" id="<%= id %>-question-card">
-    <div class="row column">
-      <%=
-        form.translated(
-          :text_field,
-          :body,
-          tabs_id: id,
-          label: t("statement", scope: "decidim.forms.admin.questionnaires.question"),
-          disabled: !editable
-        )
-      %>
+            <button class="button button__sm button__transparent-secondary small alert hollow remove-question button--title">
+              <%= t("remove", scope: "decidim.forms.admin.questionnaires.question") %>
+            </button>
+          <% end %>
+        </span>
+      </h2>
     </div>
 
-    <div class="row column">
-      <%=
-        form.select(
-          :question_type,
-          options_from_collection_for_select(question_types, :first, :last, question.question_type),
-          {},
-          disabled: !editable
-        )
-      %>
-    </div>
+    <div id="panel-<%= id %>-question-card" class="panel-question-card card-section collapsible <%= "panel-error" if is_expanded %>">
+      <div class="row column">
+        <%=
+          form.translated(
+            :text_field,
+            :body,
+            tabs_id: id,
+            label: t("statement", scope: "decidim.forms.admin.questionnaires.question"),
+            disabled: !editable
+          )
+        %>
+      </div>
 
-    <% if question.persisted? %>
-      <%= form.hidden_field :id, disabled: !editable %>
-    <% end %>
+      <div class="row column">
+        <%=
+          form.select(
+            :question_type,
+            options_from_collection_for_select(question_types, :first, :last, question.question_type),
+            {},
+            disabled: !editable
+          )
+        %>
+      </div>
+
+      <% if question.persisted? %>
+        <%= form.hidden_field :id, disabled: !editable %>
+      <% end %>
 
-    <%= form.hidden_field :position, value: question.position || 0, disabled: !editable %>
-    <%= form.hidden_field :deleted, disabled: !editable %>
+      <%= form.hidden_field :position, value: question.position || 0, disabled: !editable %>
+      <%= form.hidden_field :deleted, disabled: !editable %>
 
-    <div class="questionnaire-question-answer-options" data-template="<%= answer_option_template_selector %>">
-      <div class="questionnaire-question-answer-options-list">
-        <% question.answer_options.each do |answer_option| %>
-          <%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", answer_option do |answer_option_form| %>
-            <%= render "decidim/meetings/admin/poll/answer_option", form: answer_option_form, question: question, editable: editable %>
+      <div class="questionnaire-question-answer-options" data-template="<%= answer_option_template_selector %>">
+        <div class="questionnaire-question-answer-options-list">
+          <% question.answer_options.each do |answer_option| %>
+            <%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", answer_option do |answer_option_form| %>
+              <%= render "decidim/meetings/admin/poll/answer_option", form: answer_option_form, question:, editable: %>
+            <% end %>
           <% end %>
+        </div>
+        <% if editable %>
+          <div class="row column">
+            <button type="button" class="button button__sm button__secondary mt-4 add-answer-option"><%= t("add_answer_option", scope: "decidim.forms.admin.questionnaires.question") %></button>
+          </div>
         <% end %>
       </div>
 
-      <% if editable %>
-        <button class="button add-answer-option"><%= t("add_answer_option", scope: "decidim.forms.admin.questionnaires.question") %></button>
-      <% end %>
-    </div>
-
-    <div class="row column questionnaire-question-max-choices">
-      <%=
-        form.select(
-          :max_choices,
-          (2..question.number_of_options),
-          { include_blank: t("any", scope: "decidim.forms.admin.questionnaires.question") },
-          disabled: !editable
-        )
-      %>
+      <div class="row column questionnaire-question-max-choices">
+        <%=
+          form.select(
+            :max_choices,
+            (2..question.number_of_options),
+            { include_blank: t("any", scope: "decidim.forms.admin.questionnaires.question") },
+            disabled: !editable
+          )
+        %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -1,9 +1,29 @@
-<%= decidim_form_for(@form, url: update_url, method: :put, html: { class: "form edit_questionnaire" }) do |form| %>
-  <%= render partial: "decidim/meetings/admin/poll/form", object: form %>
+<% add_decidim_page_title(edit_questionnaire_title) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= edit_questionnaire_title %>
+    <% if questionnaire.answers.any? %>
+      <div class="button--title">
+        <%= export_dropdown(current_component, questionnaire.id) if allowed_to?(:export_answers, :questionnaire) %>
+      </div>
+    <% else %>
+      <button class="button button__sm button__secondary" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></button>
+    <% end %>
+  </h2>
+</div>
 
-  <% if questionnaire.questions_editable? %>
-    <div class="button--double form-general-submit">
-      <%= form.submit t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button" %>
-    </div>
-  <% end %>
-<% end %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: update_url, method: :put, html: { class: "form-defaults form edit_questionnaire" }) do |form| %>
+      <%= render partial: "decidim/meetings/admin/poll/form", object: form %>
+
+      <% if questionnaire.questions_editable? %>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= form.submit t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button button__sm button__secondary" %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,59 +1,36 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t(".title") %>
-      <%= link_to t(".invites"), meeting_registrations_invites_path(meeting), class: "button tiny button--title #{'disabled' unless allowed_to? :read_invites, :meeting, meeting: meeting}" %>
-      <% if allowed_to? :export_registrations, :meeting, meeting: meeting %>
-        <span class="exports dropdown tiny button button--simple button--title" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></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.#{current_component.manifest.name}.admin.exports.registrations"), export_format: format), export_meeting_registrations_path(meeting_id: meeting, format: format) %></li>
-            <% end %>
-          </ul>
-        </div>
-      <% end %>
-      <%= link_to t(".registration_form"), edit_meeting_registrations_form_path(meeting_id: meeting.id), class: "button tiny button--title" %>
-    </h2>
-  </div>
-
-  <div class="card-section">
-    <div class="callout alert">
-      <%= t(".recommendation_message") %>
-    </div>
-
-    <div class="row column">
-      <%= form.check_box :registrations_enabled %>
-    </div>
-
-    <div class="row column">
-      <%= form.check_box :registration_form_enabled %>
-    </div>
-
-    <div class="row column">
-      <p><%= t(".registrations_count", count: meeting.registrations.count) %></p>
-      <%= form.number_field :available_slots %>
-      <p class="help-text"><%= t(".available_slots_help") %></p>
-    </div>
-
-    <div class="row column">
-      <%= form.number_field :reserved_slots %>
-      <p class="help-text"><%= t(".reserved_slots_help") %></p>
-    </div>
-
-    <div class="row column">
-      <%= form.check_box :customize_registration_email, :"data-toggle" => "customize_registration_email-div" %>
-    </div>
-
-    <div id="customize_registration_email-div" data-toggler=".hide" class="row column <%= @form.customize_registration_email? ? nil : "hide" %>">
-      <%= form.translated :editor, :registration_email_custom_content, lines: 10 %>
-      <p class="help-text"><%= t(".registration_email_help") %></p>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :editor, :registration_terms, toolbar: :content %>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.check_box :registrations_enabled %>
+      </div>
+
+      <div class="row column">
+        <%= form.check_box :registration_form_enabled %>
+      </div>
+
+      <div class="row column">
+        <p><%= t(".registrations_count", count: meeting.registrations.count) %></p>
+        <%= form.number_field :available_slots, help_text: t(".available_slots_help") %>
+      </div>
+
+      <div class="row column">
+        <%= form.number_field :reserved_slots, help_text: t(".reserved_slots_help") %>
+      </div>
+
+      <div class="row column">
+        <%= form.check_box :customize_registration_email %>
+      </div>
+
+      <div id="customize_registration_email-div" class="row column hidden">
+        <%= form.translated :editor, :registration_email_custom_content, lines: 10, help_text: t(".registration_email_help") %>
+      </div>
+
+      <div class="row column">
+        <%= form.translated :editor, :registration_terms, toolbar: :content, aria: { label: :registration_terms } %>
+      </div>
     </div>
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_meetings_admin" %>
+<%= append_javascript_pack_tag "decidim_meetings_admin" %>

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

@@ -1,33 +1,66 @@
-<% if meeting.component.settings.registration_code_enabled %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= t(".validate_registration_code") %>
-      </h2>
+<% add_decidim_page_title(t("title", scope: "decidim.meetings.admin.registrations.form")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("title", scope: "decidim.meetings.admin.registrations.form") %>
+    <div class="flex items-center gap-x-4 ml-auto">
+      <%= link_to t("invites", scope: "decidim.meetings.admin.registrations.form"), meeting_registrations_invites_path(meeting), class: "button button__sm button__secondary #{"disabled" unless allowed_to? :read_invites, :meeting, meeting: meeting}" %>
+      <% if allowed_to? :export_registrations, :meeting, meeting: meeting %>
+            <span class="exports tiny 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.#{current_component.manifest.name}.admin.exports.registrations"), export_format: format), export_meeting_registrations_path(meeting_id: meeting, format:) %></li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
+      <%= link_to t("registration_form" , scope: "decidim.meetings.admin.registrations.form"), edit_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__secondary" %>
     </div>
-    <div class="card-section">
-      <%= decidim_form_for(@validation_form, url: validate_registration_code_meeting_registrations_path, html: { class: "form validate_meeting_registration_code" })  do |f| %>
-
-        <div class="grid-x grid-margin-x">
-          <div class="auto cell">
-            <%= f.text_field :code %>
-          </div>
+  </h2>
+</div>
 
-          <div class="shrink cell">
-            <div class="text-center mt-sm">
-              <%= f.submit t(".validate") %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <% if meeting.component.settings.registration_code_enabled %>
+      <div class="card mb-4">
+        <div class="card-divider">
+          <h2 class="card-title">
+            <%= t(".validate_registration_code") %>
+          </h2>
+        </div>
+        <div class="card-section">
+          <%= decidim_form_for(@validation_form, url: validate_registration_code_meeting_registrations_path, html: { class: "form form-defaults validate_meeting_registration_code" })  do |f| %>
+            <div class="form__wrapper">
+              <div class="card-section">
+                <div class="row column">
+                  <div>
+                    <%= f.label :code %>
+                  </div>
+                  <%= f.text_field :code, label: false %>
+                </div>
+                <div class="row column">
+                  <%= f.submit t(".validate"), class: "button button__sm button__secondary" %>
+                </div>
+              </div>
             </div>
-          </div>
+          <% end %>
         </div>
-      <% end %>
-    </div>
-  </div>
-<% end %>
+      </div>
+    <% end %>
 
-<%= decidim_form_for(@form, url: meeting_registrations_path, html: { class: "form edit_meeting_registrations" })  do |f| %>
-  <%= render partial: "form", object: f %>
+    <%= cell("decidim/announcement", t("recommendation_message", scope: "decidim.meetings.admin.registrations.form"), callout_class: "warning" ) %>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".save") %>
+    <%= decidim_form_for(@form, url: meeting_registrations_path, html: { class: "form-defaults form edit_meeting_registrations mt-4" })  do |f| %>
+      <%= render partial: "form", object: f %>
+
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".save"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,20 +1,15 @@
-<% add_decidim_page_title(t(".meetings")) %>
-
-<div class="wrapper">
-  <div class="row">
-    <h1 class="section-heading" id="meetings-count">
-      <%= render partial: "decidim/meetings/meetings/count" %>
-    </h1>
-
-    <%= cell "decidim/meetings/meetings_map", search.result %>
-
-    <div class="columns mediumlarge-4 large-3">
-      <div class="card card--secondary show-for-mediumlarge">
-          <%= render partial: "filters" %>
-      </div>
-    </div>
-    <div id="meetings" class="columns mediumlarge-8 large-9">
-      <%= render partial: "meetings" %>
-    </div>
-  </div>
-</div>
+<%= render partial: "decidim/meetings/shared/index", locals: {
+      display_map: Decidim::Map.available?(:geocoding, :dynamic),
+      display_announcement: false,
+      component: nil,
+      search_variable: :title_or_description_cont,
+      filter_options: {
+        date: !@forced_past_meetings,
+        type: true,
+        directory_scopes: true,
+        directory_categories: true,
+        origin: true,
+        space_type: true,
+        activity: current_user.present?
+      }
+    } %>

data/app/views/decidim/meetings/directory/meetings/index.js.erb

@@ -1,23 +1 @@
-var $meetings = $('#meetings');
-var $meetingsCount = $('#meetings-count');
-
-// make sure that calendar modal will use the updated filter values
-var $calendarShare = $('#calendarShare');
-$calendarShare.remove();
-
-$meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
-$meetingsCount.html('<%= j(render partial: "decidim/meetings/meetings/count").strip.html_safe %>');
-
-var $dropdownMenu = $('.dropdown.menu', $meetings);
-$dropdownMenu.foundation();
-
-$("#calendarShare").foundation(); // initialize export calendar on the page
-
-var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result).to_json.html_safe %>');
-
-var $map = $("#map");
-var controller = $map.data("map-controller");
-if (controller) {
-  controller.clearMarkers();
-  controller.addMarkers(markerData);
-}
+<%= render partial: "decidim/meetings/shared/index", locals: { component: nil } %>

data/app/views/decidim/meetings/layouts/_aside_block.html.erb

@@ -0,0 +1,8 @@
+<div class="meeting__aside-block">
+  <div class="meeting__aside-block__item">
+    <%= icon emoji || "question-line", class: "text-gray fill-current" %>
+    <div>
+      <%= yield %>
+    </div>
+  </div>
+</div>