Alternative to Henri-Damien's patch that does not require putting CSS style information in the Perl code.
Signed-off-by: Galen Charlton <gmcha...@gmail.com> --- .../prog/en/modules/admin/aqbudgets.tmpl | 14 +++++--- .../prog/en/modules/admin/aqplan.tmpl | 35 +++++++++++++------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl index 54e321a..e607f77 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl @@ -196,10 +196,14 @@ <td class="data"><!-- TMPL_VAR NAME="budget_amount" --> </td> <td class="data"><!-- TMPL_VAR NAME="budget_spent" --> </td> <td class="data"><!-- TMPL_VAR NAME="total_levels_spent" --></td> - <td class="data" - <!-- TMPL_IF NAME="remaining_pos" --> style="color: green;" <!-- /TMPL_IF --> - <!-- TMPL_IF NAME="remaining_neg" --> style="color: red;" <!-- /TMPL_IF --> > - <!-- TMPL_VAR NAME="budget_remaining" --> </td> + <!-- TMPL_IF NAME="remaining_pos" --> + <td class="data" style="color: green;"> + <!-- TMPL_ELSIF NAME="remaining_neg" --> + <td class="data" style="color: red;"> + <!-- TMPL_ELSE --> + <td class="data"> + <!-- /TMPL_IF --> + <!-- TMPL_VAR NAME="budget_remaining" --> </td> <td class="tooltipcontent"><!-- TMPL_IF NAME="budget_owner_id" --><strong>Owner: </strong><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="budget_owner_id" -->"><!-- TMPL_VAR NAME="budget_owner_name" --></a><!-- /TMPL_IF --> <!-- TMPL_IF NAME="budget_branchcode" --><br /><strong>Library: </strong><!-- TMPL_VAR NAME="budget_branchcode" --><!-- /TMPL_IF --> @@ -207,7 +211,7 @@ <!-- TMPL_IF NAME="budget_hierarchy" --> <ul class="budget_hierarchy"><!-- TMPL_LOOP name="budget_hierarchy" --> <!-- TMPL_IF NAME="element_id" --> - <li><a href="?op=add_form&budget_id=<!-- TMPL_VAR NAME="element_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->"><!-- TMPL_VAR NAME="element_name" --></a></li> + <li><a href="?op=add_form&budget_id=<!-- TMPL_VAR NAME="element_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->"><!-- TMPL_VAR NAME="element_name" --></a></li> <!-- TMPL_ELSE --> <li><strong><!-- TMPL_VAR NAME="element_name" --> : </strong></li> <!-- /TMPL_IF --> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl index c2c6b55..97e4aed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl @@ -195,9 +195,11 @@ YAHOO.util.Event.onAvailable("popmenu", function () { <div style="display:none;" id='budget_tot_<!-- TMPL_VAR NAME="budget_id" -->'><!-- TMPL_VAR NAME="budget_amount"--></div></td> <!-- TMPL_LOOP NAME="lines" --> - <td - <!-- TMPL_UNLESS Name="display" --> style="display:none;"<!-- /TMPL_UNLESS --> - class="<!-- TMPL_VAR NAME="colnum"-->" > + <!-- TMPL_IF NAME="display" --> + <td class="<!-- TMPL_VAR NAME="colnum"-->"> + <!-- TMPL_ELSE --> + <td style="display:none;" class="<!-- TMPL_VAR NAME="colnum"-->"> + <!-- /TMPL_IF --> <table class="invis" width="100%"> <tr> <!-- TMPL_IF Name="show_actual" --> @@ -220,19 +222,28 @@ YAHOO.util.Event.onAvailable("popmenu", function () { <td> <table class="invis" width="100%"> <tr> - <td width="50%" align="right" <!-- TMPL_IF Name="show_actual" --> - <!-- TMPL_IF NAME="act_negative" --> style="color: red;" <!--/TMPL_IF --> - <!-- TMPL_IF NAME="act_positive" --> style="color: green;" <!--/TMPL_IF --> > - <!-- TMPL_VAR NAME="budget_act_remain"--> - <!-- TMPL_ELSE --> > + <!-- TMPL_IF NAME="act_negative" --> + <td width="50%" align="right" style="color: red;"> + <!-- TMPL_ELSIF NAME="act_positive" --> + <td width="50%" align="right" style="color: green;"> + <!-- TMPL_ELSE --> + <td width="50%" align="right"> + <!--/TMPL_IF --> + <!-- TMPL_VAR NAME="budget_act_remain"--> + <!-- TMPL_ELSE --> + <td width="50%" align="right"> <!-- /TMPL_IF --> </td> - <td width="50%" align="right" - <!-- TMPL_IF NAME="est_negative" --> style="color: red;" <!--/TMPL_IF --> - <!-- TMPL_IF NAME="est_positive" --> style="color: green;" <!--/TMPL_IF --> - id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> <!-- TMPL_VAR NAME="budget_est_remain"--> + <!-- TMPL_IF NAME="est_negative" --> + <td width="50%" align="right" style="color: red;" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> + <!-- TMPL_ELSIF NAME="est_positive" --> + <td width="50%" align="right" style="color: green;" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> + <!-- TMPL_ELSE --> + <td width="50%" align="right" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> + <!--/TMPL_IF --> + <!-- TMPL_VAR NAME="budget_est_remain"--> </td> </tr> </table> -- 1.7.0 _______________________________________________ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches