decidim-proposals 0.8.4 → 0.9.0

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

@@ -29,7 +29,7 @@
   <% end %>
 
   <% if current_participatory_space.has_subscopes? %>
-    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope, include_root: true), multiple: true %>
+    <%= scopes_picker_filter form, :scope_id %>
   <% end %>
 
   <% if current_feature.categories.any? %>

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

@@ -9,14 +9,17 @@
           <%= link_to resource_locator(proposal).path, class: "card__link" do %>
             <h5 class="card--list__heading"><%= proposal.title %></h5>
           <% end %>
-          <div class="author">
-            <span class="author__avatar">
-              <%= image_tag proposal.author_avatar_url %>
-            </span>
-            <span class="author__name">
-              <%= proposal.author_name %>
-            </span>
-          </div>
+          <% present(proposal) do |proposal| %>
+            <div class="author">
+              <span class="author__avatar">
+                <%= image_tag proposal.author.avatar_url %>
+              </span>
+              <span class="author__name">
+                <strong><%= proposal.author.name %></strong>
+                <%= proposal.author.nickname %>
+              </span>
+            </div>
+          <% end %>
         </div>
       </div>
       <div class="card--list__data">

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

@@ -6,9 +6,12 @@
           <h5 class="card__title"><%= proposal.title %></h5>
         <% end %>
         <div class="card__author author-data author-data--small">
-          <%= render partial: "author", locals: { proposal: proposal } %>
+          <%= render partial: "decidim/shared/author_reference", locals: { author: present(proposal).author } %>
         </div>
-        <%= feature_reference(proposal, class: "reference--text-left") %>
+        <div class="tech-info tech-info--text-left">
+          <%= t(".creation_date", date: l(proposal.created_at, format: :decidim_short)) %>
+        </div>
+        <%= feature_reference(proposal, class: "tech-info--text-left") %>
       </div>
       <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
       <p><%= truncate(proposal.body, length: 100) %></p>

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

@@ -1,3 +1,6 @@
 <% 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? %>
+  <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/_vote_button.html.erb

@@ -4,11 +4,11 @@
       <% 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: "card__button 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: "card__button 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), class: "card__button 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') }, class: "card__button 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: "card__button button #{vote_button_classes(from_proposals_list)} success", id: "vote_button" %>
       <% else %>
         <% if proposal.maximum_votes_reached? %>
           <%= content_tag :span, t('.maximum_votes_reached'), class: "card__button button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
@@ -18,7 +18,7 @@
           <% elsif current_settings.votes_blocked? %>
             <%= content_tag :span, t('.votes_blocked'), class: "card__button 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 }, class: "card__button 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: "card__button button #{vote_button_classes(from_proposals_list)}" %>
           <% end %>
         <% end %>
       <% end %>

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

@@ -40,7 +40,7 @@
 
           <% if current_participatory_space.has_subscopes? %>
             <div class="field">
-              <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
+              <%= scopes_picker_field form, :scope_id %>
             </div>
           <% end %>
 
@@ -51,7 +51,7 @@
           <% end %>
 
           <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded", "data-disable-with" => "#{t('.send')}..." %>
+            <%= form.submit t(".send"), class: "button expanded", data: { disable: true } %>
           </div>
         <% end %>
       </div>

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

@@ -34,7 +34,7 @@
       <%= render partial: "count" %>
     </h2>
     <% if current_settings.creation_enabled %>
-      <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow" do %>
+      <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow", data: { "redirect_url" => new_proposal_path } do %>
         <%= t(".new_proposal") %>
         <%= icon "plus" %>
       <% end %>
@@ -57,6 +57,10 @@
     <%= render partial: "proposals" %>
   </div>
 </div>
-
+<div class="row">
+<div class="text-right">
+  <%= link_to t('.see_all_withdrawn'), proposals_path('filter[state]' => 'withdrawn') %>
+</div>
+</div>
 <%= javascript_include_tag("decidim/filters") %>
 <%= javascript_include_tag "decidim/orders" %>

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

@@ -46,7 +46,7 @@
 
           <% if current_participatory_space.has_subscopes? %>
             <div class="field">
-              <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
+              <%= scopes_picker_field form, :scope_id %>
             </div>
           <% end %>
 
@@ -72,7 +72,7 @@
           <% end %>
 
           <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded", "data-disable-with" => "#{t('.send')}..." %>
+            <%= form.submit t(".send"), class: "button expanded", data: { disable: true } %>
           </div>
         <% end %>
       </div>

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

@@ -8,17 +8,21 @@
 <div class="row column view-header">
   <h2 class="heading2"><%= @proposal.title %></h2>
   <div class="author-data">
-    <%= render partial: "author", locals: { proposal: @proposal } %>
+    <%= 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' %>
       </button>
       <% unless @proposal.official? %>
-        <%= link_to link_to_current_or_new_conversation_with(@proposal.author), title: t('.contact') do %>
-          <%= icon "envelope-closed", aria_label: t('.contact'), class: 'icon--small' %>
-        <% end %>
+        <%= 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", data: {confirm: t('.withdraw_confirmation')}  do %>
+        <%= t('.withdraw_proposal') %>
+        <%= icon "x" %>
+      <% end %>
+    <% end %>
   </div>
 </div>
 <div class="row">

