Bug 7308: (follow-up) tweak style of child fund amounts

This patch changes the styling of the amounts of child funds
in the funds table to use a more visible indication (i.e.,
italics rather than a font color of grey) and to use a
a new CSS class, "child_fund_amount", rather than a hard-coded
style.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 8557977..8abe90d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1872,6 +1872,9 @@ ul.budget_hierarchy li:last-child:after {
 ul.budget_hierarchy li:first-child:after {
     content: "";
 }
+.child_fund_amount {
+    font-style: italic;
+}
 .holdcount { font-size : 105%; line-height : 200%; }
 .holdcount a {
        border : 1px solid #a4bedd;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 1a88548..6c63e12 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -278,35 +278,35 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
     <td>[% budge.budget_name %]</td>
     <td class="data">
       [% IF budge.budget_parent_id %]
-        <span style="color:grey">[% budge.budget_amount %]</span>
+        <span class="child_fund_amount">[% budge.budget_amount %]</span>
       [% ELSE %]
         [% budge.budget_amount %]
       [% END %]
     </td>
     <td class="data">
       [% IF budge.budget_parent_id %]
-        <span style="color:grey">[% budge.budget_ordered %]</span>
+        <span class="child_fund_amount">[% budge.budget_ordered %]</span>
       [% ELSE %]
         [% budge.budget_ordered %]
       [% END %]
     </td>
     <td class="data">
       [% IF budge.budget_parent_id %]
-        <span style="color:grey">[% budge.total_ordered %]</span>
+        <span class="child_fund_amount">[% budge.total_ordered %]</span>
       [% ELSE %]
         [% budge.total_ordered %]
       [% END %]
     </td>
     <td class="data">
       [% IF budge.budget_parent_id %]
-        <span style="color:grey">[% budge.budget_spent %]</span>
+        <span class="child_fund_amount">[% budge.budget_spent %]</span>
       [% ELSE %]
         [% budge.budget_spent %]
       [% END %]
     </td>
     <td class="data">
       [% IF budge.budget_parent_id %]
-        <span style="color:grey">[% budge.total_spent %]</span>
+        <span class="child_fund_amount">[% budge.total_spent %]</span>
       [% ELSE %]
         [% budge.total_spent %]
       [% END %]
@@ -314,21 +314,31 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
 
 
     [% BLOCK colorcellvalue %]
-        [% IF (value > 0) %]
-            <span style="color: green;">
-        [% ELSIF (value < 0) %]
-            <span style="color: red;">
-        [% ELSE %]
-            <span>
+        [% IF parent %]
+            [% IF (value > 0) %]
+                <span class="child_fund_amount" style="color: green;">
+            [% ELSIF (value < 0) %]
+                <span class="child_fund_amount" style="color: red;">
+            [% ELSE %]
+                <span class="child_fund_amount">
+            [% END %]
+         [% ELSE %]
+            [% IF (value > 0) %]
+                <span style="color: green;">
+            [% ELSIF (value < 0) %]
+                <span style="color: red;">
+            [% ELSE %]
+                <span>
+            [% END %]
         [% END %]
             [% text %]
         </span>
     [% END %]
     <td class="data">
-        [% INCLUDE colorcellvalue value=budge.budget_remaining text=budge.budget_remaining_display %]
+        [% INCLUDE colorcellvalue value=budge.budget_remaining text=budge.budget_remaining_display parent=budge.budget_parent_id %]
     </td>
     <td class="data">
-        [% INCLUDE colorcellvalue value=budge.total_remaining text=budge.total_remaining_display %]
+        [% INCLUDE colorcellvalue value=budge.total_remaining text=budge.total_remaining_display parent=budge.budget_parent_id %]
     </td>
 
     <td class="tooltipcontent">[% IF ( budge.budget_owner_id ) %]<strong>Owner: </strong><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budge.budget_owner_id %]">[% budge.budget_owner_name %]</a>[% END %]