decidim-meetings 0.24.1 → 0.25.0.rc2

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

@@ -0,0 +1,34 @@
+<% answer_option = form.object %>
+
+<div class="card questionnaire-question-answer-option">
+  <div class="card-divider">
+    <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">
+        <%= t("remove", scope: "decidim.forms.admin.questionnaires.answer_option") %>
+      </button>
+    <% end %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%=
+        form.translated(
+          :text_field,
+          :body,
+          tabs_id: tabs_id_for_question_answer_option(question, answer_option),
+          label: t("statement", scope: "decidim.forms.admin.questionnaires.answer_option"),
+          disabled: !editable
+        )
+      %>
+    </div>
+  </div>
+
+  <% if answer_option.persisted? %>
+    <%= form.hidden_field :id, disabled: !editable %>
+  <% end %>
+
+  <%= form.hidden_field :deleted, disabled: !editable %>
+</div>

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

@@ -0,0 +1,7 @@
+<% question = form.object %>
+
+<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 %>
+  <% end %>
+</script>

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

@@ -0,0 +1,63 @@
+<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>
+  </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" %>
+      </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>
+  <% end %>
+
+  <div class="questionnaire-questions-list">
+    <% @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}" %>
+        <%= 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>
+  <% end %>
+</div>
+
+<%= javascript_pack_tag "decidim_forms_admin", defer: false %>
+
+<% if questionnaire.questions_editable? %>
+  <script>
+    window.Decidim.createEditableForm()
+  </script>
+<% end %>

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

@@ -0,0 +1,96 @@
+<% 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") %>
+        </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>
+
+      <% 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>
+
+        <button class="button small alert hollow move-down-question button--title">
+          <%== "#{icon("arrow-bottom")} #{t("down", scope: "decidim.forms.admin.questionnaires.question")}" %>
+        </button>
+
+        <button class="button small alert hollow remove-question button--title">
+          <%= t("remove", scope: "decidim.forms.admin.questionnaires.question") %>
+        </button>
+      <% end %>
+    </h2>
+  </div>
+
+  <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
+        )
+      %>
+    </div>
+
+    <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 %>
+
+    <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 %>
+          <% end %>
+        <% 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>
+  </div>
+</div>

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

@@ -0,0 +1,9 @@
+<%= 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 %>
+
+  <% 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 %>

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

@@ -47,4 +47,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/meetings/admin/registrations_form" %>
+<%= javascript_pack_tag "decidim_meetings_admin" %>

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

@@ -2,7 +2,9 @@
 
 <div class="wrapper">
   <div class="row">
-    <h1 class="section-heading"><%= t(".meetings") %></h1>
+    <h1 class="section-heading" id="meetings-count">
+      <%= render partial: "decidim/meetings/meetings/count" %>
+    </h1>
 
     <%= cell "decidim/meetings/meetings_map", search.results %>
 
@@ -13,7 +15,7 @@
           <div class="filters__section">
             <div class="filters__search">
               <div class="input-group">
-                <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search") %>
+                <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search") %>
                 <div class="input-group-button">
                   <button type="submit" class="button">
                     <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -33,5 +35,3 @@
     </div>
   </div>
 </div>
-
-<%= javascript_include_tag("decidim/filters") %>

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

@@ -1,6 +1,8 @@
 var $meetings = $('#meetings');
+var $meetingsCount = $('#meetings-count');
 
 $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();

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

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="<%= I18n.locale %>" class="no-js">
+  <head>
+    <title><%= decidim_page_title %></title>
+    <%= render partial: "layouts/decidim/head" %>
+    <%= javascript_pack_tag "decidim_meetings" %>
+    <%= render partial: "layouts/decidim/js_configuration" %>
+  </head>
+
+  <body>
+    <header class="meeting-polls__header">
+      <% if current_user && poll %>
+        <div class="flex--cc">
+          <button class="meeting-polls__button meeting-polls__action-list">
+            <%= t(".questions") %> <span id="visible-questions-count">(<%= questionnaire.questions.visible.count %>)</span>
+          </button>
+
+          <% if admin_allowed_to?(:update, :poll, meeting: meeting, poll: poll) %>
+            <button class="meeting-polls__button meeting-polls__action-administrate"><%= t(".administrate") %></button>
+          <% end %>
+        </div>
+      <% end %>
+
+      <div>
+        <strong class="text-secondary"><%= current_organization.name %></strong> / <strong><%= present(meeting).title(links: true) %></strong>
+      </div>
+
+      <div class="flex--cc">
+        <% if current_user %>
+          <span>
+            <%= link_to current_user.name, decidim.account_path, target: "_blank", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name) %>
+          </span>
+        <% end %>
+
+        <span class="meeting-polls__close">
+          <%= link_to meeting_path(meeting), "aria-label": t(".close") do %>
+            <%= t(".close") %>
+            <%= icon "x", class: "text-small" %>
+          <% end %>
+        </span>
+      </div>
+    </header>
+
+    <main class="meeting-polls__main">
+      <aside class="meeting-polls__aside" id="meeting-poll-aside" data-decidim-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting) %>"}'></aside>
+      <aside class="meeting-polls__aside" id="admin-meeting-poll-aside" data-decidim-admin-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting, admin: true) %>"}'></aside>
+      <%= yield %>
+    </main>
+  </body>
+</html>

data/app/views/decidim/meetings/live_events/show.html.erb

@@ -0,0 +1,12 @@
+<% provide(:title, present(meeting).title) %>
+
+<% add_decidim_meta_tags({
+  title: present(meeting).title,
+  description: present(meeting).description,
+  url: meeting_url(meeting.id)
+}) %>
+
+<aside class="meeting-polls__aside"></aside>
+<div class="meeting-polls__iframe">
+  <%== live_meeting_embed_code %>
+</div>

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

