Some style fixes to keep things consistent after recent pull request integration.

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index cfa1079..7b7808c 100644 (file)
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1062,7 +1062,7 @@ class ttReportHelper {
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
     $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
     $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
-    $rowItem = 'background-color: #ccccce;';
+    $rowItem = 'background-color: #ffffff;';
     $rowItemAlt = 'background-color: #f5f5f5;';
     $rowSubtotal = 'background-color: #e0e0e0;';
     $cellLeftAligned = 'text-align: left; vertical-align: top;';
@@ -1334,7 +1334,7 @@ class ttReportHelper {
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
     $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
     $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
-    $rowItem = 'background-color: #ccccce;';
+    $rowItem = 'background-color: #ffffff;';
     $rowItemAlt = 'background-color: #f5f5f5;';
     $rowSubtotal = 'background-color: #e0e0e0;';
     $cellLeftAligned = 'text-align: left; vertical-align: top;';

diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_teams.tpl
index bb4c16a..bbbf284 100644 (file)
--- a/WEB-INF/templates/admin_teams.tpl
+++ b/WEB-INF/templates/admin_teams.tpl
@@ -17,7 +17,7 @@
   </tr>
 {if $teams}
   {foreach $teams as $team}
-  <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+  <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     <td>{$team.id}</td>
     <td>{$team.name|escape}</td>
     <td nowrap>{$team.date}</td>

diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index 54be19d..51e8376 100644 (file)
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -13,7 +13,7 @@
         </tr>
   {if $custom_fields}
     {foreach $custom_fields as $field}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$field['label']|escape}</td>
       {if CustomFields::TYPE_TEXT == $field['type']}
           <td>{$i18n.label.type_text}</td>

diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
index 61a4043..414c3bc 100644 (file)
--- a/WEB-INF/templates/cf_dropdown_options.tpl
+++ b/WEB-INF/templates/cf_dropdown_options.tpl
@@ -15,7 +15,7 @@
         </tr>
   {if $options}
     {foreach $options as $key=>$val}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$val|escape}</td>
           <td><a href="cf_dropdown_option_edit.php?id={$key}">{$i18n.label.edit}</a></td>
           <td><a href="cf_dropdown_option_delete.php?id={$key}">{$i18n.label.delete}</a></td>

diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl
index 8b4e642..52462c8 100644 (file)
--- a/WEB-INF/templates/expense_delete.tpl
+++ b/WEB-INF/templates/expense_delete.tpl
@@ -14,7 +14,7 @@
     <td class="tableHeader" align="center">{$i18n.label.item}</td>
     <td class="tableHeader" align="center">{$i18n.label.cost}</td>
   </tr>
-  <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
+  <tr>
 {if $user->isPluginEnabled('cl')}
   <td>{$expense_item.client_name|escape}</td>
 {/if}

diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index d210507..85d27ea 100644 (file)
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -179,7 +179,7 @@ function recalculateCost() {
         <td width="5%" class="tableHeader">{$i18n.label.edit}</td>
       </tr>
   {foreach $expense_items as $item}
-      <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
+      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     {if $user->isPluginEnabled('cl')}
         <td valign="top">{$item.client|escape}</td>
     {/if}

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0f14b90..fb3889c 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>
-          <td align="center">&nbsp;Anuko Time Tracker 1.12.3.3684 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.12.3.3685 | 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>

diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl
index 31ff8e7..1ff5c83 100644 (file)
--- a/WEB-INF/templates/invoice_view.tpl
+++ b/WEB-INF/templates/invoice_view.tpl
@@ -31,7 +31,7 @@
           <td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>
         </tr>
   {foreach $invoice_items as $invoice_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td valign="top">{$invoice_item.date}</td>
           <td valign="top">{$invoice_item.user_name|escape}</td>
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl
index 4d6f50a..1dfd43a 100644 (file)
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -17,7 +17,7 @@
   {/if}
         </tr>
         {foreach $invoices as $invoice}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$invoice.name|escape}</td>
           <td>{$invoice.client_name|escape}</td>
           <td>{$invoice.date}</td>

diff --git a/WEB-INF/templates/mobile/clients.tpl b/WEB-INF/templates/mobile/clients.tpl
index 00a19ee..db0826c 100644 (file)
--- a/WEB-INF/templates/mobile/clients.tpl
+++ b/WEB-INF/templates/mobile/clients.tpl
@@ -15,7 +15,7 @@
           <td width="40%" class="tableHeader">{$i18n.label.address}</td>
         </tr>
   {foreach $active_clients as $client}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td><a href="client_edit.php?id={$client.id}">{$client.name|escape}</a></td>
           <td>{$client.address|escape}</td>
         </tr>
@@ -34,7 +34,7 @@
           <td width="40%" class="tableHeader">{$i18n.label.address}</td>
         </tr>
     {foreach $inactive_clients as $client}
-        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td><a href="client_edit.php?id={$client.id}">{$client.name|escape}</a></td>
           <td>{$client.address|escape}</td>
         </tr>

diff --git a/WEB-INF/templates/mobile/expense_delete.tpl b/WEB-INF/templates/mobile/expense_delete.tpl
index a1c0fd7..bfd6dbc 100644 (file)
--- a/WEB-INF/templates/mobile/expense_delete.tpl
+++ b/WEB-INF/templates/mobile/expense_delete.tpl
@@ -14,7 +14,7 @@
     <td class="tableHeader" align="center">{$i18n.label.item}</td>
     <td class="tableHeader" align="center">{$i18n.label.cost}</td>
   </tr>
-  <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
+  <tr>
 {if $user->isPluginEnabled('cl')}
   <td>{$expense_item.client_name|escape}</td>
 {/if}

diff --git a/WEB-INF/templates/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl
index 52de0a9..a4a3847 100644 (file)
--- a/WEB-INF/templates/mobile/expenses.tpl
+++ b/WEB-INF/templates/mobile/expenses.tpl
@@ -142,7 +142,7 @@ function get_date() {
         <td width="5%" class="tableHeaderCentered">{$i18n.label.cost}</td>
       </tr>
   {foreach $expense_items as $item}
-      <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
+      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     {if $user->isPluginEnabled('cl')}
         <td valign="top">{$item.client|escape}</td>
     {/if}

diff --git a/WEB-INF/templates/mobile/projects.tpl b/WEB-INF/templates/mobile/projects.tpl
index d40e792..f486739 100644 (file)
--- a/WEB-INF/templates/mobile/projects.tpl
+++ b/WEB-INF/templates/mobile/projects.tpl
@@ -16,7 +16,7 @@
         </tr>
   {if $active_projects}
     {foreach $active_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td><a href="project_edit.php?id={$project.id}">{$project.name|escape}</a></td>
           <td>{$project.description|escape}</td>
         </tr>
@@ -40,7 +40,7 @@
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
         </tr>
     {foreach $inactive_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td><a href="project_edit.php?id={$project.id}">{$project.name|escape}</a></td>
           <td>{$project.description|escape}</td>
         </tr>
@@ -63,7 +63,7 @@
         </tr>
   {if $active_projects}
     {foreach $active_projects as $project}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
         </tr>

diff --git a/WEB-INF/templates/mobile/tasks.tpl b/WEB-INF/templates/mobile/tasks.tpl
index 8ed15fb..5ea6a2a 100644 (file)
--- a/WEB-INF/templates/mobile/tasks.tpl
+++ b/WEB-INF/templates/mobile/tasks.tpl
@@ -16,7 +16,7 @@
         </tr>
   {if $active_tasks}
     {foreach $active_tasks as $task}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td><a href="task_edit.php?id={$task.id}">{$task.name|escape}</a></td>
           <td>{$task.description|escape}</td>
         </tr>
@@ -40,7 +40,7 @@
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
         </tr>
     {foreach $inactive_tasks as $task}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td><a href="task_edit.php?id={$task.id}">{$task.name|escape}</a></td>
           <td>{$task.description|escape}</td>
         </tr>
@@ -63,7 +63,7 @@
         </tr>
   {if $active_tasks}
     {foreach $active_tasks as $task}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$task.name|escape}</td>
           <td>{$task.description|escape}</td>
         </tr>

diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index ce96dde..3b8b0f8 100644 (file)
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -20,7 +20,7 @@
     {if $time_records}
       <table class="mobile-table-details">
       {foreach $time_records as $record}
-      <tr bgcolor="{cycle values="#ccccce,#f5f5f5"}" {if !$record.billable} class="not_billable" {/if}>
+      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
         <td valign="top">{$record.project|escape}</td>
 {/if}

diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index 6ff3269..956ee55 100644 (file)
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -17,7 +17,7 @@
         </tr>
   {if $active_users}
     {foreach $active_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
             {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_indicators}
               <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
@@ -65,7 +65,7 @@
           <td width="10%" class="tableHeader">{$i18n.label.edit}</td>
         </tr>
     {foreach $inactive_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>
             {if $user->isManager()}
               <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>
@@ -111,7 +111,7 @@
           <td class="tableHeader">{$i18n.form.users.role}</td>
         </tr>
   {foreach $active_users as $u}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$u.name|escape}</td>
           <td>{$u.login|escape}</td>
     {if $smarty.const.ROLE_MANAGER == $u.role}

diff --git a/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl
index c9f43f2..71cc13a 100644 (file)
--- a/WEB-INF/templates/notifications.tpl
+++ b/WEB-INF/templates/notifications.tpl
@@ -14,7 +14,7 @@
         </tr>
   {if $notifications}
     {foreach $notifications as $notification}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$notification['name']|escape}</td>
           <td>{$notification['cron_spec']|escape}</td>
           <td>{$notification['email']|escape}</td>

diff --git a/WEB-INF/templates/predefined_expenses.tpl b/WEB-INF/templates/predefined_expenses.tpl
index a254da3..265bdf1 100644 (file)
--- a/WEB-INF/templates/predefined_expenses.tpl
+++ b/WEB-INF/templates/predefined_expenses.tpl
@@ -12,7 +12,7 @@
         </tr>
   {if $predefined_expenses}
     {foreach $predefined_expenses as $predefined_expense}
-        <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$predefined_expense['name']|escape}</td>
           <td>{$predefined_expense['cost']|escape}</td>
           <td><a href="predefined_expense_edit.php?id={$predefined_expense['id']}">{$i18n.label.edit}</a></td>

diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 25fc81c..a1b3958 100644 (file)
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -106,7 +106,7 @@
         <td width="5%" class="tableHeader">{$i18n.label.edit}</td>
       </tr>
   {foreach $time_records as $record}
-      <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}" {if !$record.billable} class="not_billable" {/if}>
+      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
     {if $user->isPluginEnabled('cl')}
         <td valign="top">{$record.client|escape}</td>
     {/if}

diff --git a/WEB-INF/templates/time_delete.tpl b/WEB-INF/templates/time_delete.tpl
index b3d8a39..41b7a4e 100644 (file)
--- a/WEB-INF/templates/time_delete.tpl
+++ b/WEB-INF/templates/time_delete.tpl
@@ -19,7 +19,7 @@
 {/if}
     <td class="tableHeader" align="center">{$i18n.label.note}</td>
   </tr>
-  <tr bgcolor="#f5f5f5">
+  <tr>
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     <td>{$time_rec.project_name|escape}</td>
 {/if}

diff --git a/default.css b/default.css
index b1b7ec3..4929917 100644 (file)
--- a/default.css
+++ b/default.css
@@ -84,7 +84,7 @@ select{ font-size: 10pt; font-family: verdana; }
 }
 
 .rowReportItem {
-  background-color: #ccccce;
+  background-color: #ffffff;
 }
 
 .rowReportItemAlt {