decidim-proposals 0.10.1 → 0.11.0.pre1

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

@@ -0,0 +1,25 @@
+<figure>
+  <figcaption class="text-uppercase">
+    <strong>
+      <%= t("filed_as", scope: "decidim.proposals.proposals.tags") %>
+    </strong>
+  </figcaption>
+
+  <ul>
+    <% if resource.category.present? %>
+      <li>
+        <%= link_to translated_attribute(resource.category.name), resource_locator(resource).index(filter: { category_id: resource.category.id }) %>
+        <% if resource.previous_category.present? && action_name == "show" %>
+          &nbsp;
+          <small class="text-small">
+            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_category: "#{resource.previous_category.translated_name}").html_safe %>
+          </small>
+        <% end %>
+      </li>
+    <% end %>
+
+    <% if has_visible_scopes?(resource) %>
+      <li><%= link_to translated_attribute(resource.scope.name), resource_locator(resource).index(filter: { scope_id: [resource.scope.id] }) %></li>
+    <% end %>
+  </ul>
+</figure>

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

@@ -2,23 +2,23 @@
   <div id="proposal-<%= proposal.id %>-vote-button">
     <% if !current_user %>
       <% if current_settings.votes_blocked? %>
-        <%= action_authorized_button_to :vote, t('.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(".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 %>
       <% else %>
-        <%= action_authorized_button_to :vote, t('.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(".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) } %>
       <% end %>
     <% else %>
       <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
-        <%= action_authorized_button_to :vote, t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true, original: t('.already_voted'), replace: t('.already_voted_hover'), "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)} success", id: "vote_button" %>
+        <%= action_authorized_button_to :vote, t(".already_voted"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true, original: t(".already_voted"), replace: t(".already_voted_hover"), "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)} success", id: "vote_button" %>
       <% else %>
         <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold %>
-          <%= content_tag :span, t('.maximum_votes_reached'), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+          <%= content_tag :span, t(".maximum_votes_reached"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
         <% else %>
           <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-            <%= content_tag :span, t('.no_votes_remaining'), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+            <%= content_tag :span, t(".no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
           <% elsif current_settings.votes_blocked? %>
-            <%= content_tag :span, t('.votes_blocked'), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+            <%= content_tag :span, t(".votes_blocked"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
           <% else %>
-            <%= action_authorized_button_to :vote, t('.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(".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)}" %>
           <% end %>
         <% end %>
       <% end %>

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

@@ -1,13 +1,13 @@
 <div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
   <% if !current_settings.votes_hidden? %>
     <% progress ||= proposal.proposal_votes_count || 0 %>
-    <% total ||= proposal.maximum_votes || 0  %>
+    <% total ||= proposal.maximum_votes || 0 %>
     <% percent = (progress.to_f/total) * 100 %>
     <% vertical ||= from_proposals_list %>
-    <div class="progress__bar<%= (!vertical) ? ' progress__bar--vertical' : '' %>">
+    <div class="progress__bar<%= (!vertical) ? " progress__bar--vertical" : "" %>">
       <div class="progress__bar__title">
         <span class="progress__bar__number"><%= progress %></span><%= "/#{total}" if total != 0 %>
-        <span class="progress__bar__text"><%= t('.count', count: proposal.proposal_votes_count) %></span>
+        <span class="progress__bar__text"><%= t(".count", count: proposal.proposal_votes_count) %></span>
       </div>
       <% if total != 0 %>
         <div class="progress progress__bar__bar" role="progressbar" tabindex="0" aria-valuenow="<%= percent %>" aria-valuemin="0" aria-valuetext="<%= percent %> percent" aria-valuemax="100">
@@ -16,12 +16,13 @@
         </div>
         <div class="progress__bar__subtitle">
           <% if progress >= total %>
-            <%= t('.most_popular_proposal') %>
+            <%= t(".most_popular_proposal") %>
           <% else %>
-            <%= t('.need_more_votes') %>
+            <%= t(".need_more_votes") %>
           <% end %>
         </div>
       <% end %>
     </div>
+
   <% end %>
 </div>

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

@@ -3,22 +3,22 @@
     <div class="callout secondary voting-rules">
       <div class="row">
         <div class="columns medium-8 large-9">
-          <h3 class="heading3"><%= t('.title') %></h3>
+          <h3 class="heading3"><%= t(".title") %></h3>
           <ul>
             <% if vote_limit_enabled? %>
-              <li><%= t('.vote_limit.description', limit: feature_settings.vote_limit) %></li>
+              <li><%= t(".vote_limit.description", limit: component_settings.vote_limit) %></li>
             <% end %>
 
             <% if proposal_limit_enabled? %>
-              <li><%= t('.proposal_limit.description', limit: proposal_limit) %></li>
+              <li><%= t(".proposal_limit.description", limit: proposal_limit) %></li>
             <% end %>
 
             <% if threshold_per_proposal_enabled? %>
-              <li><%= t('.threshold_per_proposal.description', limit: threshold_per_proposal) %></li>
+              <li><%= t(".threshold_per_proposal.description", limit: threshold_per_proposal) %></li>
             <% end %>
 
             <% if can_accumulate_supports_beyond_threshold? %>
-              <li><%= t('.can_accumulate_supports_beyond_threshold.description') %></li>
+              <li><%= t(".can_accumulate_supports_beyond_threshold.description", limit: threshold_per_proposal) %></li>
             <% end %>
           </ul>
         </div>
@@ -26,9 +26,9 @@
           <div class="columns medium-4 large-3">
             <div class="card card--nomargin text-center remaining-votes-counter">
               <div class="card__content">
-                <span class="definition-data__title"><%= t('.vote_limit.left', limit: feature_settings.vote_limit) %></span>
+                <span class="definition-data__title"><%= t(".vote_limit.left", limit: component_settings.vote_limit) %></span>
                 <%= render partial: "remaining_votes_count" %>
-                <span class="extra__suport-text"><%= t('.vote_limit.votes') %></span>
+                <span class="extra__suport-text"><%= t(".vote_limit.votes") %></span>
               </div>
             </div>
           </div>

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

@@ -1,10 +1,10 @@
-<% if translated_attribute(feature_settings.new_proposal_help_text).present? && @step != :step_3 %>
-  <%= render partial: "decidim/shared/announcement", locals: { announcement: feature_settings.new_proposal_help_text } %>
-<% elsif @step == :step_3 %>
+<% if translated_attribute(component_settings.new_proposal_help_text).present? && @step != :step_4 %>
+  <%= render partial: "decidim/shared/announcement", locals: { announcement: component_settings.new_proposal_help_text } %>
+<% elsif @step == :step_4 %>
   <%
     locals = {
       callout_class: "warning",
-      announcement: t("decidim.proposals.proposals.preview.proposal_edit_before_minutes", count: feature_settings.proposal_edit_before_minutes)
+      announcement: t("decidim.proposals.proposals.preview.proposal_edit_before_minutes", count: component_settings.proposal_edit_before_minutes)
     }
   %>
   <%= render partial: "decidim/shared/announcement", locals: locals %>
@@ -13,7 +13,7 @@
 <% if proposal_wizard_step_help_text?(@step) %>
   <div class="proposal_wizard_help_text">
     <% callout_step_help_text_class ||= nil %>
-    <%= render partial: "decidim/shared/announcement", locals: { announcement: feature_settings.try("proposal_wizard_#{@step}_help_text"), callout_class: callout_step_help_text_class } %>
+    <%= render partial: "decidim/shared/announcement", locals: { announcement: component_settings.try("proposal_wizard_#{@step}_help_text"), callout_class: callout_step_help_text_class } %>
   </div>
 <% end %>
 

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

@@ -12,7 +12,7 @@
       </div>
     <% end %>
     <div class="row column text-center">
-      <%= link_to t(".mine_is_different"), preview_proposal_path(@proposal), class: "button small" %>
+      <%= link_to t(".mine_is_different"), complete_proposals_path(proposal: {title: @form.title, body: @form.body}), class: "button small" %>
     </div>
   </div>
   <div class="columns large-3"></div>

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

@@ -0,0 +1,70 @@
+<div class="row">
+  <%= render partial: "wizard_aside" %>
+
+  <div class="columns large-6">
+    <%= render partial: "wizard_header" %>
+
+    <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 |form| %>
+                <div class="field">
+                  <%= form.text_field :title %>
+                </div>
+
+                <div class="field">
+                  <%= form.upload :file, optional: false %>
+                </div>
+              <% end %>
+            </fieldset>
+          <% end %>
+
+          <div class="actions">
+            <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+  <div class="columns large-3"></div>
+</div>
+
+<%= javascript_include_tag "decidim/proposals/add_proposal" %>

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

@@ -9,8 +9,8 @@
 <div class="row">
   <div class="columns large-6 medium-centered">
     <div class="card">
-      <% if translated_attribute(feature_settings.new_proposal_help_text).present? %>
-        <%= render partial: "decidim/shared/announcement", locals: { announcement: feature_settings.new_proposal_help_text } %>
+      <% if translated_attribute(component_settings.new_proposal_help_text).present? %>
+        <%= render partial: "decidim/shared/announcement", locals: { announcement: component_settings.new_proposal_help_text } %>
       <% end %>
 
       <div class="card__content">
@@ -23,7 +23,7 @@
             <%= form.text_area :body, rows: 10 %>
           </div>
 
-          <% if feature_settings.geocoding_enabled? %>
+          <% if component_settings.geocoding_enabled? %>
             <div class="field">
               <%= form.check_box :has_address %>
             </div>

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

@@ -15,7 +15,7 @@
             <%= form.text_area :body, rows: 10 %>
           </div>
 
-          <% if feature_settings.geocoding_enabled? %>
+          <% if component_settings.geocoding_enabled? %>
             <div class="field">
               <%= form.check_box :has_address %>
             </div>
@@ -42,8 +42,10 @@
             </div>
           <% end %>
 
-          <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded", data: { disable: true } %>
+          <div class="row column flex-center">
+            <%= link_to t(".discard"), destroy_draft_proposal_path(@proposal), method: :delete, data: { confirm: t(".discard_confirmation") } %>
+
+            <%= form.submit t(".send"), class: "button  button--nomargin small", data: { disable: true } %>
           </div>
         <% end %>
       </div>

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

@@ -1,6 +1,6 @@
-<%= render partial: "decidim/shared/feature_announcement" %>
+<%= render partial: "decidim/shared/component_announcement" %>
 
-<% if feature_settings.geocoding_enabled? %>
+<% if component_settings.geocoding_enabled? %>
   <%= dynamic_map_for proposals_data_for_map(geocoded_proposals) do %>
     <template id="marker-popup">
       <div class="map-info__content">
@@ -17,7 +17,7 @@
           </div>
           <div class="map-info__button">
             <a href="${link}" class="button button--sc">
-              <%= t('.view_proposal') %>
+              <%= t(".view_proposal") %>
             </a>
           </div>
         </div>
@@ -49,7 +49,7 @@
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
     <%= render partial: "filters_small_view" %>
-    <div class="card card--secondary show-for-mediumlarge" >
+    <div class="card card--secondary show-for-mediumlarge">
       <%= render partial: "filters" %>
     </div>
   </div>
@@ -59,7 +59,7 @@
 </div>
 <div class="row">
 <div class="text-right">
-  <%= link_to t('.see_all_withdrawn'), proposals_path('filter[state]' => 'withdrawn') %>
+  <%= link_to t(".see_all_withdrawn"), proposals_path("filter[state]" => "withdrawn") %>
 </div>
 </div>
 <%= javascript_include_tag("decidim/filters") %>

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

@@ -6,7 +6,7 @@
 
     <div class="card">
       <div class="card__content">
-        <%= decidim_form_for(@form) do |form| %>
+        <%= decidim_form_for(@form, url: compare_proposals_path, method: :get) do |form| %>
           <div class="field">
             <%= form.text_field :title %>
           </div>
@@ -15,48 +15,6 @@
             <%= form.text_area :body, rows: 10 %>
           </div>
 
-          <% if feature_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 feature_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 %>
-
           <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

@@ -5,7 +5,7 @@
     <%= 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

@@ -7,23 +7,21 @@
 <%= render partial: "voting_rules" %>
 <div class="row column view-header">
   <h2 class="heading2"><%= @proposal.title %></h2>
-  <div class="author-data">
-    <%= render partial: "decidim/shared/author_reference", locals: { author: Decidim::Proposals::ProposalPresenter.new(@proposal).author } %>
-    <div class="author-data__extra">
-      <button type="button" data-open="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" title="<%= t('.report') %>" aria-controls="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" aria-haspopup="true" tabindex="0">
-        <%= icon "flag", aria_label: t('.report'), class: 'icon--small' %>
+  <%= cell "decidim/author_box", present(@proposal).author, extra: (capture do %>
+      <span><%= l @proposal.created_at, format: :decidim_short %></span>
+      <button type="button" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t(".report") %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
+        <%= icon "flag", aria_label: t(".report"), class: "icon--small" %>
       </button>
       <% unless @proposal.official? %>
         <%= link_to_current_or_new_conversation_with(@proposal.author) %>
       <% end %>
-    </div>
-    <% if @proposal.withdrawable_by?(current_user) %>
-      <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), method: :put, class: "title-action__action button small hollow", title: t('.withdraw_btn_hint'), data: {confirm: t('.withdraw_confirmation')}  do %>
-        <%= t('.withdraw_proposal') %>
-        <%= icon "x" %>
-      <% end %>
+      <% if @proposal.withdrawable_by?(current_user) %>
+        <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), method: :put, class: "title-action__action button small hollow", title: t(".withdraw_btn_hint"), data: {confirm: t(".withdraw_confirmation")}  do %>
+          <%= t(".withdraw_proposal") %>
+          <%= icon "x" %>
+        <% end %>
     <% end %>
-  </div>
+  <% end) %>
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
@@ -38,14 +36,8 @@
             <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
           <% end %>
           <%= render partial: "endorsements_card_row", locals: { proposal: @proposal } %>
-          <br/>
-          <% if current_user %>
-            <%= render partial: "decidim/shared/follow_button", locals: { followable: @proposal } %>
-          <% else %>
-            <p class="mt-s mb-none">
-              <%= t(".sign_in_or_up", {in: link_to(t(".sign_in"), decidim.new_user_session_path), up: link_to(t(".sign_up"), decidim.new_user_registration_path)}).html_safe %>
-            </p>
-          <% end %>
+          <br />
+          <%= follow_button_for(@proposal) %>
         </div>
       </div>
     <% end %>
@@ -57,10 +49,11 @@
     <div class="section">
       <%= render partial: "proposal_badge", locals: { proposal: @proposal } %>
       <%= simple_format @proposal.body %>
-      <% if feature_settings.geocoding_enabled? %>
+      <% if component_settings.geocoding_enabled? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
       <% end %>
-      <%= render partial: "decidim/shared/tags", locals: { resource: @proposal, tags_class_extra: "tags--proposal" } %>
+      <%= render partial: "tags", locals: { resource: @proposal } %>
+
     </div>
     <% if @proposal.answered? && translated_attribute(@proposal.answer).present? %>
       <% if @proposal.accepted? %>
@@ -95,7 +88,7 @@
 <%= attachments_for @proposal %>
 
 <a name="list-of-endorsements"></a>
-<%= render partial: 'endorsements_listing', locals: {proposal: @proposal} %>
+<%= identities_list_xxs(@proposal.endorsements.for_listing) %>
 <%= comments_for @proposal %>
 
 <%= javascript_include_tag "decidim/proposals/social_share" %>