decidim-proposals 0.13.1 → 0.14.1

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

@@ -0,0 +1,57 @@
+<div class="field hashtags__container">
+  <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: present(@proposal).title %>
+</div>
+
+<div class="field hashtags__container">
+  <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true, value: present(@proposal).body  %>
+</div>
+
+<% if component_settings.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 %>
+  </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") %>
+  </div>
+<% end %>
+
+<% if current_participatory_space.has_subscopes? %>
+  <div class="field">
+    <%= scopes_picker_field form, :scope_id %>
+  </div>
+<% end %>
+
+<% if current_user.user_groups.verified.any? %>
+  <div class="field">
+    <%= user_group_select_field form, :user_group_id %>
+  </div>
+<% end %>
+
+<% if component_settings.attachments_allowed? && @proposal %>
+  <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>
+    <% end %>
+  </fieldset>
+<% end %>

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

@@ -1,11 +1,11 @@
 <div id="proposal-<%= proposal.id %>-endorsement-button<%= user_group&.id ? "-#{user_group.id}" : "" %>">
   <% if !current_user %>
-      <%= action_authorized_button_to :endorse, endorse_label, current_endorsement_url, class: "button #{endorsement_button_classes(from_proposals_list)} secondary" %>
+      <%= action_authorized_button_to :endorse, endorse_label, current_endorsement_url, resource: proposal, class: "button #{endorsement_button_classes(from_proposals_list)} secondary" %>
   <% else %>
     <% if proposal.endorsed_by?(current_user, user_group) %>
-      <%= action_authorized_button_to :endorse, unendorse_label, current_endorsement_url, method: :delete, remote: true, class: "button #{endorsement_button_classes(from_proposals_list)} success", id: "endorsement_button" %>
+      <%= action_authorized_button_to :endorse, unendorse_label, current_endorsement_url, resource: proposal, method: :delete, remote: true, class: "button #{endorsement_button_classes(from_proposals_list)} success", id: "endorsement_button" %>
     <% else %>
-      <%= action_authorized_button_to :endorse, endorse_label, current_endorsement_url, remote: true, data: {  }, class: "button #{endorsement_button_classes(from_proposals_list)} secondary" %>
+      <%= action_authorized_button_to :endorse, endorse_label, current_endorsement_url, resource: proposal, remote: true, data: {}, class: "button #{endorsement_button_classes(from_proposals_list)} secondary" %>
     <% end %>
   <% end %>
 </div>

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

@@ -4,13 +4,7 @@
     <div class="column small-9 collapse">
       <div class="button-group button-group--collapse button--nomargin small">
         <%= render_endorsements_count_card_part(@proposal, fully_endorsed) %>
-        <% if current_settings.endorsements_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-          <%= content_tag :span, t(".endorse"), class: "card__button button #{endorsement_button_classes(false)} disabled", disabled: true, title: t(".endorse") %>
-        <% elsif current_user %>
-          <%= render partial: "endorsement_identities_cabin", locals: { proposal: @proposal, fully_endorsed: fully_endorsed } %>
-        <% else %>
-          <%= action_authorized_button_to :endorse, t(".endorse"), "", class: "card__button button #{endorsement_button_classes(false)} secondary" %>
-        <% end %>
+        <%= render_endorsements_button_card_part(@proposal, fully_endorsed) %>
       </div>
     </div>
   <% end %>

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

@@ -7,7 +7,7 @@
         <% end %>
         <div>
           <%= link_to resource_locator(proposal).path, class: "card__link" do %>
-            <h5 class="card--list__heading"><%= proposal.title %></h5>
+            <h5 class="card--list__heading"><%= present(proposal).title %></h5>
           <% end %>
           <% present(proposal) do |proposal| %>
             <div class="author">

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

@@ -1 +1 @@
-<%= card_for proposal, from: proposal, context: { current_user: current_user } %>
+<%= card_for proposal, from: proposal %>

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

@@ -1 +1 @@
-<%= card_for proposal, size: :m, context: { current_user: current_user } %>
+<%= card_for proposal, size: :m %>

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

@@ -3,9 +3,9 @@
     <div class="card__content">
       <div class="card__header">
         <%= link_to proposal, target: "_blank" do %>
-          <h5 class="card__title"><%= proposal.title %></h5>
+          <h5 class="card__title"><%= present(proposal).title %></h5>
         <% end %>
-        <%= cell("decidim/proposals/coauthorships", proposal) %>
+        <%= cell("decidim/coauthorships", proposal, has_actions: false) %>
 
         <div class="tech-info tech-info--text-left">
           <%= t("decidim.proposals.proposals.proposal.creation_date", date: l(proposal.created_at, format: :decidim_short)) %>
