decidim-proposals 0.15.2 → 0.16.0

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

@@ -7,55 +7,7 @@
     <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, class: "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 Decidim::UserGroups::ManageableUserGroups.for(current_user).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 |form| %>
-                <div class="field">
-                  <%= form.text_field :title %>
-                </div>
-
-                <div class="field">
-                  <%= form.upload :file, optional: false %>
-                </div>
-              <% end %>
-            </fieldset>
-          <% end %>
+          <%= 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/collaborative_drafts/edit.html.erb

@@ -15,35 +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, class: "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 %>
+          <%= 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/collaborative_drafts/show.html.erb

@@ -1,6 +1,6 @@
 <% add_decidim_meta_tags({
-  description: @collaborative_draft.body,
-  title: @collaborative_draft.title,
+  description: present(@collaborative_draft).body,
+  title: present(@collaborative_draft).title,
   url: collaborative_draft_url(@collaborative_draft.id)
 }) %>
 
@@ -19,10 +19,10 @@
   <% end %>
 
   <h2 class="heading2">
-    <%= @collaborative_draft.title %>
+    <%= present(@collaborative_draft).title(links: true) %>
   </h2>
 
-  <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3) %>
+  <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3, context: { current_user: current_user }) %>
 </div>
 
 <div class="row">
@@ -110,7 +110,7 @@
     <div class="section">
       <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
 
-      <%= simple_format @collaborative_draft.body %>
+      <%= simple_format present(@collaborative_draft).body(links: true) %>
 
       <% if component_settings.geocoding_enabled? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>

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

@@ -1,11 +1,35 @@
 <div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: present(@proposal).title %>
+  <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title %>
 </div>
 
 <div class="field hashtags__container">
-  <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true, value: present(@proposal).body %>
+  <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true, value: form_presenter.body(extras: false).strip %>
 </div>
 
+<% if @form.component_automatic_hashtags.any? %>
+  <div class="field">
+    <%= form.label :automatic_hashtags %>
+    <div class="checkboxes hashtags">
+      <% @form.component_automatic_hashtags.each do |hashtag| %>
+        <label>
+          <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
+        </label>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+
+<% if @form.component_suggested_hashtags.any? %>
+  <div class="field">
+    <%= form.label :suggested_hashtags %>
+    <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 }
+      end %>
+    </div>
+  </div>
+<% end %>
+
 <% if component_settings.geocoding_enabled? %>
   <div class="field">
     <%= form.check_box :has_address, checked: form_has_address? %>
@@ -28,7 +52,7 @@
   </div>
 <% end %>
 
-<% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
   <div class="field">
     <%= user_group_select_field form, :user_group_id %>
   </div>

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

@@ -12,12 +12,15 @@
     </div>
   </div>
 
+  <% if component_settings.amendments_enabled %>
+    <%= form.collection_radio_buttons :type, filter_type_values, :first, :last, legend_title: t(".amendment_type") %>
+  <% end %>
   <% if component_settings.official_proposals_enabled %>
-    <%= form.collection_radio_buttons :origin, [["all", t(".all")], ["official", t(".official")], ["citizens", t(".citizens")]], :first, :last, legend_title: t(".origin") %>
+    <%= form.collection_radio_buttons :origin, filter_origin_values, :first, :last, legend_title: t(".origin") %>
   <% end %>
 
   <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
-    <%= form.collection_radio_buttons :state, [["except_rejected", t(".except_rejected")], ["accepted", t(".accepted")], ["evaluating", t(".evaluating")], ["rejected", t(".rejected")], ["all", t(".all")]], :first, :last, legend_title: t(".state") %>
+    <%= form.collection_radio_buttons :state, filter_state_values, :first, :last, legend_title: t(".state") %>
   <% end %>
 
   <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>

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

@@ -1 +1,5 @@
-<%= card_for proposal, from: proposal %>
+<% if amendments_enabled? %>
+  <%= card_for proposal, from: proposal %>
+<% else %>
+  <%= card_for proposal, from: proposal if !proposal.emendation? %>
+<% end %>

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

@@ -5,7 +5,7 @@
         <%= link_to proposal, target: "_blank" do %>
           <h5 class="card__title"><%= present(proposal).title %></h5>
         <% end %>
-        <%= cell("decidim/coauthorships", proposal, has_actions: false) %>
+        <%= cell("decidim/coauthorships", proposal, has_actions: false, context: { current_user: current_user }) %>
 
         <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(present(proposal).html_body, length: 100) %></p>
+      <p><%= truncate(present(proposal).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

@@ -1,46 +1,50 @@
 <% if proposal.rejected? %>
   <div></div>
 <% else %>
-  <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), 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), 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: {
-            disable: true,
-            original: t("decidim.proposals.proposals.vote_button.already_voted"),
-            replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
-            "redirect-url": proposal_path(proposal)
-          },
-          class: "button #{vote_button_classes(from_proposals_list)} success light",
-          id: "vote_button"
-        ) do %>
-          <%= icon("check", class: "icon--small") %>
-          <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
+  <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
+    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
+  <% else %>
+    <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), 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), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
         <% end %>
       <% else %>
