Conditional display of label.users if there are no inactive users.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 757996c479a8d47ae3d7b12e04f5c11bd1e5698f..8a059ce3f615a14313b2aa2ce9bd1714714104d0 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.19.1.4961 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.19.1.4962 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 58fe61dcdbd15f73212732ac368b6943e21f68ca..70f28378075aa1715e828ffcb31ad80f7de467a7 100644 (file)
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -302,7 +302,7 @@ function handleCheckboxes() {
         </tr>
 {if $show_active_users}
         <tr>
         </tr>
 {if $show_active_users}
         <tr>

-          <td colspan="3"><b>{$i18n.label.active_users}</b></td>
+          <td colspan="3"><b>{if $show_inactive_users}{$i18n.label.active_users}{else}{$i18n.label.users}{/if}</b></td>

         </tr>
         <tr>
           <td colspan="3">{$forms.reportForm.users_active.control}</td>
         </tr>
         <tr>
           <td colspan="3">{$forms.reportForm.users_active.control}</td>