data/config/locales/ca.yml

@@ -1,16 +1,38 @@
----
 ca:
   activemodel:
     attributes:
       proposal:
         body: Cos
         category_id: Categoria
+        has_address: Té adreça
         scope_id: Àmbit
         title: Títol
         user_group_id: Crear proposta
       proposal_answer:
         answer: Resposta
   decidim:
+    events:
+      proposals:
+        proposal_accepted:
+          email_intro: 'S''ha acceptat la proposta "%{resource_title}". Pots llegir la resposta des d''aquesta pàgina:'
+          email_outro: Has rebut aquesta notificació perquè que segueixes "%{resource_title}". El pots deixar de seguir al link anterior.
+          email_subject: Una proposta que segueixes ha estat acceptada
+          notification_title: S'ha acceptat la proposta <a href="%{resource_path}">%{resource_title}</a>.
+        proposal_created:
+          email_intro: "%{author_name} %{author_nickname}, a qui segueixes, ha creat una nova proposta. Revisa-la i contribueix:"
+          email_outro: Has rebut aquesta notificació perquè estàs seguint %{author_nickname}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
+          email_subject: Nova proposta de %{author_nickname}
+          notification_title: La proposta "<a href="%{resource_path}">%{resource_title}</a>" ha estat creada per en/na <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+        proposal_evaluating:
+          email_intro: 'La proposta "%{resource_title}" s''està avaluant actualment. Pots consultar una resposta en aquesta pàgina:'
+          email_outro: Has rebut aquesta notificació perquè que segueixes "%{resource_title}". El pots deixar de seguir al link anterior.
+          email_subject: S'està avaluant una proposta que segueixes
+          notification_title: S'ha avaluat la proposta <a href="%{resource_path}">%{resource_title}</a>.
+        proposal_rejected:
+          email_intro: 'La proposta "%{resource_title}" ha estat rebutjada. Pots llegir la resposta des d''aquesta pàgina:'
+          email_outro: Has rebut aquesta notificació perquè que segueixes "%{resource_title}". El pots deixar de seguir al link anterior.
+          email_subject: S'ha rebutjat una proposta que segueixes
+          notification_title: S'ha rebutjat la proposta <a href="%{resource_path}">%{resource_title}</a>.
     features:
       proposals:
         actions:
@@ -42,6 +64,7 @@ ca:
       actions:
         answer: Respondre
         new: Nova
+        private_notes: Notes privades
         title: Accions
       admin:
         actions:
@@ -59,6 +82,12 @@ ca:
             evaluating: En avaluació
             rejected: Rebutjada
             title: Respondre a la proposta %{title}
+        proposal_notes:
+          form:
+            note: Nota
+            submit: Enviar
+          leave_your_note: Deixa la teva nota
+          title: Notes privades
         proposals:
           answer:
             invalid: Hi ha hagut un problema en respondre a aquesta proposta
@@ -74,11 +103,18 @@ ca:
           new:
             create: Crear
             title: Crear proposta
+        shared:
+          info_proposal:
+            body: Cos
+            created_at: Data de creació
+            proposal_votes_count: Nombre de suports
+            proposals: Propostes
       answers:
         accepted: Acceptada
         evaluating: En avaluació
         not_answered: No resposta
         rejected: Rebutjada
+        withdrawn: Retirada
       create:
         error: Hi ha hagut errors en desar la proposta.
         success: Proposta creada correctament.
@@ -86,7 +122,10 @@ ca:
         proposal:
           fields:
             category: Categoria
+            comments: Comentaris
+            created_at: Creat el
             id: ID
+            notes: Notes
             official_proposal: Proposta oficial
             scope: Àmbit
             state: Estat
@@ -98,9 +137,6 @@ ca:
         create:
           error: Hi ha hagut errors en donar suport a la proposta.
       proposals:
-        author:
-          deleted: Usuari eliminat
-          verified_user_group: Organització verificada
         count:
           proposals_count:
             one: 1 proposta
@@ -122,8 +158,6 @@ ca:
           origin: Origen
           rejected: Rebutjades
           related_to: Relacionat amb
-          scope_prompt: Seleccioneu un àmbit
-          scopes: Àmbits
           search: Cerca
           state: Estat
           voted: Has donat suport
@@ -134,6 +168,7 @@ ca:
           unfold: Desplegar
         index:
           new_proposal: Nova proposta
+          see_all_withdrawn: Veure totes les propostes retirades
           view_proposal: Veure proposta
         linked_proposals:
           proposal_votes:
@@ -154,14 +189,16 @@ ca:
           random: Aleatori
           recent: Recent
         proposal:
+          creation_date: 'Creació: %{date}'
           view_proposal: Veure proposta
         show:
-          contact: Contactar
           edit_proposal: Editar proposta
           proposal_accepted_reason: 'Aquesta proposta ha estat acceptada perquè:'
           proposal_in_evaluation_reason: S'està avaluant aquesta proposta
           proposal_rejected_reason: 'Aquesta proposta ha estat rebutjada perquè:'
           report: Informe