-        <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
-          <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+        <% 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: {
+              disable: true,
+              original: t("decidim.proposals.proposals.vote_button.already_voted"),
+              replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
+              "redirect-url": proposal_path(proposal)
+            },
+            class: "button #{vote_button_classes(from_proposals_list)} success light",
+            id: "vote_button-#{proposal.id}"
+          ) do %>
+            <%= icon("check", class: "icon--small") %>
+            <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
+          <% end %>
         <% else %>
-          <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-            <%= content_tag :span, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
-          <% 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 %>
+          <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+            <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), 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), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" %>
+            <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+              <%= content_tag :span, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+            <% 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), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" %>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 <% end %>

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

@@ -1,14 +1,18 @@
 <% if !current_settings.votes_hidden? && current_component.participatory_space.can_participate?(current_user) %>
-  <% progress ||= proposal.proposal_votes_count || 0 %>
-  <% total ||= proposal.maximum_votes || 0 %>
-  <% subtitle_text = progress >= total ? t("decidim.proposals.proposals.votes_count.most_popular_proposal") : t("decidim.proposals.proposals.votes_count.need_more_votes") %>
-  <%= cell(
-    "decidim/progress_bar",
-    progress,
-    total: total,
-    units_name: "decidim.proposals.proposals.votes_count.count",
-    element_id: "proposal-#{proposal.id}-votes-count",
-    subtitle_text: subtitle_text,
-    small: from_proposals_list
-  ) %>
+  <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
+    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
+  <% else %>
+    <% progress ||= proposal.proposal_votes_count || 0 %>
+    <% total ||= proposal.maximum_votes || 0 %>
+    <% subtitle_text = progress >= total ? t("decidim.proposals.proposals.votes_count.most_popular_proposal") : t("decidim.proposals.proposals.votes_count.need_more_votes") %>
+    <%= cell(
+      "decidim/progress_bar",
+      progress,
+      total: total,
+      units_name: "decidim.proposals.proposals.votes_count.count",
+      element_id: "proposal-#{proposal.id}-votes-count",
+      subtitle_text: subtitle_text,
+      small: from_proposals_list
+    ) %>
+  <% end %>
 <% end %>

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

@@ -15,7 +15,7 @@
             <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true %>
           </div>
 
-          <% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+          <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
             <div class="field">
               <%= user_group_select_field form, :user_group_id %>
             </div>

data/app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb

@@ -0,0 +1,19 @@
+<div class="p-s">
+  <h4><%= t(".document_index") %></h4>
+  <div class="text-muted">
+    <% @proposals.each do |proposal| %>
+      <div class="mb-s">
+        <p>
+          <%= link_to resource_locator(proposal).path do %>
+            <% if proposal.participatory_text_level == "article" %>
+              <u><%= present(proposal).title %></u>
+            <% else %>
+              <u class="text-uppercase"><%= present(proposal).title %></u>
+            <% end %>
+            <br />
+          <% end %>
+        </p>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_vote_button.html.erb

@@ -0,0 +1,46 @@
+<% if proposal.rejected? %>
+  <div></div>
+<% else %>
+  <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), resource: proposal, class: "column button light button--sc 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), resource: proposal, class: "column button light button--sc", 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: {
+            disable: true,
+            original: t("decidim.proposals.proposals.vote_button.already_voted"),
+            replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
+            "redirect-url": proposal_path(proposal)
+          },
+          class: "column button light button--sc success",
+          id: "vote_button-#{proposal.id}"
+        ) do %>
+          <%= icon("check", class: "icon--small") %>
+          <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
+        <% end %>
+      <% else %>
+        <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+          <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "column button light button--sc disabled", disabled: true %>
+        <% else %>
+          <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+            <%= content_tag :span, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "column button light button--sc", disabled: true %>
+          <% 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: "column button light button--sc 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), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "column button light button--sc" %>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb

@@ -0,0 +1,41 @@
+<% if proposal.rejected? %>
+  <div></div>
+<% else %>
+  <% if !current_user %>
+    <% if current_settings.votes_blocked? %>
+      <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
+        <%= proposal.proposal_votes_count || 0 %>
+      </button>
+    <% else %>
+      <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow" id="proposal-<%= proposal.id %>-votes-count">
+        <%= proposal.proposal_votes_count || 0 %>
+      </button>
+    <% end %>
+  <% else %>
+    <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
+      <button type="button" name="button" class="column medium-4 button success button--sc button--shadow" id="proposal-<%= proposal.id %>-votes-count">
+        <%= proposal.proposal_votes_count || 0 %>
+      </button>
+    <% else %>
+      <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+        <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
+          <%= proposal.proposal_votes_count || 0 %>
+        </button>
+      <% else %>
+        <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+          <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow" disabled id="proposal-<%= proposal.id %>-votes-count">
+            <%= proposal.proposal_votes_count || 0 %>
+          </button>
+        <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
+          <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
+            <%= proposal.proposal_votes_count || 0 %>
+          </button>
+        <% else %>
+          <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow" id="proposal-<%= proposal.id %>-votes-count">
+            <%= proposal.proposal_votes_count || 0 %>
+          </button>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>