@@ -15,7 +15,7 @@
 
       <%== cell("decidim/proposals/proposal_m", proposal).badge %>
 
-      <p><%= truncate(proposal.body, length: 100) %></p>
+      <p><%= truncate(present(proposal).html_body, length: 100) %></p>
       <%= cell "decidim/tags", proposal, context: {extra_classes: ["tags--proposal"]} %>
     </div>
   </article>

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

@@ -4,15 +4,16 @@
   <div id="proposal-<%= proposal.id %>-vote-button">
     <% if !current_user %>
       <% if current_settings.votes_blocked? %>
-        <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+        <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
       <% else %>
-        <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
+        <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
       <% end %>
     <% else %>
       <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
         <%= action_authorized_button_to(
           :vote,
           proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list),
+          resource: proposal,
           method: :delete,
           remote: true,
           data: {
@@ -36,7 +37,7 @@
           <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
             <%= content_tag :span, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
           <% else %>
-            <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" %>
+            <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" %>
           <% end %>
         <% end %>
       <% end %>

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

@@ -2,12 +2,12 @@
   <div class="m-bottom">
     <%= link_to :back do %>
       <%= icon "chevron-left", class: "icon--small" %>
-      <%= t(".back") %>
+      <%= wizard_aside_back_text %>
     <% end %>
   </div>
   <div class="section">
     <p>
-      <%= t(".info").html_safe %>
+      <%= wizard_aside_info_text %>
     </p>
   </div>
   <div class="show-for-large">

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

@@ -2,18 +2,20 @@
   <%= render partial: "wizard_aside" %>
 
   <div class="columns large-6">
-    <%= render partial: "wizard_header", locals: {callout_step_help_text_class: "warning"} %>
+    <%= render partial: "wizard_header", locals: { callout_step_help_text_class: "warning" } %>
 
     <% if @similar_proposals.presence %>
       <div class="row small-up-1 card-grid">
         <% @similar_proposals.each do |proposal| %>
-          <%= render partial: "proposal_similar", locals: {proposal: proposal} %>
+          <%= render partial: "proposal_similar", locals: { proposal: proposal } %>
         <% end %>
       </div>
     <% end %>
+
     <div class="row column text-center">
-      <%= link_to t(".mine_is_different"), complete_proposals_path(proposal: {title: @form.title, body: @form.body}), class: "button small" %>
+      <%= link_to t(".mine_is_different"), complete_proposal_path(@proposal), class: "button small" %>
     </div>
   </div>
+
   <div class="columns large-3"></div>
 </div>

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

@@ -6,63 +6,8 @@
 
     <div class="card">
       <div class="card__content">
-        <%= decidim_form_for(@form) do |form| %>
-          <div class="field">
-            <%= form.text_field :title %>
-          </div>
-
-          <div class="field">
-            <%= form.text_area :body, rows: 10 %>
-          </div>
-
-          <% if component_settings.geocoding_enabled? %>
-            <div class="field">
-              <%= form.check_box :has_address %>
-            </div>
-            <div class="field" id="address_input">
-              <%= form.text_field :address %>
-            </div>
-          <% end %>
-
-          <% if @form.categories&.any? %>
-            <div class="field">
-              <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
-            </div>
-          <% end %>
-
-          <% if current_participatory_space.has_subscopes? %>
-            <div class="field">
-              <%= scopes_picker_field form, :scope_id %>
-            </div>
-          <% end %>
-
-          <% if current_user.user_groups.verified.any? %>
-            <div class="field">
-              <%= user_group_select_field form, :user_group_id %>
-            </div>
-          <% end %>
-
-          <% if component_settings.attachments_allowed? %>
-            <fieldset>
-              <legend><%= t(".attachment_legend") %></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>
-              <% end %>
-            </fieldset>
-          <% end %>
+        <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %>
+          <%= render partial: "edit_form_fields", locals: { form: form } %>
 
           <div class="actions">
             <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>

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

@@ -15,40 +15,7 @@
 
       <div class="card__content">
         <%= decidim_form_for(@form) do |form| %>
-          <div class="field">
-            <%= form.text_field :title %>
-          </div>
-
-          <div class="field">
-            <%= form.text_area :body, rows: 10 %>
-          </div>
-
-          <% if component_settings.geocoding_enabled? %>
-            <div class="field">
-              <%= form.check_box :has_address %>
-            </div>
-            <div class="field" id="address_input">
-              <%= form.text_field :address %>
-            </div>
-          <% end %>
-
-          <% if @form.categories&.any? %>
-            <div class="field">
-              <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
-            </div>
-          <% end %>
-
-          <% if current_participatory_space.has_subscopes? %>
-            <div class="field">
-              <%= scopes_picker_field form, :scope_id %>
-            </div>
-          <% end %>
-
-          <% if current_user.user_groups.verified.any? %>
-            <div class="field">
-              <%= form.select :user_group_id, current_user.user_groups.verified.map{|g| [g.name, g.id]}, prompt: current_user.name %>
-            </div>
-          <% end %>
+          <%= render partial: "edit_form_fields", locals: { form: form } %>
 
           <div class="actions">
             <%= form.submit t(".send"), class: "button expanded", data: { disable: true } %>

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

@@ -7,40 +7,7 @@
     <div class="card">
       <div class="card__content">
         <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %>
-          <div class="field">
-            <%= form.text_field :title %>
-          </div>
-
-          <div class="field">
-            <%= form.text_area :body, rows: 10 %>
-          </div>
-
-          <% if component_settings.geocoding_enabled? %>
-            <div class="field">
-              <%= form.check_box :has_address %>
-            </div>
-            <div class="field" id="address_input">
-              <%= form.text_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") %>
-            </div>
-          <% end %>
-
-          <% if current_participatory_space.has_subscopes? %>
-            <div class="field">
-              <%= scopes_picker_field form, :scope_id %>
-            </div>
-          <% end %>
-
-          <% if current_user.user_groups.verified.any? %>
-            <div class="field">
-              <%= user_group_select_field form, :user_group_id %>
-            </div>
-          <% end %>
+          <%= render partial: "edit_form_fields", locals: { form: form } %>
 
           <div class="row column flex-center">
             <%= link_to t(".discard"), destroy_draft_proposal_path(@proposal), method: :delete, data: { confirm: t(".discard_confirmation") } %>

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

@@ -1,7 +1,7 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
 <% if component_settings.geocoding_enabled? %>
-  <%= dynamic_map_for proposals_data_for_map(geocoded_proposals) do %>
+  <%= dynamic_map_for proposals_data_for_map(@proposals.select(&:geocoded?)) do %>
     <template id="marker-popup">
       <div class="map-info__content">
         <h3>${title}</h3>
@@ -44,6 +44,10 @@
         <%= icon "plus" %>
       </span>
     <% end %>
+
+    <% if component_settings.collaborative_drafts_enabled? %>
+      <%= link_to t(".collaborative_drafts_list"), collaborative_drafts_path, class: "title-action__action button small hollow ml-s" %>
+    <% end %>
   </div>
 </div>
 <div class="row">

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

@@ -1,20 +1,26 @@
 <div class="row">
-  <%= render partial: "wizard_aside" %>
+  <%= render partial: "decidim/proposals/proposals/wizard_aside" %>
 
   <div class="columns large-6">
-    <%= render partial: "wizard_header" %>
+    <%= render partial: "decidim/proposals/proposals/wizard_header" %>
 
     <div class="card">
       <div class="card__content">
-        <%= decidim_form_for(@form, url: compare_proposals_path, method: :get) do |form| %>
-          <div class="field">
-            <%= form.text_field :title %>
+        <%= decidim_form_for(@form) do |form| %>
+          <div class="field hashtags__container">
+            <%= form.text_field :title, class: "js-hashtags", hashtaggable: true %>
           </div>
 
-          <div class="field">
-            <%= form.text_area :body, rows: 10 %>
+          <div class="field hashtags__container">
+            <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true %>
           </div>
 
+          <% if current_user.user_groups.verified.any? %>
+            <div class="field">
+              <%= user_group_select_field form, :user_group_id %>
+            </div>
+          <% end %>
+
           <div class="actions">
             <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
           </div>

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

@@ -2,10 +2,10 @@
   <%= render partial: "wizard_aside" %>
 
   <div class="columns large-6">
-    <%= render partial: "wizard_header", locals: {callout_help_text_class: "warning"} %>
+    <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %>
     <div class="card">
       <div class="p-l">
-        <%= render partial: "proposal_preview", locals: {proposal: @proposal} %>
+        <%= render partial: "proposal_preview", locals: { proposal: @proposal } %>
         <div class="row column flex-center">
           <%= link_to t(".modify"), edit_draft_proposal_path(@proposal) %>
 

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

@@ -1,13 +1,13 @@
 <% add_decidim_meta_tags({
-  description: @proposal.body,
-  title: @proposal.title,
+  description: present(@proposal).body,
+  title: present(@proposal).title,
   url: proposal_url(@proposal.id)
 }) %>
 
 <%= render partial: "voting_rules" %>
 <div class="row column view-header">
-  <h2 class="heading2"><%= @proposal.title %></h2>
-  <%= cell("decidim/proposals/coauthorships", @proposal) %>
+  <h2 class="heading2"><%= present(@proposal).html_title %></h2>
+  <%= cell("decidim/coauthorships", @proposal, has_actions: true, size: 3) %>
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
@@ -31,11 +31,12 @@
     <%= cell("decidim/fingerprint", @proposal) %>
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for proposal_proposal_widget_url(@proposal, format: :js) %>
+    <%= cell "decidim/proposals/proposal_link_to_collaborative_draft", @proposal %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <%== cell("decidim/proposals/proposal_m", @proposal, full_badge: true).badge %>
-      <%= simple_format @proposal.body %>
+      <%= simple_format present(@proposal).html_body %>
       <% if component_settings.geocoding_enabled? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
       <% end %>

data/app/views/decidim/proposals/versions/_version.html.erb

@@ -0,0 +1,20 @@
+<div class="card--list__item">
+  <div class="card--list__text">
+    <div>
+      <%= link_to collaborative_draft_version_path(item, index + 1) do %>
+        <h6 class="card--list__heading heading6">
+          <%= t(".version_index", index: index + 1) %>
+        </h6>
+      <% end %>
+      <div class="author-data">
+        <%= render_resource_editor(version) %>
+        <%= l version.created_at, format: :decidim_short %>
+      </div>
+    </div>
+  </div>
+  <div class="card--list__data">
+    <%= link_to collaborative_draft_version_path(item, index + 1), class: "card--list__data__icon" do %>
+      <%= icon "chevron-right" %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,34 @@
+<div class="row">
+  <div class="small-12 columns">
+    <h2 class="heading2">
+      <%= t("changes_at_title", scope: "decidim.proposals.versions", title: item.title) %>
+    </h2>
+
+    <h3 class="section-heading">
+      <%= t(".title") %>
+    </h3>
+
+    <div class="row">
+      <div class="mediumlarge-8 columns">
+        <div class="section">
+          <div class="card card--list">
+            <% item.versions.each_with_index do |version, index| %>
+              <%= render partial: "version", locals: { version: version, index: index } %>
+            <% end %>
+          </div>
+        </div>
+      </div>
+
+      <div class="columns section mediumlarge-4 large-3">
+        <div class="card extra definition-data">
+          <div class="definition-data__item versions_count">
+            <span class="definition-data__title"><%= t("versions.stats.number_of_versions", scope: "decidim.proposals") %></span>
+            <%= item.versions.count %>
+
+            <%= link_to t("versions.stats.back_to_collaborative_draft", scope: "decidim.proposals"), collaborative_draft_path(item), class: "button button--sc hollow secondary small expanded" %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,39 @@
+<div class="row">
+  <div class="small-12 columns">
+    <h2 class="heading2">
+      <%= t("changes_at_title", scope: "decidim.proposals.versions", title: item.title) %>
+    </h2>
+
+    <div class="row">
+      <div class="mediumlarge-8 columns">
+        <div class="section">
+          <% diff_renderer.diff.each_value do |data| %>
+            <h3 class="section-heading"><%= data[:label] %></h3>
+            <%= render_diff_data(data) %>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="columns section mediumlarge-4 large-3">
+        <div class="card extra definition-data">
+          <div class="definition-data__item versions_count">
+            <span class="definition-data__title"><%= t("versions.stats.version_number", scope: "decidim.proposals") %></span>
+            <%= t("versions.stats.version_number_out_of_total", scope: "decidim.proposals", current_version: params[:id], total_count: item.versions_count) %>
+            <%= link_to t("versions.stats.show_all_versions", scope: "decidim.proposals"), collaborative_draft_versions_path(item), class: "button button--sc hollow secondary small expanded" %>
+            <%= link_to t("versions.stats.back_to_collaborative_draft", scope: "decidim.proposals"), collaborative_draft_path(item), class: "button button--sc hollow secondary small expanded" %>
+          </div>
+          <% if current_version.whodunnit.present? %>
+            <div class="definition-data__item last_revision_by">
+              <span class="definition-data__title"><%= t("versions.stats.version_author", scope: "decidim.proposals") %></span>
+              <%= render_resource_editor(current_version) %>
+            </div>
+          <% end %>
+          <div class="definition-data__item versions_count">
+            <span class="definition-data__title"><%= t("versions.stats.version_created_at", scope: "decidim.proposals") %></span>
+            <%= l current_version.created_at, format: :decidim_short %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>