+          withdraw_confirmation: Estàs segur que vols retirar aquesta proposta?
+          withdraw_proposal: Retirar proposta
         vote_button:
           already_voted: Ja li has donat suport
           already_voted_hover: Retirar suport
@@ -187,6 +224,8 @@ ca:
         error: Hi ha hagut errors en desar la proposta.
         success: La proposta s'ha actualitzat correctament.
     resource_links:
+      included_projects:
+        project_results: 'Resultats que apareixen en aquest projecte:'
       included_proposals:
         proposal_projects: 'Proposta formulada en aquests projectes:'
         proposal_results: 'La proposta apareix en aquests resultats:'

data/config/locales/en.yml

@@ -5,12 +5,35 @@ en:
       proposal:
         body: Body
         category_id: Category
+        has_address: Has address
         scope_id: Scope
         title: Title
         user_group_id: Create proposal as
       proposal_answer:
         answer: Answer
   decidim:
+    events:
+      proposals:
+        proposal_accepted:
+          email_intro: 'The proposal "%{resource_title}" has been accepted. You can read the answer in this page:'
+          email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
+          email_subject: A proposal you're following has been accepted
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has been accepted.
+        proposal_created:
+          email_intro: "%{author_name} %{author_nickname}, who you are following, has created a new proposal, check it out and contribute:"
+          email_outro: You have received this notification because you are following %{author_nickname}. You can stop receiving notifications following the previous link.
+          email_subject: New proposal by %{author_nickname}
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal was created by <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+        proposal_evaluating:
+          email_intro: 'The proposal "%{resource_title}" is currently being evaluated. You can check for an answer in this page:'
+          email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
+          email_subject: A proposal you're following is being evaluated
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal is being evaluated.
+        proposal_rejected:
+          email_intro: 'The proposal "%{resource_title}" has been rejected. You can read the answer in this page:'
+          email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
+          email_subject: A proposal you're following has been rejected
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has been rejected.
     features:
       proposals:
         actions:
@@ -42,6 +65,7 @@ en:
       actions:
         answer: Answer
         new: New
+        private_notes: Private notes
         title: Actions
       admin:
         actions:
@@ -59,6 +83,12 @@ en:
             evaluating: Evaluating
             rejected: Rejected
             title: Answer for proposal %{title}
+        proposal_notes:
+          form:
+            note: Note
+            submit: Submit
+          leave_your_note: Leave your note
+          title: Private notes
         proposals:
           answer:
             invalid: There's been a problem answering this proposal
@@ -74,11 +104,18 @@ en:
           new:
             create: Create
             title: Create proposal
+        shared:
+          info_proposal:
+            body: Body
+            created_at: Creation date
+            proposal_votes_count: Votes count
+            proposals: Proposals
       answers:
         accepted: Accepted
         evaluating: Evaluating
         not_answered: Not answered
         rejected: Rejected
+        withdrawn: Withdrawn
       create:
         error: There's been errors when saving the proposal.
         success: Proposal created successfully.
@@ -86,7 +123,10 @@ en:
         proposal:
           fields:
             category: Category
+            comments: Comments
+            created_at: Created at
             id: ID
+            notes: Notes
             official_proposal: Official proposal
             scope: Scope
             state: State
@@ -98,9 +138,6 @@ en:
         create:
           error: There's been errors when voting the proposal.
       proposals:
-        author:
-          deleted: Deleted user
-          verified_user_group: Verified organization
         count:
           proposals_count:
             one: 1 proposal
@@ -122,8 +159,6 @@ en:
           origin: Origin
           rejected: Rejected
           related_to: Related to
-          scope_prompt: Select a scope
-          scopes: Scopes
           search: Search
           state: State
           voted: Voted
@@ -134,6 +169,7 @@ en:
           unfold: Unfold
         index:
           new_proposal: New proposal
+          see_all_withdrawn: See all withdrawn proposals
           view_proposal: View proposal
         linked_proposals:
           proposal_votes:
@@ -154,14 +190,16 @@ en:
           random: Random
           recent: Recent
         proposal:
+          creation_date: 'Creation: %{date}'
           view_proposal: View proposal
         show:
-          contact: Contact
           edit_proposal: Edit proposal
           proposal_accepted_reason: 'This proposal has been accepted because:'
           proposal_in_evaluation_reason: This proposal is being evaluated
           proposal_rejected_reason: 'This proposal has been rejected because:'
           report: Report
+          withdraw_confirmation: Are you sure to withdraw this proposal?
+          withdraw_proposal: Withdraw proposal
         vote_button:
           already_voted: Already voted
           already_voted_hover: Unvote
@@ -187,6 +225,8 @@ en:
         error: There's been errors when saving the proposal.
         success: Proposal updated successfully.
     resource_links:
+      included_projects:
+        project_results: 'Results appearing in this project:'
       included_proposals:
         proposal_projects: 'Proposal appearing in these projects:'
         proposal_results: 'Proposal appearing in these results:'