@@ -3,5 +3,12 @@
 </div>
 
 <div class="field hashtags__container">
-  <%= proposals_picker(form, :proposals, proposals_picker_meeting_meeting_closes_path(meeting)) %>
+  <%= form.number_field :attendees_count, min: 0 %>
+  <div class="help-text help-text-form-required-fields"><%= t("decidim.forms.meetings.attendees_count_help_text") %></div>
 </div>
+
+<% if Decidim::Meetings.enable_proposal_linking %>
+  <div class="field hashtags__container">
+    <%= proposals_picker(form, :proposals, proposals_picker_meeting_meeting_closes_path(meeting)) %>
+  </div>
+<% end %>

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

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="columns large-3">
     <%= link_to :back do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img" %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
       <%= t(".back") %>
     <% end %>
   </div>

data/app/views/decidim/meetings/meetings/_calendar_modal.html.erb

@@ -0,0 +1,26 @@
+<div class="text-center">
+  <button class="share-link link text-center" data-open="calendarShare">
+    <%= t("add_to_calendar", scope: "decidim.meetings.meetings.calendar_modal" ) %>
+    <%= icon "calendar", class: "icon--after", role: "img", "aria-hidden": true %>
+  </button>
+</div>
+
+<div class="reveal" id="calendarShare" data-reveal>
+  <div class="reveal__header">
+    <h2 class="reveal__title"><%= t("add_to_calendar", scope: "decidim.meetings.meetings.calendar_modal") %></h2>
+    <button class="close-button" data-close aria-label="<%= t("close_window", scope: "decidim.meetings.meetings.calendar_modal") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <ul>
+    <li>
+      <%= link_to t("outlook", scope: "decidim.meetings.meetings.calendar_modal"), ics_url %>
+    </li>
+    <li>
+      <%= link_to t("apple", scope: "decidim.meetings.meetings.calendar_modal"), ics_url %>
+    </li>
+    <li>
+      <%= link_to t("google", scope: "decidim.meetings.meetings.calendar_modal"), google_url, target: "_blank" %>
+    </li>
+  </ul>
+</div>

data/app/views/decidim/meetings/meetings/_filters.html.erb

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="meetings">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>

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

@@ -33,6 +33,11 @@
   <p class="help-text"><%= t(".online_meeting_url_help") %></p>
 </div>
 
+<div class="field" data-meeting-type="online">
+  <%= form.check_box :show_embedded_iframe %>
+  <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+</div>
+
 <div class="field">
   <%= form.datetime_field :start_time %>
 </div>
@@ -82,4 +87,4 @@
   ) %>
 </div>
 
-<%= javascript_include_tag "decidim/meetings/meetings_form" %>
+<%= javascript_pack_tag "decidim_meetings" %>

data/app/views/decidim/meetings/meetings/_linked_meetings.html.erb

@@ -4,7 +4,7 @@
       <div class="card card--meeting">
         <div class="card__content">
           <%= link_to resource_locator(meeting).path, class: "card__link" do %>
-            <h5 class="card__title"><%= present(meeting).title %></h5>
+            <h5 class="card__title"><%= present(meeting).title(html_escape: true) %></h5>
           <% end %>
           <div class="card__datetime">
             <div class="card__datetime__date">

data/app/views/decidim/meetings/meetings/_meeting_minutes.html.erb

@@ -1,42 +1,31 @@
 <div class="section minutes-section">
-  <h3 class="section-heading"><%= t(".meeting_minutes") %></h3>
-  <% if translated_attribute(meeting.minutes.description).present? %>
-    <div class="card">
-      <div class="card-section">
-        <div class="row column">
-          <%= decidim_sanitize translated_attribute meeting.minutes.description %>
-        </div>
-      </div>
-    </div>
-  <% end %>
-
-  <% if meeting.minutes.video_url.presence || meeting.minutes.audio_url.presence %>
+  <% if meeting.video_url.presence || meeting.audio_url.presence %>
     <div class="section">
       <h4 class="section-heading"><%= t(".related_information") %></h4>
       <div class="card card--list">
-        <% if meeting.minutes.video_url.presence %>
+        <% if meeting.video_url.presence %>
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to decidim_url_escape(meeting.minutes.video_url), decidim_html_escape(meeting.minutes.video_url), target: "_blank", rel: "noopener" %>
+                <%= link_to decidim_url_escape(meeting.video_url), decidim_html_escape(meeting.video_url), target: "_blank", rel: "noopener" %>
               </div>
             </div>
             <div class="card--list__data" aria-hidden="true">
-              <%= link_to decidim_url_escape(meeting.minutes.video_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
+              <%= link_to decidim_url_escape(meeting.video_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
                 <%= icon "external-link", role: "img", "aria-hidden": true %>
               <% end %>
             </div>
           </div>
         <% end %>
-        <% if meeting.minutes.audio_url.presence %>
+        <% if meeting.audio_url.presence %>
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to decidim_url_escape(meeting.minutes.audio_url), decidim_html_escape(meeting.minutes.audio_url), target: "_blank", rel: "noopener" %>
+                <%= link_to decidim_url_escape(meeting.audio_url), decidim_html_escape(meeting.audio_url), target: "_blank", rel: "noopener" %>
               </div>
             </div>
             <div class="card--list__data" aria-hidden="true">
-              <%= link_to decidim_url_escape(meeting.minutes.audio_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
+              <%= link_to decidim_url_escape(meeting.audio_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
                 <%= icon "external-link", role: "img", "aria-hidden": true %>
               <% end %>
             </div>