[#1615] display donation fee amount

akvo · Jun 18, 2015 · 24b254f · 24b254f
1 parent 2484a0b
commit 24b254f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 11 deletions.
diff --git 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
@@ -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,15 +1860,16 @@ div.textBlock {
 /* Financial details page */
 
 section.projectFinancial {
-
     .currentFunders {
         dl {
             > dd {
                 text-align: right;
             }
         }
     }
-
+    .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
@@ -39,7 +39,7 @@ <h4 class="">{% trans "Current funders" %}:</h4>
                     <h4>{% trans "Donations" %}:</h4>
                     <dl class="dl-horizontal">
                         {% for donation in project.all_donations %}
-                        <dt>{% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:</dt><dd class="currencyAmount"><span class="currency">{{project.get_currency_display}}</span>{{donation.amount_received|floatformat:0|intcomma}}</dd>
+                        <dt class="donation">{% if donation.is_anonymous %}{% trans "Anonymous" %}{% else %}{{donation.name}}{% endif %}:</dt><br class="donationBreak"><dd class="currencyAmount donation"><span class="currency"> ({% trans "excl. fee" %}: {{project.get_currency_display}}</span>{{donation.donation_fee|floatformat:0|intcomma}}) <span class="currency">{{project.get_currency_display}}</span>{{donation.amount_received|floatformat:0|intcomma}}</dd>
                         {% empty %}
                         <dt>{% trans "No donations" %}</dt><dd></dd>
                         {% endfor %}