Cosmetic UI fixes for report table.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8ff301dc3188e63c7327aa3ca62b4f7c6e02a8a1..5d533bef646acf52f009443084ffc907106bf724 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.17.5.3785 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.5.3786 | 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/report.tpl b/WEB-INF/templates/report.tpl
index 4eac60763e6d7fec2d4846999cfe3d531b2116d6..f99a3fb9ca5ac873f7186517103721a402f27153 100644 (file)
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -69,6 +69,7 @@
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
         {if $bean->getAttribute('chinvoice')}<td></td>{/if}
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
         {if $bean->getAttribute('chinvoice')}<td></td>{/if}

+        {if $use_checkboxes}<td></td>{/if}

       </tr>
       <tr><td>&nbsp;</td></tr>
       {/if}
       </tr>
       <tr><td>&nbsp;</td></tr>
       {/if}


@@ -116,6 +117,7 @@
     {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}

+    {if $use_checkboxes}<td></td>{/if}

       </tr>
   {/if}
   <!-- print totals -->
       </tr>
   {/if}
   <!-- print totals -->


@@ -134,14 +136,16 @@
     {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
     {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}

+    {if $use_checkboxes}<td></td>{/if}

       </tr>
 {/if}
     </table>
   </td>
 </tr>
 </table>
       </tr>
 {/if}
     </table>
   </td>
 </tr>
 </table>

-{if $use_mark_paid && $report_items}
-<table width="720" cellspacing="4" cellpadding="4" border="0">
+{if $report_items && ($use_mark_paid || $use_assign_to_invoice)}
+<table width="720" cellspacing="0" cellpadding="0" border="0">
+  {if $use_mark_paid}

   <tr>
     <td align="right">
       <table>
   <tr>
     <td align="right">
       <table>


@@ -149,10 +153,8 @@
       </table>
     </td>
   </tr>
       </table>
     </td>
   </tr>

-</table>
-{/if}
-{if $use_assign_to_invoice && $report_items}
-<table width="720" cellspacing="4" cellpadding="4" border="0">
+  {/if}
+  {if $use_assign_to_invoice}

   <tr>
     <td align="right">
       <table>
   <tr>
     <td align="right">
       <table>


@@ -160,6 +162,7 @@
       </table>
     </td>
   </tr>
       </table>
     </td>
   </tr>

+  {/if}

 </table>
 {/if}
 {$forms.reportForm.close}
 </table>
 {/if}
 {$forms.reportForm.close}