decidim-proposals 0.20.1 → 0.23.1

data/app/views/decidim/proposals/collaborative_drafts/_wizard_aside.html.erb

@@ -1,8 +1,8 @@
 <div class="columns large-3">
   <div class="m-bottom">
     <%= link_to :back do %>
-      <%= icon "chevron-left", class: "icon--small" %>
-      <%= wizard_aside_back_text %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= wizard_aside_back_text("collaborative_draft") %>
     <% end %>
   </div>
   <div class="section">
@@ -11,6 +11,8 @@
     </p>
   </div>
   <div class="show-for-large">
+    <div><%= proposal_wizard_steps_title %></div>
+    <div><%= proposal_wizard_current_step_of(@step) %></div>
     <%= proposal_wizard_stepper(@step) %>
   </div>
 </div>

data/app/views/decidim/proposals/collaborative_drafts/compare.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 

data/app/views/decidim/proposals/collaborative_drafts/complete.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 

data/app/views/decidim/proposals/collaborative_drafts/edit.html.erb

@@ -1,6 +1,8 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row columns">
   <%= link_to :back, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small" %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= t(".back") %>
   <% end %>
   <h2 class="section-heading"><%= t(".title") %></h2>

data/app/views/decidim/proposals/collaborative_drafts/index.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
+
 <%= render partial: "decidim/shared/component_announcement" %>
 
 <div class="row columns">
@@ -15,9 +17,9 @@
       <%= render partial: "filters" %>
     </div>
   </div>
-  <div id="collaborative_drafts" class="columns mediumlarge-8 large-9">
+  <div id="collaborative_drafts" class="columns mediumlarge-8 large-9" aria-live="polite">
     <%= render partial: "collaborative_drafts" %>
   </div>
 </div>
 <%= javascript_include_tag "decidim/filters" %>
-<%= javascript_include_tag "decidim/orders" %>
+<%= javascript_include_tag "decidim/results_listing" %>

data/app/views/decidim/proposals/collaborative_drafts/new.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 
@@ -7,6 +9,8 @@
     <div class="card">
       <div class="card__content">
         <%= decidim_form_for(@form, url: compare_collaborative_drafts_path, method: :get) do |form| %>
+          <%= form_required_explanation %>
+
           <div class="field">
             <%= form.text_field :title %>
           </div>

