diff --git a/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss b/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
index 2be4cff6f..f7eaf2500 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
+++ b/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
@@ -13,12 +13,12 @@
}
.budget-table {
th.charge {
- background-color: $budget-charge-color;
+ background-color: #6d9e63;
}
}
.budget-table {
th.resource {
- background-color: $budget-resource-color;
+ background-color: #e03851;
}
}
.budget-table {
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
index d42af20c3..1ff8f2998 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
@@ -49,18 +49,34 @@
{% endif %}
+
{{ 'Past budget'|trans }}
+
{% if pastCharges|length > 0 or pastResources|length > 0 %}
{% include 'ChillBudgetBundle:Budget:_past_budget.html.twig' with {
'pastCharges': pastCharges,
'pastResources': pastResources,
'entity': entity
} %}
+{% else %}
+
+
+
{{ "There isn't any element recorded"|trans }}
+
+
{% endif %}
+{{ 'Future budget'|trans }}
+
{% if futureCharges|length > 0 or futureResources|length > 0 %}
{% include 'ChillBudgetBundle:Budget:_future_budget.html.twig' with {
'futureResources': futureResources,
'futureCharges': futureCharges,
'entity': entity
} %}
+{% else %}
+
+
+
{{ "There isn't any element recorded"|trans }}
+
+
{% endif %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
index a8e390832..1547d8749 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
@@ -1,7 +1,5 @@
{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
-{{ 'Future budget'|trans }}
-