decidim-proposals 0.9.3 → 0.10.0

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

@@ -0,0 +1,13 @@
+<%= javascript_include_tag 'decidim/proposals/identity_selector_dialog' %>
+<% if current_user && current_user.user_groups.verified.any? %>
+  <button id="select-identity-button" type="button" name="button" class="button small compact light button--sc <%= fully_endorsed ? 'success': 'secondary' %>">
+    <%= t('.endorse') %>
+  </button>
+
+  <div class="reveal collapse"
+       id="user-identities"
+       data-reveal data-refresh-url="<%= identities_proposal_proposal_endorsement_path(proposal) %>">
+  </div>
+<% else %>
+    <%= endorsement_button(proposal, false) %>
+<% end %>

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

@@ -0,0 +1,9 @@
+<% identity = endorsement_identity(endorsement) %>
+<div class="author author--inline">
+  <span class="author__avatar author__avatar--small">
+    <%= image_tag identity.avatar_url %>
+  </span>
+  <span class="author__name">
+    <%= identity.name %>
+  </span>
+</div>

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

@@ -0,0 +1,22 @@
+<% fully_endorsed= fully_endorsed?(@proposal, current_user) %>
+<div class="row collapse buttons__row">
+  <% if endorsements_enabled? %>
+    <div class="column small-9 collapse">
+      <div class="button-group button-group--collapse button--nomargin small">
+        <%= render partial: "endorsements_count", locals: { proposal: @proposal, fully_endorsed: fully_endorsed } %>
+        <% if current_settings.endorsements_blocked? %>
+          <%= 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 %>
+      </div>
+    </div>
+  <% end %>
+  <div class="column collapse <%= endorsements_enabled? ? 'small-3' : '' %>">
+    <%= link_to '#comments', class: "button small compact hollow secondary button--nomargin expanded" do %>
+        <%= icon "comment-square", class: "icon--small", aria_label: "Comentarios", role: "img" %> <%= @proposal.comments.count %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,5 @@
+<%= link_to '#list-of-endorsements', id: "proposal-#{proposal.id}-endorsements-count", class: "button small compact light button--sc button--shadow #{fully_endorsed ? 'success' : 'secondary'}" do %>
+  <%= icon "bullhorn", class: "icon--small", aria_label: "Endorsements", role: "img" %>
+      <%= proposal.proposal_endorsements_count %>
+</button>
+<% end %>

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

@@ -0,0 +1,34 @@
+<%
+count = proposal.endorsements.count
+if count > 0
+%>
+  <div class="row">
+    <div class="columns large-12">
+      <h4 class="section-heading"><%= t('.title') %></h4>
+    </div>
+
+    <div class="columns large-12">
+      <%= proposal.endorsements.for_listing.limit(5).collect do |endorsement| %>
+        <% render partial: 'endorsement_xxs', locals: {endorsement: endorsement} %>
+      <% end.join(', ').html_safe %>
+      <% if count > 5 %>...<% end -%>
+    </div>
+  </div>
+  <% if count > 5 %>
+    <div class="row">
+      <div id="see-all-endorsements" class="columns large-12" data-toggler=".hide">
+        <a data-toggle="remaining-endorsements see-all-endorsements"><%= t('.see_all') %></a>
+      </div>
+      <div id="remaining-endorsements" class="hide" data-toggler=".hide">
+        <div class="columns large-12">
+        <%= proposal.endorsements.for_listing.offset(5).collect do |endorsement| %>
+          <% render partial: 'endorsement_xxs', locals: {endorsement: endorsement} %>
+        <% end.join(', ').html_safe %>
+        </div>
+        <div class="columns large-12">
+          <a data-toggle="remaining-endorsements see-all-endorsements"><%= t('.see_less') %></a>
+        </div>
+      </div>
+    </div>
+  <% end -%>
+<% end %>

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

@@ -11,7 +11,7 @@
         <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") %>
+        <%= resource_reference(proposal, class: "tech-info--text-left") %>
       </div>
       <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
       <p><%= truncate(proposal.body, length: 100) %></p>
@@ -19,7 +19,7 @@
     </div>
     <div class="card__footer">
       <div class="card__support">
