diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
index 5d70d653c..2ac3bed87 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
@@ -9,8 +9,6 @@
.subtitle {
margin-top: 1rem;
margin-bottom: 1rem;
- background-color: #334d5c;
- color: white;
padding: 1rem;
}
.family-title {
@@ -20,10 +18,10 @@
color: white;
}
.budget-table th.charge {
- background-color: #df4949;
+ background-color: #e03851;
}
.budget-table th.resource {
- background-color: #43b29d;
+ background-color: #5ba1c1;
}
.budget-table th, td {
padding: 10px;
@@ -103,9 +101,9 @@
{{ f.amount|format_currency('EUR') }} |
{% if f.endDate is not null %}
- {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': f.startDate|format_date('long'), '%endDate%': f.endDate|format_date('long') } ) }}
+ {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': f.startDate|format_date('short'), '%endDate%': f.endDate|format_date('short') } ) }}
{% else %}
- {{ 'Valid since %startDate%'|trans( { '%startDate%': f.startDate|format_date('long') } ) }}
+ {{ 'Valid since %startDate%'|trans( { '%startDate%': f.startDate|format_date('short') } ) }}
{% endif %}
|
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
index 5ea0193d7..daceb05de 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
@@ -7,46 +7,55 @@
{% block title title %}
{% block personcontent %}
-{{ title }}
+
+ {{ title }}
-
- - {{ 'Type'|trans }}
- - {{ element.type|budget_element_type_display('resource') }}
-
- - {{ 'Amount'|trans }}
- - {{ element.amount|format_currency('EUR') }}
-
- - {{ 'Validity period'|trans }}
- -
- {% if element.endDate is not null %}
- {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|format_date('long'), '%endDate%': familyMember.endDate|format_date('long') } ) }}
- {% else %}
- {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|format_date('long') } ) }}
- {% endif %}
-
-
- - {{ 'Comment'|trans }}
- -
- {%- if element.comment is not empty -%}
-
- {{ element.comment }}
-
- {%- else -%}
- {{ 'Not given'|trans }}
- {%- endif -%}
-
-
+
+
+
+
+
+ {{ element.type|budget_element_type_display('resource') }}
+
+
+
+
+ - {{ 'Amount'|trans }}
+ - {{ element.amount|format_currency('EUR') }}
+ - {{ 'Validity period'|trans }}
+ -
+ {% if element.endDate is not null %}
+ {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|format_date('long'), '%endDate%': familyMember.endDate|format_date('long') } ) }}
+ {% else %}
+ {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|format_date('long') } ) }}
+ {% endif %}
+
+ - {{ 'Comment'|trans }}
+ -
+ {%- if element.comment is not empty -%}
+
+ {{ element.comment }}
+
+ {%- else -%}
+ {{ 'Not given'|trans }}
+ {%- endif -%}
+
+
+
+
+
+
{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss
index 61d975b42..459386ffd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss
@@ -11,3 +11,5 @@ $chill-household-context: #929d69;
$social-issue-color: #4bafe8;
$social-action-color: $orange;
$activity-color: yellowgreen;
+$budget-resource-color: #5ba1c1;
+$budget-charge-color: #e03851;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index 365074d05..b359f84d6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -176,6 +176,47 @@ div[class*='activity-'] {
}
}
+div[class*='budget-'] {
+ div.dashboard,
+ h4.badge-title,
+ h3.badge-title,
+ h2.badge-title {
+ span.title_label {
+ // Calculate same color then border:groove
+ &_resource {
+ background-color: shade-color($budget-resource-color, 34%);
+ }
+ &_charge {
+ background-color: shade-color($budget-charge-color, 34%);
+ }
+ h3 {
+ color: $white;
+ }
+ }
+ span.title_action {
+ &_resource {
+ @include dashboard_like_badge($budget-resource-color);
+ }
+ &_charge {
+ @include dashboard_like_badge($budget-charge-color);
+ }
+ }
+ span.title_label {
+ div.duration {
+ font-size: 70%;
+ font-weight: 500;
+ p {
+ margin-bottom: 0;
+ text-align: right;
+ abbr {
+ text-decoration: none;
+ }
+ }
+ }
+ }
+ }
+}
+
/*
* Pill badge by entity
*/
|