Merge pull request #1523 from consul/budgets-polish

Budgets polish

app/views/budgets/groups/show.html.erb

@@ -7,15 +7,21 @@
   </div>
 </div>
 
-<% if params[:unfeasible] %>
+<% if @current_filter == "unfeasible" %>
   <div class="row margin-top">
     <div class="small-12 column">
       <h3><%= t("budgets.groups.show.unfeasible_title") %></h3>
     </div>
   </div>
+<% elsif @current_filter == "unselected" %>
+  <div class="row margin-top">
+    <div class="small-12 column">
+      <h3><%= t("budgets.groups.show.unselected_title") %></h3>
+    </div>
+  </div>
 <% end %>
 
-<div class="row margin-top">
+<div class="row margin">
   <div id="select-district" class="small-12 medium-7 column select-district">
     <div class="row">
       <% @group.headings.each_slice(7) do |slice| %>
@@ -25,7 +31,7 @@
                   class="<%= css_for_ballot_heading(heading) %>">
               <%= link_to heading.name,
                           budget_investments_path(heading_id: heading.id,
-                                                  unfeasible: params[:unfeasible]),
+                                                  filter: @current_filter),
                           data: { no_turbolink: true } %><br>
             </span>
           <% end %>
@@ -39,11 +45,24 @@
   </div>
 </div>
 
-<% if params[:unfeasible].blank? %>
-  <div class="row margin-top">
+<% unless @current_filter == "unfeasible" %>
+  <div class="row">
     <div class="small-12 column">
-      <small><%= link_to t("budgets.groups.show.unfeasible"),
-                 budget_path(@budget, unfeasible: 1) %></small>
+      <small>
+        <%= link_to t("budgets.groups.show.unfeasible"),
+                    budget_path(@budget, filter: "unfeasible") %>
+      </small>
+    </div>
+  </div>
+<% end %>
+
+<% unless @current_filter == "unselected" %>
+  <div class="row">
+    <div class="small-12 column">
+      <small>
+        <%= link_to t("budgets.groups.show.unselected"),
+                    budget_path(@budget, filter: "unselected") %>
+      </small>
     </div>
   </div>
 <% end %>

app/views/budgets/investments/_investment.html.erb

@@ -73,6 +73,13 @@
                   ballot: ballot
                 } %>
           </div>
+        <% elsif investment.should_show_price? %>
+          <div id="<%= dom_id(investment) %>_price"
+               class="supports small-12 medium-3 column text-center">
+            <p class="investment-project-amount margin-top">
+              <%= investment.formatted_price %>
+            </p>
+          </div>
         <% end %>
 
       <% end %>

app/views/budgets/investments/_investment_show.html.erb

@@ -98,6 +98,15 @@
         </div>
         <br>
       <% end %>
+      <% if investment.should_show_price? %>
+        <div class="sidebar-divider"></div>
+        <h2><%= t("budgets.investments.show.price") %></h2>
+        <div class="supports text-center">
+          <p class="investment-project-amount">
+            <%= investment.formatted_price %>
+          </p>
+        </div>
+      <% end %>
       <div id="social-share" class="sidebar-divider"></div>
       <h2><%= t("budgets.investments.show.share") %></h2>
       <div class="social-share-full">

app/views/budgets/investments/index.html.erb

@@ -16,7 +16,7 @@
 
       <div class="small-12 search-results margin-bottom">
 
-        <% if params[:unfeasible].present? %>
+        <% if @current_filter == "unfeasible" %>
           <h2><%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %></h2>
           <div class="callout primary margin">
               <%= t("budgets.investments.index.unfeasible_text",
@@ -34,7 +34,7 @@
         <% end %>
       </div>
 
-      <%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless params[:unfeasible].present? %>
+      <%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless @current_filter == "unfeasible" %>
 
       <% @investments.each do |investment| %>
         <%= render partial: '/budgets/investments/investment', locals: {

app/views/budgets/show.html.erb

@@ -35,10 +35,12 @@
   </div>
 </div>
 
-<div class="row margin-top">
+<div class="row margin">
   <div class="small-12 medium-9 column">
-    <% if params[:unfeasible] %>
+    <% if @current_filter == "unfeasible" %>
       <h3 class="margin-bottom"><%= t("budgets.show.unfeasible_title") %></h3>
+    <% elsif @current_filter == "unselected" %>
+      <h3 class="margin-bottom"><%= t("budgets.show.unselected_title") %></h3>
     <% end %>
     <table class="table-fixed">
       <thead>
@@ -52,12 +54,12 @@
                 <%= link_to group.name,
                             budget_investments_path(@budget,
                               heading_id: group.headings.first.id,
-                              unfeasible: params[:unfeasible]),
+                              filter: @current_filter),
                             data: { no_turbolink: true } %>
               <% else %>
                 <%= link_to group.name,
                             budget_group_path(@budget, group,
-                              unfeasible: params[:unfeasible]) %>
+                              filter: @current_filter) %>
               <% end %>
               <br>
             </td>
@@ -68,11 +70,24 @@
   </div>
 </div>
 
-<% unless params[:unfeasible] %>
-  <div class="row margin-top">
+<% unless @current_filter == "unfeasible" %>
+  <div class="row">
     <div class="small-12 column">
-      <small><%= link_to t("budgets.show.unfeasible"),
-                  budget_path(@budget, unfeasible: 1) %></small>
+      <small>
+        <%= link_to t("budgets.show.unfeasible"),
+                    budget_path(@budget, filter: "unfeasible") %>
+      </small>
+    </div>
+  </div>
+<% end %>
+
+<% unless @current_filter == "unselected" %>
+  <div class="row">
+    <div class="small-12 column">
+      <small>
+        <%= link_to t("budgets.show.unselected"),
+                    budget_path(@budget, filter: "unselected") %>
+      </small>
     </div>
   </div>
 <% end %>