-        <% if current_settings.votes_enabled? %>
+        <% if current_settings.votes_enabled? && !proposal.draft? %>
           <%= render partial: "votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
           <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
         <% else %>

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

@@ -0,0 +1,36 @@
+<article class="card card--proposal">
+  <div class="card__content">
+    <div class="card__header">
+      <%= link_to proposal, class: "card__link" do %>
+        <h5 class="card__title"><%= proposal.title %></h5>
+      <% end %>
+      <div class="card__author author-data author-data--small">
+        <%= render partial: "decidim/shared/author_reference", locals: { author: present(proposal).author } %>
+      </div>
+    </div>
+    <p><%= truncate(proposal.body, length: 100) %></p>
+    <%= render partial: "decidim/shared/tags", locals: { resource: proposal, tags_class_extra: "tags--proposal" } %>
+  </div>
+  <div class="card__status">
+    <ul class="card-data">
+      <li class="card-data__item">
+        <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
+      </li>
+      <li class="card-data__item">
+        <%= l(proposal.created_at, format: :decidim_short) %>
+      </li>
+      <li class="card-data__item">
+        <a href="#comments">
+          <%= icon "bullhorn", class: "icon--small", role: "img" %>
+          0
+        </a>
+      </li>
+      <li class="card-data__item">
+        <a href="#comments">
+          <%= icon "comment-square", class: "icon--small", role: "img" %>
+            0
+        </a>
+      </li>
+    </ul>
+  </div>
+</article>

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

@@ -0,0 +1,21 @@
+<div class="column">
+  <article class="card card--proposal">
+    <div class="card__content">
+      <div class="card__header">
+        <%= link_to proposal, target: "_blank" do %>
+          <h5 class="card__title"><%= proposal.title %></h5>
+        <% end %>
+        <div class="card__author author-data author-data--small">
+          <%= render partial: "decidim/shared/author_reference", locals: { author: present(proposal).author } %>
+        </div>
+        <div class="tech-info tech-info--text-left">
+          <%= t("decidim.proposals.proposals.proposal.creation_date", date: l(proposal.created_at, format: :decidim_short)) %>
+        </div>
+        <%= resource_reference(proposal, class: "tech-info--text-left") %>
+      </div>
+      <%= render partial: "decidim/proposals/proposals/proposal_badge", locals: { proposal: proposal } %>
+      <p><%= truncate(proposal.body, length: 100) %></p>
+      <%= render partial: "decidim/shared/tags", locals: { resource: proposal, tags_class_extra: "tags--proposal" } %>
+    </div>
+  </article>
+</div>

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: "card__button 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: "card__button 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: "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: "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 %>
+        <% 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 %>
         <% else %>
           <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-            <%= content_tag :span, t('.no_votes_remaining'), class: "card__button 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: "card__button 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: "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: "button #{vote_button_classes(from_proposals_list)}" %>
           <% end %>
         <% end %>
       <% end %>

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

@@ -1,10 +1,27 @@
 <div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
   <% if !current_settings.votes_hidden? %>
-    <span class="<%= votes_count_classes(from_proposals_list)[:number] %>">
-      <%= proposal.proposal_votes_count %>
-    </span>
-    <span class="<%= votes_count_classes(from_proposals_list)[:label]  %>">
-      <%= t('.count', count: proposal.proposal_votes_count) %>
-    </span>
+    <% progress ||= proposal.proposal_votes_count || 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__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>
+      </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">
+          <div class="progress-meter progress__bar__bar--complete" style="width: <%= percent %>%"></div>
+          <div class="progress__bar__bar--incomplete" style="width:calc(100% - <%= percent %>%);"></div>
+        </div>
+        <div class="progress__bar__subtitle">
+          <% if progress >= total %>
+            <%= t('.most_popular_proposal') %>
+          <% else %>
+            <%= t('.need_more_votes') %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
   <% end %>
 </div>

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

@@ -1,4 +1,4 @@
-<% if votes_enabled? && (vote_limit_enabled? || maximum_votes_per_proposal_enabled? || proposal_limit_enabled?) %>
+<% if votes_enabled? && (vote_limit_enabled? || threshold_per_proposal_enabled? || proposal_limit_enabled? || can_accumulate_supports_beyond_threshold?) %>
   <div class="row column">
     <div class="callout secondary voting-rules">
       <div class="row">