data/app/views/decidim/proposals/collaborative_drafts/show.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
 <% add_decidim_meta_tags({
   description: present(@collaborative_draft).body,
   title: present(@collaborative_draft).title,
@@ -14,7 +15,7 @@
 
 <div class="row column view-header">
   <%= link_to collaborative_drafts_path do %>
-    <%= icon "chevron-left", class: "icon--small" %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= t(".back") %>
   <% end %>
 
@@ -26,15 +27,29 @@
 </div>
 
 <div class="row">
-  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
+  <div class="columns mediumlarge-8 large-9">
+    <div class="section">
+      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
+
+      <%= simple_format(present(@collaborative_draft).body(links: true, strip_tags: true), nil, sanitize: false) %>
+
+      <% if component_settings.geocoding_enabled? %>
+        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
+      <% end %>
+
+      <%= cell "decidim/tags", @collaborative_draft, context: { extra_classes: ["tags--collaborative-draft"] } %>
+    </div>
+  </div>
+
+  <div class="columns section view-side mediumlarge-4 large-3">
     <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
       <div class="card text-center" id="collaborative_draft_publish">
         <div class="card__content">
           <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
-          <small>
+          <div class="text-small">
             <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
             <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
-          </small>
+          </div>
         </div>
       </div>
     <% end %>
@@ -45,29 +60,27 @@
           <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
         <% else %>
           <div>
-            <strong class="text-large text-uppercase">
-              <%= t("version", scope:"decidim.proposals.collaborative_drafts.show", number: "#{@collaborative_draft.versions_count}") %>
-            </strong>
-            <small class="text-medium">
-              <%= t("of_versions", scope:"decidim.proposals.collaborative_drafts.show", number: "#{@collaborative_draft.versions_count}") %>
-            </small>
+            <%= resource_version_number(@collaborative_draft.versions_count, "text-large") %>
+            <div class="text-medium">
+              <%= resource_version_of(@collaborative_draft.versions_count) %>
+            </div>
           </div>
 
           <div>
             <span class="text-medium">
-              <%= link_to t("see_other_versions", scope:"decidim.proposals.collaborative_drafts.show"), collaborative_draft_versions_path(@collaborative_draft) %>
+              <%= link_to_other_resource_versions(collaborative_draft_versions_path(@collaborative_draft)) %>
             </span>
           </div>
         <% end %>
 
         <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-          <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button secondary hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
+          <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
         <% end %>
 
         <%= render "request_access_form" %>
 
         <% if @collaborative_draft.requesters.include? current_user %>
-          <button type="button" class="button secondary light expanded button--sc mt-s">
+          <button type="button" class="button expanded button--sc mt-s">
             <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
           </button>
         <% end %>
@@ -77,21 +90,21 @@
         <ul class="card-data">
           <li class="card-data__item authors_status">
             <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.authors") do %>
-              <%= icon("people", class: "icon--small") + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
+              <%= icon("people", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
             <% end %>
           </li>
 
           <li class="card-data__item versions_status">
             <%= link_to collaborative_draft_versions_path(@collaborative_draft) do %>
               <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.contributions") do %>
-                <%= icon("pencil", class: "icon--small") + " " + "#{@collaborative_draft.versions.count}" %>
+                <%= icon("pencil", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.count}" %>
               <% end %>
             <% end %>
           </li>
           <li class="card-data__item">
             <%= link_to "#comments" do %>
               <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
-                <%= icon("comment-square", class: "icon--small") + " " + "#{@collaborative_draft.comments.count}" %>
+                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments_count}" %>
               <% end %>
             <% end %>
           </li>
@@ -105,20 +118,6 @@
 
     <%= render partial: "decidim/shared/share_modal" %>
   </div>
-
-  <div class="columns mediumlarge-8 mediumlarge-pull-4">
-    <div class="section">
-      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
-
-      <%= simple_format(present(@collaborative_draft).body(links: true, strip_tags: true), nil, sanitize: false) %>
-
-      <% if component_settings.geocoding_enabled? %>
-        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
-      <% end %>
-
-      <%= cell "decidim/tags", @collaborative_draft, context: { extra_classes: ["tags--collaborative-draft"] } %>
-    </div>
-  </div>
 </div>
 
 <%= attachments_for @collaborative_draft %>

data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb

@@ -1,9 +1,11 @@
+<%= form_required_explanation %>
+
 <div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title %>
+  <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
 </div>
 
 <div class="field hashtags__container">
-  <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true, value: form_presenter.body(extras: false).strip %>
+  <%= text_editor_for_proposal_body(form) %>
 </div>
 
 <% if @form.component_automatic_hashtags.any? %>
@@ -21,7 +23,7 @@
 
 <% if @form.component_suggested_hashtags.any? %>
   <div class="field">
-    <%= form.label :suggested_hashtags %>
+    <%= form.label :suggested_hashtags, nil, for: nil %>
     <div class="checkboxes hashtags">
       <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
         option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
@@ -30,25 +32,25 @@
   </div>
 <% end %>
 
-<% if component_settings.geocoding_enabled? %>
+<% if @form.geocoding_enabled? %>
   <div class="field">
     <%= form.check_box :has_address, checked: form_has_address? %>
   </div>
 
   <div class="field" id="address_input">
-    <%= form.text_field :address %>
+    <%= form.geocoding_field :address %>
   </div>
 <% end %>
 
 <% if @form.categories&.any? %>
   <div class="field">
-    <%= form.categories_select :category_id, @form.categories, prompt: t("decidim.proposals.proposals.edit.select_a_category") %>
+    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.proposals.edit.select_a_category") %>
   </div>
 <% end %>
 
-<% if current_participatory_space.has_subscopes? %>
+<% if current_component.has_subscopes? %>
   <div class="field">
-    <%= scopes_picker_field form, :scope_id %>
+    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
   </div>
 <% end %>
 
@@ -59,23 +61,51 @@
 <% end %>
 
 <% if component_settings.attachments_allowed? && @proposal %>
+  <fieldset>
+    <legend><%= t("gallery_legend", scope: "decidim.proposals.proposals.edit") %></legend>
+
+    <% if @form.photos.any? %>
+      <% @form.photos.each do |photo| %>
+        <div class="callout gallery__item" data-closable>
+          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.file.filename %>
+          <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
+          <button class="close-button"
+                  aria-label="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
+                  title="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
+                  type="button"
+                  data-close>
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+      <% end %>
+    <% end %>
+
+    <div class="row column">
+      <%= form.file_field :add_photos, multiple: false, label: t("add_images", scope: "decidim.proposals.proposals.edit") %>
+    </div>
+  </fieldset>
+
   <fieldset>
     <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-    <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
-      <div class="field">
-        <%= nested_form.text_field :title %>
-      </div>
 
-      <div class="field">
-        <%= nested_form.upload :file, optional: false %>
-        <% if @form.errors[:attachment].present? %>
-          <% @form.errors[:attachment].each do |message| %>
-            <small class="form-error is-visible">
-              <%= message %>
-            </small>
-          <% end %>
-        <% end %>
-      </div>
+    <% if @form.documents.any? %>
+      <% @form.documents.each do |document| %>
+        <div class="callout" data-closable>
+          <%= link_to translated_attribute(document.title), document.url %>
+          <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
+          <%= form.hidden_field :documents, multiple: true, value: document.id, id: "document-#{document.id}" %>
+          <button class="close-button"
+                  aria-label="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
+                  title="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
+                  type="button" data-close>
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+      <% end %>
     <% end %>
+
+    <div class="row column">
+      <%= form.file_field :add_documents, multiple: true, label: t("add_documents", scope: "decidim.proposals.proposals.edit") %>
+    </div>
   </fieldset>
 <% end %>

data/app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb

@@ -1,16 +0,0 @@
-<% fully_endorsed= fully_endorsed?(@proposal, current_user) %>
-<div class="row collapse buttons__row">
-  <% if endorsements_enabled? %>
-    <div class="column small-9 collapse">
-      <div class="button-group button-group--collapse button--nomargin small">
-        <%= render_endorsements_count_card_part(@proposal, fully_endorsed) %>
-        <%= render_endorsements_button_card_part(@proposal, fully_endorsed) %>
-      </div>
-    </div>
-  <% end %>
-  <div class="column collapse <%= endorsements_enabled? ? "small-3" : "" %>">
-    <%= link_to "#comments", class: "button small compact hollow secondary button--nomargin expanded" do %>
-        <%= icon "comment-square", class: "icon--small", aria_label: t(".comments"), role: "img" %> <%= @proposal.comments.count %>
-    <% end %>
-  </div>
-</div>

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

@@ -1,43 +1,45 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "proposals" } %>
+
 <%= filter_form_for filter do |form| %>
   <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") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t(".search") %>
+          <button type="submit" class="button" aria-controls="proposals">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
           </button>
         </div>
       </div>
     </div>
   </div>
 
-  <% if @proposals.only_emendations.any? %>
-    <%= form.collection_radio_buttons :type, filter_type_values, :first, :last, legend_title: t(".amendment_type") %>
+  <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
+    <%= form.check_boxes_tree :state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
   <% end %>
 
-  <% if component_settings.official_proposals_enabled %>
-    <%= form.collection_radio_buttons :origin, filter_origin_values, :first, :last, legend_title: t(".origin") %>
+  <% if current_component.has_subscopes? %>
+    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
   <% end %>
 
-  <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
-    <%= form.collection_radio_buttons :state, filter_state_values, :first, :last, legend_title: t(".state") %>
+  <% if current_component.categories.any? %>
+    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
   <% end %>
 
-  <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>
-    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, legend_title: t(".related_to") %>
+  <% if component_settings.official_proposals_enabled %>
+    <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_user %>
-    <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, legend_title: t(".activity") %>
+    <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t(".activity") }, "aria-controls": "proposals" %>
   <% end %>
 
