From 5654c5ffaa85f8f0f9876198ec230374011de5ff Mon Sep 17 00:00:00 2001 From: gabemart Date: Fri, 12 Jun 2015 11:37:23 +0100 Subject: [PATCH 01/19] [#1615] change "Update list" to "Search" --- akvo/templates/project_directory.html | 2 +- akvo/templates/update_directory.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akvo/templates/project_directory.html b/akvo/templates/project_directory.html index c8e355ce88..67e5296e71 100644 --- a/akvo/templates/project_directory.html +++ b/akvo/templates/project_directory.html @@ -15,7 +15,7 @@
{% bootstrap_field filter.form.title field_class='search-query' show_label=False %} - +
{% trans 'Advanced filters' %} diff --git a/akvo/templates/update_directory.html b/akvo/templates/update_directory.html index 0cc32956b8..0c39dc2bd3 100644 --- a/akvo/templates/update_directory.html +++ b/akvo/templates/update_directory.html @@ -16,7 +16,7 @@
{% bootstrap_field filter.form.title field_class='search-query' show_label=False %} - +
{% trans 'Advanced filters' %} From 29e74dc1ff6d093a74c82259c64415f44ec7bbb1 Mon Sep 17 00:00:00 2001 From: gabemart Date: Fri, 12 Jun 2015 11:44:29 +0100 Subject: [PATCH 02/19] [#1615] round "Project financial details" figures to nearest int --- akvo/templates/project_finance.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/akvo/templates/project_finance.html b/akvo/templates/project_finance.html index 4ff480781d..35199fab39 100644 --- a/akvo/templates/project_finance.html +++ b/akvo/templates/project_finance.html @@ -15,12 +15,12 @@

{% trans "Project financial details" %}:

{% for budget_item in project.budget_items.all %} {% if 'other' in budget_item.label.label and budget_item.other_extra %} -
{{budget_item.other_extra}}:
{{project.get_currency_display}}{{budget_item.amount|floatformat:2|intcomma}}
+
{{budget_item.other_extra}}:
{{project.get_currency_display}}{{budget_item.amount|floatformat:0|intcomma}}
{% else %} -
{{budget_item.label.label}}:
{{project.get_currency_display}}{{budget_item.amount|floatformat:2|intcomma}}
+
{{budget_item.label.label}}:
{{project.get_currency_display}}{{budget_item.amount|floatformat:0|intcomma}}
{% endif %} {% endfor %} -
{% trans "Total" %}:
{{project.get_currency_display}}{{project.budget|floatformat:2|intcomma}}
+
{% trans "Total" %}:
{{project.get_currency_display}}{{project.budget|floatformat:0|intcomma}}
From 080db3e5ed9cfea88da45134a319839fa1c4f248 Mon Sep 17 00:00:00 2001 From: gabemart Date: Mon, 15 Jun 2015 13:37:42 +0100 Subject: [PATCH 03/19] [#1615] align project report page --- akvo/rsr/static/styles-src/main.css | 9 +++++++++ akvo/rsr/static/styles-src/main.scss | 18 ++++++++++++++++++ akvo/templates/project_report.html | 6 +++--- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css index 13790a3d7a..29e7ec4960 100755 --- a/akvo/rsr/static/styles-src/main.css +++ b/akvo/rsr/static/styles-src/main.css @@ -1556,6 +1556,15 @@ section.projectPartners .row { dd.currencyAmount { margin-left: auto; } +/* Project report page */ +@media only screen and (max-width: 768px) { + .projectReport { + max-width: 95%; + margin-left: auto; + margin-right: auto; } } +.projectReport .participatingOrganisations th, .projectReport .reportingOrganisation th { + width: 8em; } + /* Cookie */ #cookie-law { position: fixed; diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss index 1d1a94fc39..013cb84375 100755 --- a/akvo/rsr/static/styles-src/main.scss +++ b/akvo/rsr/static/styles-src/main.scss @@ -1948,6 +1948,24 @@ dd { } } +/* Project report page */ + +.projectReport { + + @include responsive(small-max-screens) { + max-width: 95%; + margin-left: auto; + margin-right: auto; + } + + .participatingOrganisations, + .reportingOrganisation { + th { + width: 8em; + } + } +} + /* Cookie */ #cookie-law { diff --git a/akvo/templates/project_report.html b/akvo/templates/project_report.html index 624c802ee2..755a4ce448 100644 --- a/akvo/templates/project_report.html +++ b/akvo/templates/project_report.html @@ -5,7 +5,7 @@ {% block title %}{{project.title}} - {% trans "Report" %}{% endblock %} {% block maincontent %} -
+
{% include "partials/project_header.html" %}
@@ -491,7 +491,7 @@

{% trans "Indicators" %}

{% trans "Reporting Organisation" %}

{% with reporting_org=project.reporting_org %} - +
@@ -515,7 +515,7 @@

{% trans "Reporting Organisation" %}

{% trans "Participating Organisations" %}

{% for partner, info in project.partners_info.items %} -
{% trans "Name" %}
+
From 51ca6ebab0c2fa730987e41e8c0755704911686e Mon Sep 17 00:00:00 2001 From: gabemart Date: Mon, 15 Jun 2015 13:45:11 +0100 Subject: [PATCH 04/19] [#1615] change "current situation" to "situation at start of project" --- akvo/templates/project_main.html | 2 +- akvo/templates/project_report.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akvo/templates/project_main.html b/akvo/templates/project_main.html index c694cde2ff..0a977aa2d6 100644 --- a/akvo/templates/project_main.html +++ b/akvo/templates/project_main.html @@ -137,7 +137,7 @@

{% trans 'Latest project updates' %}

"actual_text": "{% trans 'actual' %}", "target_text": "{% trans 'target' %}", "background_text": "{% trans 'Background' %}", - "current_situation_text": "{% trans 'Current situation' %}", + "current_situation_text": "{% trans 'Situation at start of project' %}", "goals_overview_text": "{% trans 'Goals overview' %}", "project_plan_text": "{% trans 'Project plan' %}", "sustainability_text": "{% trans 'Sustainability' %}", diff --git a/akvo/templates/project_report.html b/akvo/templates/project_report.html index 755a4ce448..3c0c1a4edd 100644 --- a/akvo/templates/project_report.html +++ b/akvo/templates/project_report.html @@ -118,7 +118,7 @@

{% trans "Descriptions" %}

 - + From 9d9bd05720d86e73de8c6c02c612b71a6529156b Mon Sep 17 00:00:00 2001 From: gabemart Date: Tue, 16 Jun 2015 16:31:54 +0100 Subject: [PATCH 05/19] [#1615] show line breaks on project updates --- akvo/rsr/static/styles-src/main.css | 4 ++++ akvo/rsr/static/styles-src/main.scss | 6 ++++++ akvo/templates/update_main.html | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css index 29e7ec4960..e529988beb 100755 --- a/akvo/rsr/static/styles-src/main.css +++ b/akvo/rsr/static/styles-src/main.css @@ -1565,6 +1565,10 @@ dd.currencyAmount { .projectReport .participatingOrganisations th, .projectReport .reportingOrganisation th { width: 8em; } +/* Project update page */ +.updateText { + white-space: pre-line; } + /* Cookie */ #cookie-law { position: fixed; diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss index 013cb84375..1c74a9a45a 100755 --- a/akvo/rsr/static/styles-src/main.scss +++ b/akvo/rsr/static/styles-src/main.scss @@ -1966,6 +1966,12 @@ dd { } } +/* Project update page */ + +.updateText { + white-space: pre-line; +} + /* Cookie */ #cookie-law { diff --git a/akvo/templates/update_main.html b/akvo/templates/update_main.html index 9d74a08528..3fc0224c04 100644 --- a/akvo/templates/update_main.html +++ b/akvo/templates/update_main.html @@ -52,7 +52,7 @@
"{{ update.photo_caption }}"{% if update.photo_credit %}
{% endif %} {% autoescape off %} -

{{ update.text|force_escape|urlize|apply_markup:"markdown" }}

+
{{ update.text|force_escape|urlize|apply_markup:"markdown" }}
{% endautoescape %} From e390a4eb89bfc1fab14ae1dd4e9516f37df10309 Mon Sep 17 00:00:00 2001 From: gabemart Date: Tue, 16 Jun 2015 17:13:39 +0100 Subject: [PATCH 06/19] [#1615] set minimum button width on myrsr "my projects" list --- akvo/rsr/static/styles-src/main.css | 8 ++++++++ akvo/rsr/static/styles-src/main.scss | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css index e529988beb..e0d14d4d06 100755 --- a/akvo/rsr/static/styles-src/main.css +++ b/akvo/rsr/static/styles-src/main.css @@ -533,6 +533,14 @@ nav.navbar-fixed-top { background: rgba(32, 32, 36, 0.1) !important; } .myProjectList tbody tr.isPublished { background: white !important; } +@media only screen and (min-width: 1200px) { + .myProjectList div.twoColumns.clearfix { + min-width: 170px; } } +.myProjectList div.twoColumns.clearfix > a { + min-width: 70px; } + +div.paginationWrap { + clear: both; } #profile .usrAvatar { background-color: rgba(32, 32, 36, 0); diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss index 1c74a9a45a..8c63338d00 100755 --- a/akvo/rsr/static/styles-src/main.scss +++ b/akvo/rsr/static/styles-src/main.scss @@ -596,6 +596,20 @@ nav.navbar-fixed-top { } } } + + div.twoColumns.clearfix { + @media only screen and (min-width:$width-large) { + min-width: 170px; + } + + > a { + min-width: 70px; + } + } +} + +div.paginationWrap { + clear: both; } #profile { From 0c9ab8f0a03f9e93ccb4a33fe86e12eb876376c1 Mon Sep 17 00:00:00 2001 From: gabemart Date: Tue, 16 Jun 2015 18:18:54 +0100 Subject: [PATCH 07/19] [#1615] add total budget and funds needed to donate button --- akvo/templates/project_main.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/akvo/templates/project_main.html b/akvo/templates/project_main.html index 0a977aa2d6..ebe171fdb1 100644 --- a/akvo/templates/project_main.html +++ b/akvo/templates/project_main.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load compressed i18n rsr_utils %} -{% load rsr_filters %} +{% load rsr_filters humanize %} {% block title %}{{project.title}}{% endblock title%} {% block head_js %} @@ -71,7 +71,8 @@ {% if project.accepts_donations %}
  • -
    {% trans 'Budget Needed' %}:
    {{project.get_currency_display}}{{project.funds_needed}}
    +
    {% trans 'Total Budget' %}:
    {{project.get_currency_display}}{{project.budget|floatformat|intcomma}}
    +
    {% trans 'Funds Needed' %}:
    {{project.get_currency_display}}{{project.funds_needed|floatformat|intcomma}}
    {% trans "Donate" %}
    • From 7c75168688305607847e7d8f7ba2a8f6ad6c3f35 Mon Sep 17 00:00:00 2001 From: gabemart Date: Tue, 16 Jun 2015 18:25:03 +0100 Subject: [PATCH 08/19] [#1615] round all figures on project finance page --- akvo/templates/project_finance.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/akvo/templates/project_finance.html b/akvo/templates/project_finance.html index 35199fab39..95add9821b 100644 --- a/akvo/templates/project_finance.html +++ b/akvo/templates/project_finance.html @@ -26,9 +26,9 @@

    {% trans "Project financial details" %}:

    {% trans "Project funding" %}:

    -
    {% trans "Budget" %}:
    {{project.get_currency_display}}{{project.budget|floatformat:2|intcomma}}
    -
    {% trans "Funded" %}:
    {{project.get_currency_display}}{{project.funds|floatformat:2|intcomma}}
    -
    {% trans "Funds needed" %}:
    {{project.get_currency_display}}{{project.funds_needed|floatformat:2|intcomma}}
    +
    {% trans "Budget" %}:
    {{project.get_currency_display}}{{project.budget|floatformat:0|intcomma}}
    +
    {% trans "Funded" %}:
    {{project.get_currency_display}}{{project.funds|floatformat:0|intcomma}}
    +
    {% trans "Funds needed" %}:
    {{project.get_currency_display}}{{project.funds_needed|floatformat:0|intcomma}}
    @@ -39,7 +39,7 @@

    {% trans "Current funders" %}:

    {{partnership.organisation}} {% if partnership.funding_amount %} -
    {{project.get_currency_display}}{{partnership.funding_amount|floatformat:2|intcomma}} +
    {{project.get_currency_display}}{{partnership.funding_amount|floatformat:0|intcomma}} {% endif %}
    @@ -47,12 +47,12 @@

    {% trans "Current funders" %}:

    {% trans "Donations" %}:

    {% for donation in project.all_donations %} -
    {% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:
    {{project.get_currency_display}}{{donation.amount_received|floatformat:2|intcomma}}
    +
    {% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:
    {{project.get_currency_display}}{{donation.amount_received|floatformat:0|intcomma}}
    {% empty %}
    {% trans "No donations" %}
    {% endfor %} {% if project.all_donations %} -
    {% trans "Total" %}:
    {{project.get_currency_display}}{{project.all_donations_amount_received|floatformat:2|intcomma}}
    +
    {% trans "Total" %}:
    {{project.get_currency_display}}{{project.all_donations_amount_received|floatformat:0|intcomma}}
    {% endif %}
    @@ -62,7 +62,7 @@

    {% trans "Project transactions" %}:

    {% if project.transactions.all %}
    {% for transaction in project.transactions.all %} -
    {% if transaction.description %}{{transaction.description}}{% else %}{{transaction.iati_transaction_type}}{% endif %}:
    {{project.get_currency_display}}{{transaction.value|floatformat:2|intcomma}}
    +
    {% if transaction.description %}{{transaction.description}}{% else %}{{transaction.iati_transaction_type}}{% endif %}:
    {{project.get_currency_display}}{{transaction.value|floatformat:0|intcomma}}
    {% endfor %}
    {% else %} From 5c2e1040f3304497ca5b75777d636ec81ce8ce39 Mon Sep 17 00:00:00 2001 From: gabemart Date: Tue, 16 Jun 2015 18:41:58 +0100 Subject: [PATCH 09/19] [#1615] "Results" -> "Results and indicators" on project page --- akvo/templates/project_main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akvo/templates/project_main.html b/akvo/templates/project_main.html index ebe171fdb1..2c4de9260d 100644 --- a/akvo/templates/project_main.html +++ b/akvo/templates/project_main.html @@ -143,7 +143,7 @@

    {% trans 'Latest project updates' %}

    "project_plan_text": "{% trans 'Project plan' %}", "sustainability_text": "{% trans 'Sustainability' %}", "target_group_text": "{% trans 'Target group' %}", - "results_text": "{% trans 'Results' %}" + "results_text": "{% trans 'Results and indicators' %}" } From 5a58a84c04cbbd61a91a7006f83a588d1e5c9aa9 Mon Sep 17 00:00:00 2001 From: gabemart Date: Tue, 16 Jun 2015 19:20:19 +0100 Subject: [PATCH 10/19] [#1615] standardise spacing on project report page --- akvo/rsr/static/styles-src/main.css | 13 +++++++++++-- akvo/rsr/static/styles-src/main.scss | 17 +++++++++++++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css index e0d14d4d06..b60d6b2853 100755 --- a/akvo/rsr/static/styles-src/main.css +++ b/akvo/rsr/static/styles-src/main.css @@ -1570,8 +1570,17 @@ dd.currencyAmount { max-width: 95%; margin-left: auto; margin-right: auto; } } -.projectReport .participatingOrganisations th, .projectReport .reportingOrganisation th { - width: 8em; } +@media only screen and (min-width: 992px) { + .projectReport table { + table-layout: fixed; } + .projectReport table th { + word-break: break-word; } + @media only screen and (max-width: 1200px) { + .projectReport table th { + width: 90px; } } + @media only screen and (min-width: 1200px) { + .projectReport table th { + width: 120px; } } } /* Project update page */ .updateText { diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss index 8c63338d00..05ff09e09a 100755 --- a/akvo/rsr/static/styles-src/main.scss +++ b/akvo/rsr/static/styles-src/main.scss @@ -1972,10 +1972,19 @@ dd { margin-right: auto; } - .participatingOrganisations, - .reportingOrganisation { - th { - width: 8em; + @media only screen and (min-width: $width-medium) { + table { + table-layout: fixed; + + th { + @media only screen and (max-width: $width-large) { + width: 90px; + } + @media only screen and (min-width: $width-large) { + width: 120px; + } + word-break: break-word; + } } } } From 9e197369f6af9e69a17c1a99292c3460fcfe441f Mon Sep 17 00:00:00 2001 From: gabemart Date: Wed, 17 Jun 2015 15:09:43 +0100 Subject: [PATCH 11/19] [#1615] change "Update list" to "Search" in organisation directory --- akvo/templates/organisation_directory.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akvo/templates/organisation_directory.html b/akvo/templates/organisation_directory.html index 46ca1c5508..3c65a02164 100644 --- a/akvo/templates/organisation_directory.html +++ b/akvo/templates/organisation_directory.html @@ -17,7 +17,7 @@
    {% bootstrap_field filter.form.name field_class='search-query' show_label=False %} - +
    {% trans 'Advanced filters' %} From 72948cbdaac9322725b0e0b065edcbeb064435c3 Mon Sep 17 00:00:00 2001 From: gabemart Date: Wed, 17 Jun 2015 15:20:11 +0100 Subject: [PATCH 12/19] [#1615] change my_iati text --- akvo/templates/myrsr/my_iati.html | 2 +- akvo/templates/project_finance.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/akvo/templates/myrsr/my_iati.html b/akvo/templates/myrsr/my_iati.html index 4c6c931b8e..38b2ee0ccc 100644 --- a/akvo/templates/myrsr/my_iati.html +++ b/akvo/templates/myrsr/my_iati.html @@ -25,7 +25,7 @@

    {% trans "My IATI" %}{% if selected_org %} {% trans "for" %} {{selected_org. {% trans 'When the IATI file is generated, it will be shown in the overview on the right.' %} {% endif %} - {% trans 'On this page it is possible to export an IATI file of the projects of your organisation or view previously exported files. ' %} + {% trans 'IATI stands for International Aid Transparency Initiative, which is a global reporting standard that makes it possible to compare and compile data sets from different projects and organisations. On this page it is possible to export an IATI file of the projects of your organisation or view previously exported files.' %} {% if not selected_org %} {% trans 'Since your account is connected to multiple organisations, please select an organisation first.' %}

    diff --git a/akvo/templates/project_finance.html b/akvo/templates/project_finance.html index 95add9821b..e598ddf3f2 100644 --- a/akvo/templates/project_finance.html +++ b/akvo/templates/project_finance.html @@ -14,6 +14,7 @@

    {% trans "Project financial details" %}:

    {% for budget_item in project.budget_items.all %} + {{budget.period_start}} {% if 'other' in budget_item.label.label and budget_item.other_extra %}
    {{budget_item.other_extra}}:
    {{project.get_currency_display}}{{budget_item.amount|floatformat:0|intcomma}}
    {% else %} From ad8d0669f248ce8f92137d6c9a0108d669981f1d Mon Sep 17 00:00:00 2001 From: gabemart Date: Wed, 17 Jun 2015 15:21:04 +0100 Subject: [PATCH 13/19] [#1615] remove budget.period_start from project_finance --- akvo/templates/project_finance.html | 1 - 1 file changed, 1 deletion(-) diff --git a/akvo/templates/project_finance.html b/akvo/templates/project_finance.html index e598ddf3f2..95add9821b 100644 --- a/akvo/templates/project_finance.html +++ b/akvo/templates/project_finance.html @@ -14,7 +14,6 @@

    {% trans "Project financial details" %}:

    {% for budget_item in project.budget_items.all %} - {{budget.period_start}} {% if 'other' in budget_item.label.label and budget_item.other_extra %}
    {{budget_item.other_extra}}:
    {{project.get_currency_display}}{{budget_item.amount|floatformat:0|intcomma}}
    {% else %} From d976ab3afb981f14961d5617c3a2f50a030e948b Mon Sep 17 00:00:00 2001 From: gabemart Date: Wed, 17 Jun 2015 15:58:50 +0100 Subject: [PATCH 14/19] [#1615] show other_extra for budget items in project report --- akvo/templates/project_report.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/akvo/templates/project_report.html b/akvo/templates/project_report.html index 3c0c1a4edd..c6c2f6b04a 100644 --- a/akvo/templates/project_report.html +++ b/akvo/templates/project_report.html @@ -291,7 +291,11 @@

    {% trans "Product Budget Items" %}

     {% for budget_item in project.budget_items.all %} - + {% if 'other' in budget_item.label.label and budget_item.other_extra %} + + {% else %} + + {% endif %} From bf25136991301a5c3d905a8a16f58fd2e814b70c Mon Sep 17 00:00:00 2001 From: gabemart Date: Wed, 17 Jun 2015 16:28:42 +0100 Subject: [PATCH 15/19] [#1615] include project footer on project report page --- akvo/templates/project_report.html | 1 + 1 file changed, 1 insertion(+) diff --git a/akvo/templates/project_report.html b/akvo/templates/project_report.html index c6c2f6b04a..ce16b123d5 100644 --- a/akvo/templates/project_report.html +++ b/akvo/templates/project_report.html @@ -627,5 +627,6 @@

    {% trans "Additional Details" %}

    +{% include "partials/project_footer.html" %} {% endblock %} From 6e6482c78b57b43c322316c457d55c6b469dffec Mon Sep 17 00:00:00 2001 From: gabemart Date: Wed, 17 Jun 2015 16:52:48 +0100 Subject: [PATCH 16/19] [#1615] right-align funding amounts on project finance page --- akvo/rsr/static/styles-src/main.css | 2 ++ akvo/rsr/static/styles-src/main.scss | 9 +++++++++ akvo/templates/project_finance.html | 12 ++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css index b60d6b2853..9e4f7291f2 100755 --- a/akvo/rsr/static/styles-src/main.css +++ b/akvo/rsr/static/styles-src/main.css @@ -1497,6 +1497,8 @@ div.textBlock { margin-bottom: 1em; } } /* Financial details page */ +section.projectFinancial .currentFunders dl > dd { + text-align: right; } @media only screen and (max-width: 768px) { section.projectFinancial { width: 95%; diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss index 05ff09e09a..86d5471ca9 100755 --- a/akvo/rsr/static/styles-src/main.scss +++ b/akvo/rsr/static/styles-src/main.scss @@ -1862,6 +1862,15 @@ div.textBlock { /* Financial details page */ section.projectFinancial { + + .currentFunders { + dl { + > dd { + text-align: right; + } + } + } + @include responsive(small-max-screens) { width: 95%; max-width: 450px; diff --git a/akvo/templates/project_finance.html b/akvo/templates/project_finance.html index 95add9821b..29dfb2417b 100644 --- a/akvo/templates/project_finance.html +++ b/akvo/templates/project_finance.html @@ -28,19 +28,19 @@

    {% trans "Project funding" %}:

    {% trans "Budget" %}:
    {{project.get_currency_display}}{{project.budget|floatformat:0|intcomma}}
    {% trans "Funded" %}:
    {{project.get_currency_display}}{{project.funds|floatformat:0|intcomma}}
    -
    {% trans "Funds needed" %}:
    {{project.get_currency_display}}{{project.funds_needed|floatformat:0|intcomma}}
    +
    {% trans "Funds needed" %}:
    +
    + {{project.get_currency_display}}{% if project.funds_needed >= 0 %}{{project.funds_needed|floatformat:0|intcomma}}{% else %}0{% endif %} +
    -
    +

    {% trans "Current funders" %}:

    {% for partnership in project.funding_partnerships %}
    {% img partnership.organisation 80 60 partnership.organisation.name %}
    - {{partnership.organisation}} - {% if partnership.funding_amount %} -
    {{project.get_currency_display}}{{partnership.funding_amount|floatformat:0|intcomma}} - {% endif %} + {{partnership.organisation}}{% if partnership.funding_amount %}
    {{project.get_currency_display}}{{partnership.funding_amount|floatformat:0|intcomma}}{% endif %}
    {% endfor %} From 43da0bf0ce1fbe9be03a035459b5fd826858b53f Mon Sep 17 00:00:00 2001 From: gabemart Date: Wed, 17 Jun 2015 17:14:07 +0100 Subject: [PATCH 17/19] [#1615] reorganize columns on finance page --- akvo/rsr/views/project.py | 4 +++- akvo/templates/project_finance.html | 28 +++++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/akvo/rsr/views/project.py b/akvo/rsr/views/project.py index f25da9e7ba..4c047e614a 100644 --- a/akvo/rsr/views/project.py +++ b/akvo/rsr/views/project.py @@ -469,8 +469,10 @@ def partners(request, project_id): def finance(request, project_id): """.""" project = get_object_or_404(Project, pk=project_id) + pledged = project.get_pledged() context = { - 'project': project + 'project': project, + 'pledged': pledged, } return render(request, 'project_finance.html', context) diff --git a/akvo/templates/project_finance.html b/akvo/templates/project_finance.html index 29dfb2417b..b7cfe5823e 100644 --- a/akvo/templates/project_finance.html +++ b/akvo/templates/project_finance.html @@ -23,17 +23,6 @@

    {% trans "Project financial details" %}:

    {% trans "Total" %}:
    {{project.get_currency_display}}{{project.budget|floatformat:0|intcomma}}
    -
    -

    {% trans "Project funding" %}:

    -
    -
    {% trans "Budget" %}:
    {{project.get_currency_display}}{{project.budget|floatformat:0|intcomma}}
    -
    {% trans "Funded" %}:
    {{project.get_currency_display}}{{project.funds|floatformat:0|intcomma}}
    -
    {% trans "Funds needed" %}:
    -
    - {{project.get_currency_display}}{% if project.funds_needed >= 0 %}{{project.funds_needed|floatformat:0|intcomma}}{% else %}0{% endif %} -
    -
    -

    {% trans "Current funders" %}:

    {% for partnership in project.funding_partnerships %} @@ -42,6 +31,9 @@

    {% trans "Current funders" %}:

    {{partnership.organisation}}{% if partnership.funding_amount %}
    {{project.get_currency_display}}{{partnership.funding_amount|floatformat:0|intcomma}}{% endif %}
    + {% if pledged %} +
    {% trans "Total" %}:
    {{project.get_currency_display}}{{pledged|floatformat:0|intcomma}}
    + {% endif %} {% endfor %}

    {% trans "Donations" %}:

    @@ -56,6 +48,20 @@

    {% trans "Donations" %}:

    {% endif %}
    +
    +

    {% trans "Project funding" %}:

    +
    +
    {% trans "Current funders" %}:
    {{project.get_currency_display}}{% if pledged %}{{pledged|floatformat:0|intcomma}}{% else %}0{% endif %}
    +
    {% trans "Donations" %}:
    {{project.get_currency_display}}{% if project.all_donations_amount_received %}{{project.all_donations_amount_received|floatformat:0|intcomma}}{% else %}0{% endif %}
    +
    +
    {% trans "Total funded" %}:
    {{project.get_currency_display}}{{project.funds|floatformat:0|intcomma}}
    +
    {% trans "Budget" %}:
    {{project.get_currency_display}}{{project.budget|floatformat:0|intcomma}}
    +
    {% trans "Funds needed" %}:
    +
    + {{project.get_currency_display}}{% if project.funds_needed >= 0 %}{{project.funds_needed|floatformat:0|intcomma}}{% else %}0{% endif %} +
    +
    +

    {% trans "Project transactions" %}:

    From 2484a0b998f42413cbea000b2f998eb67734f02a Mon Sep 17 00:00:00 2001 From: gabemart Date: Thu, 18 Jun 2015 09:13:11 +0100 Subject: [PATCH 18/19] [#1615] Change "Project financial details" to "Project budget" --- akvo/templates/project_finance.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akvo/templates/project_finance.html b/akvo/templates/project_finance.html index b7cfe5823e..e309c4ccf2 100644 --- a/akvo/templates/project_finance.html +++ b/akvo/templates/project_finance.html @@ -11,7 +11,7 @@
    -

    {% trans "Project financial details" %}:

    +

    {% trans "Project budget" %}:

    {% for budget_item in project.budget_items.all %} {% if 'other' in budget_item.label.label and budget_item.other_extra %} @@ -55,7 +55,7 @@

    {% trans "Project funding" %}:

    {% trans "Donations" %}:
    {{project.get_currency_display}}{% if project.all_donations_amount_received %}{{project.all_donations_amount_received|floatformat:0|intcomma}}{% else %}0{% endif %}
    {% trans "Total funded" %}:
    {{project.get_currency_display}}{{project.funds|floatformat:0|intcomma}}
    -
    {% trans "Budget" %}:
    {{project.get_currency_display}}{{project.budget|floatformat:0|intcomma}}
    +
    {% trans "Project budget" %}:
    {{project.get_currency_display}}{{project.budget|floatformat:0|intcomma}}
    {% trans "Funds needed" %}:
    {{project.get_currency_display}}{% if project.funds_needed >= 0 %}{{project.funds_needed|floatformat:0|intcomma}}{% else %}0{% endif %} From 24b254f4afce6137f9cfcf562028497cb09f4093 Mon Sep 17 00:00:00 2001 From: gabemart Date: Thu, 18 Jun 2015 10:11:51 +0100 Subject: [PATCH 19/19] [#1615] display donation fee amount --- akvo/rsr/static/styles-src/main.css | 11 +++++++++- akvo/rsr/static/styles-src/main.scss | 31 ++++++++++++++++++++-------- akvo/templates/project_finance.html | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css index 9e4f7291f2..8d3b279cb2 100755 --- a/akvo/rsr/static/styles-src/main.css +++ b/akvo/rsr/static/styles-src/main.css @@ -1499,6 +1499,8 @@ div.textBlock { /* Financial details page */ section.projectFinancial .currentFunders dl > dd { text-align: right; } +section.projectFinancial .donationBreak { + display: none; } @media only screen and (max-width: 768px) { section.projectFinancial { width: 95%; @@ -1510,7 +1512,14 @@ section.projectFinancial .currentFunders dl > dd { @media only screen and (max-width: 992px) { @media only screen and (min-width: 768px) { section.projectFinancial .dl-horizontal dt { - width: initial; } } } + width: initial; } + section.projectFinancial .donationBreak { + display: initial; + clear: both; } + section.projectFinancial .currentFunders dd.donation { + float: right; } + section.projectFinancial .currentFunders dt.donation { + clear: both; } } } /* Project Partners details page */ section.projectPartners .title { diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss index 86d5471ca9..dd55cdcf30 100755 --- a/akvo/rsr/static/styles-src/main.scss +++ b/akvo/rsr/static/styles-src/main.scss @@ -480,7 +480,7 @@ nav.navbar-fixed-top { .navbar-collapse { &.in { /* Allow language dropdown menu to extend the height of the nav container. - Otherwise, we get a scrollbar in the nav area on small screens */ + Otherwise, we get a scrollbar in the nav area on small screens */ @include responsive(small-max-screens) { overflow-y: initial; } @@ -596,12 +596,10 @@ nav.navbar-fixed-top { } } } - div.twoColumns.clearfix { - @media only screen and (min-width:$width-large) { + @media only screen and (min-width: $width-large) { min-width: 170px; } - > a { min-width: 70px; } @@ -1862,7 +1860,6 @@ div.textBlock { /* Financial details page */ section.projectFinancial { - .currentFunders { dl { > dd { @@ -1870,7 +1867,9 @@ section.projectFinancial { } } } - + .donationBreak { + display: none; + } @include responsive(small-max-screens) { width: 95%; max-width: 450px; @@ -1890,6 +1889,22 @@ section.projectFinancial { width: initial; } } + .donationBreak { + display: initial; + clear: both; + } + .currentFunders { + dd { + &.donation { + float: right; + } + } + dt { + &.donation { + clear: both; + } + } + } } } } @@ -1974,7 +1989,6 @@ dd { /* Project report page */ .projectReport { - @include responsive(small-max-screens) { max-width: 95%; margin-left: auto; @@ -1984,14 +1998,13 @@ dd { @media only screen and (min-width: $width-medium) { table { table-layout: fixed; - th { @media only screen and (max-width: $width-large) { width: 90px; } @media only screen and (min-width: $width-large) { width: 120px; - } + } word-break: break-word; } } diff --git a/akvo/templates/project_finance.html b/akvo/templates/project_finance.html index e309c4ccf2..4d8906d8a8 100644 --- a/akvo/templates/project_finance.html +++ b/akvo/templates/project_finance.html @@ -39,7 +39,7 @@

    {% trans "Current funders" %}:

    {% trans "Donations" %}:

    {% for donation in project.all_donations %} -
    {% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:
    {{project.get_currency_display}}{{donation.amount_received|floatformat:0|intcomma}}
    +
    {% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:

    ({% trans "excl. fee" %}: {{project.get_currency_display}}{{donation.donation_fee|floatformat:0|intcomma}}) {{project.get_currency_display}}{{donation.amount_received|floatformat:0|intcomma}}
    {% empty %}
    {% trans "No donations" %}
    {% endfor %}
    {% trans "Name" %}{{project.background}}
    {% trans "Current Situation" %}{% trans "Situation at start of project" %} {{project.current_status}}
    {{budget_item.label}}{{budget_item.other_extra}}{{budget_item.label}}{{budget_item.iati_type}} {{budget_item.amount}} {{budget_item.iati_currency}}