@@ -13,8 +13,12 @@
               <li><%= t('.proposal_limit.description', limit: proposal_limit) %></li>
             <% end %>
 
-            <% if maximum_votes_per_proposal_enabled? %>
-              <li><%= t('.maximum_votes_per_proposal.description', limit: maximum_votes_per_proposal) %></li>
+            <% if threshold_per_proposal_enabled? %>
+              <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>
             <% end %>
           </ul>
         </div>

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

@@ -0,0 +1,16 @@
+<div class="columns large-3">
+  <div class="m-bottom">
+    <%= link_to :back do %>
+      <%= icon "chevron-left", class: "icon--small" %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
+  <div class="section">
+    <p>
+      <%= t(".info").html_safe %>
+    </p>
+  </div>
+  <div class="show-for-large">
+    <%= proposal_wizard_stepper(@step) %>
+  </div>
+</div>

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

@@ -0,0 +1,31 @@
+<% 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 %>
+  <%
+    locals = {
+      callout_class: "warning",
+      announcement: t("decidim.proposals.proposals.preview.proposal_edit_before_minutes", count: feature_settings.proposal_edit_before_minutes)
+    }
+  %>
+  <%= render partial: "decidim/shared/announcement", locals: locals %>
+<% end %>
+
+<% 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 } %>
+  </div>
+<% end %>
+
+<h2 class="section-heading">
+  <%= proposal_wizard_step_title action_name %>
+  <%= "(#{@similar_proposals.count})" if @similar_proposals.present? %>
+</h2>
+
+<div class="hide-for-large m-bottom">
+  <%= proposal_wizard_current_step_of(@step) %>
+
+  <ol id="steps" class="wizard__steps steps-toggle is-hidden" data-toggler=".is-hidden">
+    <%= proposal_wizard_stepper(@step) %>
+  </ol>
+</div>

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

@@ -0,0 +1,19 @@
+<div class="row">
+  <%= render partial: "wizard_aside" %>
+
+  <div class="columns large-6">
+    <%= 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} %>
+        <% end %>
+      </div>
+    <% end %>
+    <div class="row column text-center">
+      <%= link_to t(".mine_is_different"), preview_proposal_path(@proposal), class: "button small" %>
+    </div>
+  </div>
+  <div class="columns large-3"></div>
+</div>

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

@@ -0,0 +1,55 @@
+<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, 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 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("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 %>
+
+          <div class="actions">
+            <%= form.submit t(".send"), class: "button expanded", 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/new.html.erb

@@ -1,24 +1,10 @@
-<div class="row columns">
-  <%= link_to :back, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small" %>
-    <%= t(".back") %>
-  <% end %>
-  <h2 class="section-heading"><%= t(".title") %></h2>
-</div>
-
 <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 } %>
-      <% end %>
+  <%= render partial: "wizard_aside" %>
 
-      <div class="row column">
-        <div class="callout warning">
-          <%= t(".proposal_edit_before_minutes", count: feature_settings.proposal_edit_before_minutes) %>
-        </div>
-      </div>
+  <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">
@@ -52,7 +38,7 @@
 
           <% 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 %>
+              <%= user_group_select_field form, :user_group_id %>
             </div>
           <% end %>
 
@@ -72,12 +58,13 @@
           <% end %>
 
           <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded", data: { disable: true } %>
+            <%= 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/preview.html.erb

@@ -0,0 +1,18 @@
+<div class="row">
+  <%= render partial: "wizard_aside" %>
+
+  <div class="columns large-6">
+    <%= render partial: "wizard_header", locals: {callout_help_text_class: "warning"} %>
+    <div class="card">
+      <div class="p-l">
+        <%= render partial: "proposal_preview", locals: {proposal: @proposal}%>
+        <div class="row column flex-center">
+          <%= link_to t(".modify"), edit_draft_proposal_path(@proposal) %>
+
+          <%= button_to t(".publish"), publish_proposal_path(@proposal), method: :post, class: "button button--nomargin small" %>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="columns large-3"></div>
+</div>