Merge pull request #2575 from consul/no-budgets

Display message in budget's index when there are no budgets
This commit is contained in:
Raimond Garcia
2018-04-05 16:39:17 +02:00
committed by GitHub
5 changed files with 165 additions and 137 deletions

View File

@@ -65,6 +65,7 @@ module BudgetsHelper
end end
def current_budget_map_locations def current_budget_map_locations
return unless current_budget.present?
MapLocation.where(investment_id: current_budget.investments).map { |l| l.json_data } MapLocation.where(investment_id: current_budget.investments).map { |l| l.json_data }
end end
end end

View File

@@ -1,9 +1,10 @@
<% provide :title do %><%= t('budgets.index.title') %><% end %> <% provide :title do %><%= t("budgets.index.title") %><% end %>
<% content_for :canonical do %> <% content_for :canonical do %>
<%= render "shared/canonical", href: budgets_url %> <%= render "shared/canonical", href: budgets_url %>
<% end %> <% end %>
<div id="budget_heading" class="expanded budget no-margin-top"> <% if current_budget.present? %>
<div id="budget_heading" class="expanded budget no-margin-top">
<div class="row" data-equalizer data-equalizer-on="medium"> <div class="row" data-equalizer data-equalizer-on="medium">
<div class="small-12 medium-9 column padding" data-equalizer-watch> <div class="small-12 medium-9 column padding" data-equalizer-watch>
@@ -55,9 +56,9 @@
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>
<div id="budget_info" class="budget-info"> <div id="budget_info" class="budget-info">
<div class="row margin-top"> <div class="row margin-top">
<div class="small-12 column"> <div class="small-12 column">
@@ -151,8 +152,26 @@
</div> </div>
</div> </div>
<% end %> <% end %>
</div>
<% else %>
<div class="expanded budget no-margin-top margin-bottom">
<div class="row">
<div class="small-12 medium-9 column padding">
<h1><%= t("budgets.index.title") %></h1>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="small-12 column">
<div class="callout primary">
<%= t("budgets.index.empty_budgets") %>
</div>
</div>
</div>
<% end %>
<div class="row">
<div class="small-12 column"> <div class="small-12 column">
<div id="section_help" class="margin" data-magellan-target="section_help"> <div id="section_help" class="margin" data-magellan-target="section_help">
<p class="lead"> <p class="lead">
@@ -166,5 +185,4 @@
<p><%= t("budgets.index.section_footer.help_text_4") %></p> <p><%= t("budgets.index.section_footer.help_text_4") %></p>
</div> </div>
</div> </div>
</div>
</div> </div>

View File

@@ -41,6 +41,7 @@ en:
finished: Finished budget finished: Finished budget
index: index:
title: Participatory budgets title: Participatory budgets
empty_budgets: There are no budgets.
section_header: section_header:
icon_alt: Participatory budgets icon icon_alt: Participatory budgets icon
title: Participatory budgets title: Participatory budgets

View File

@@ -41,6 +41,7 @@ es:
finished: Resultados finished: Resultados
index: index:
title: Presupuestos participativos title: Presupuestos participativos
empty_budgets: No hay presupuestos participativos.
section_header: section_header:
icon_alt: Icono de Presupuestos participativos icon_alt: Icono de Presupuestos participativos
title: Presupuestos participativos title: Presupuestos participativos

View File

@@ -117,6 +117,13 @@ feature 'Budgets' do
end end
end end
scenario "No budgets" do
Budget.destroy_all
visit budgets_path
expect(page).to have_content "There are no budgets"
end
end end
scenario 'Index shows only published phases' do scenario 'Index shows only published phases' do