-  <% if current_participatory_space.has_subscopes? %>
-    <%= scopes_picker_filter form, :scope_id %>
+  <% if @proposals.only_emendations.any? %>
+    <%= form.collection_radio_buttons :type, filter_type_values, :first, :last, { legend_title: t(".amendment_type") }, "aria-controls": "proposals" %>
   <% end %>
 
-  <% if current_component.categories.any? %>
-    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
+  <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>
+    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "proposals" %>
   <% end %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>

data/app/views/decidim/proposals/proposals/_proposal_badge.html.erb

@@ -1,6 +1,3 @@
-<% if proposal.answered? %>
-  <span class="<%= proposal_state_badge_css_class(proposal.state) %> label proposal-status"><%= humanize_proposal_state proposal.state %></span>
-<% end %>
-<% if proposal.withdrawn? %>
+<% if proposal.published_state? || proposal.withdrawn? %>
   <span class="<%= proposal_state_badge_css_class(proposal.state) %> label proposal-status"><%= humanize_proposal_state proposal.state %></span>
 <% end %>

data/app/views/decidim/proposals/proposals/_proposal_preview.html.erb

@@ -1,11 +1 @@
-<div class="row column view-header">
-  <h2 class="heading2"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
-  <% unless component_settings.participatory_texts_enabled? %>
-    <%= cell("decidim/coauthorships", @proposal) %>
-  <% end %>
-</div>
-<div class="row column">
-  <%= simple_format(present(@proposal).body(links: true, strip_tags: true), nil, sanitize: false) %>
-</div>
-<br>
-<%= attachments_for(@proposal) %>
+<%= card_for @proposal, from: @proposal, preview: true %>

data/app/views/decidim/proposals/proposals/_proposal_similar.html.erb

@@ -1,5 +1,5 @@
 <div class="column">
-  <article class="card card--proposal">
+  <div class="card card--proposal">
     <div class="card__content">
       <div class="card__header">
         <%= link_to proposal, target: "_blank" do %>
@@ -18,5 +18,5 @@
       <p><%= truncate(present(proposal).body(strip_tags: true), length: 100) %></p>
       <%= cell "decidim/tags", proposal, context: { extra_classes: ["tags--proposal"] } %>
     </div>
-  </article>
+  </div>
 </div>

data/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -11,4 +11,18 @@
 <div class="row small-up-1 medium-up-2 card-grid">
   <%= render @proposals %>
 </div>
+
+<div class="row">
+  <div class="columns mediumlarge-8 large-9">
+    <% if @proposals.empty? %>
+      <div class="callout secondary">
+        <% if params[:filter].present? %>
+          <p><%= t(".empty_filters") %></p>
+        <% else %>
+          <p><%= t(".empty") %></p>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>
 <%= decidim_paginate @proposals %>