16 files changed, 29 insertions, 27 deletions

diff --git a/public/assets/images/animated-overlay.gif b/public/css/images/animated-overlay.gif
index d441f75e..d441f75e 100644
--- a/public/assets/images/animated-overlay.gif
+++ b/public/css/images/animated-overlay.gif
diff --git a/public/assets/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
index 9aab30b1..9aab30b1 100644
--- a/public/assets/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/public/assets/images/ui-bg_flat_75_ffffff_40x100.png b/public/css/images/ui-bg_flat_75_ffffff_40x100.png
index 0b2088de..0b2088de 100644
--- a/public/assets/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/public/css/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/public/assets/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
index b1e1380b..b1e1380b 100644
--- a/public/assets/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/public/assets/images/ui-bg_glass_65_ffffff_1x400.png b/public/css/images/ui-bg_glass_65_ffffff_1x400.png
index 0850cce5..0850cce5 100644
--- a/public/assets/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/public/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/public/assets/images/ui-bg_glass_75_dadada_1x400.png b/public/css/images/ui-bg_glass_75_dadada_1x400.png
index 7d57debb..7d57debb 100644
--- a/public/assets/images/ui-bg_glass_75_dadada_1x400.png
+++ b/public/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/public/assets/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
index 4061d4a2..4061d4a2 100644
--- a/public/assets/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/public/assets/images/ui-bg_glass_95_fef1ec_1x400.png b/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
index 83e61bc8..83e61bc8 100644
--- a/public/assets/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7d58f386..7d58f386 100644
--- a/public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/public/assets/images/ui-icons_222222_256x240.png b/public/css/images/ui-icons_222222_256x240.png
index c1cb1170..c1cb1170 100644
--- a/public/assets/images/ui-icons_222222_256x240.png
+++ b/public/css/images/ui-icons_222222_256x240.png
diff --git a/public/assets/images/ui-icons_2e83ff_256x240.png b/public/css/images/ui-icons_2e83ff_256x240.png
index 84b601bf..84b601bf 100644
--- a/public/assets/images/ui-icons_2e83ff_256x240.png
+++ b/public/css/images/ui-icons_2e83ff_256x240.png
diff --git a/public/assets/images/ui-icons_454545_256x240.png b/public/css/images/ui-icons_454545_256x240.png
index b6db1acd..b6db1acd 100644
--- a/public/assets/images/ui-icons_454545_256x240.png
+++ b/public/css/images/ui-icons_454545_256x240.png
diff --git a/public/assets/images/ui-icons_888888_256x240.png b/public/css/images/ui-icons_888888_256x240.png
index feea0e20..feea0e20 100644
--- a/public/assets/images/ui-icons_888888_256x240.png
+++ b/public/css/images/ui-icons_888888_256x240.png
diff --git a/public/assets/images/ui-icons_cd0a0a_256x240.png b/public/css/images/ui-icons_cd0a0a_256x240.png
index ed5b6b09..ed5b6b09 100644
--- a/public/assets/images/ui-icons_cd0a0a_256x240.png
+++ b/public/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/public/js/report.coffee b/public/js/report.coffee
index 7bcfb8c3..90b7c0aa 100644
--- a/public/js/report.coffee
+++ b/public/js/report.coffee
@@ -48,37 +48,38 @@ filterDates = ->
   display(transactions)   
 
 display = (transactions) ->
-  $('.alert').remove()
   $('.report tbody tr').remove()
-  $('.report').show()
 
   if transactions.length is 0
-    $('.report').before("<p class='alert alert-warning'>No transactions were found for the specified time period</p>")
     $('.report').hide()
+    $('.alert').fadeIn()
+  else
+    $('.alert').hide()
+    $.each(transactions, ->
+      exchange = parseFloat(this.exchange)
+      received = parseFloat(this.received)
+      amount = received * exchange
 
-  $.each(transactions, ->
-    exchange = parseFloat(this.exchange)
-    received = parseFloat(this.received)
-    amount = received * exchange
+      $('.report tbody').append("""
+        <tr>
+          <td>#{moment(this.date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma')}</td>
+          <td>#{exchange.toFixed(2)}</td>
+          <td>#{received.toFixed(5)}</td>
+          <td>#{amount.toFixed(2)}</td>
+        </tr>
+      """)
+    )
 
-    $('.report tbody').append("""
-      <tr>
-        <td>#{moment(this.date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma')}</td>
-        <td>#{exchange.toFixed(2)}</td>
-        <td>#{received.toFixed(5)}</td>
-        <td>#{amount.toFixed(2)}</td>
-      </tr>
-    """)
-  )
+    btc = 0
+    $('table.report tbody td:nth-child(3)').each(->
+      btc += parseFloat($(this).html())
+    )
+    $('#btc').html(btc.toFixed(5))
 
-  btc = 0
-  $('table.report tbody td:nth-child(3)').each(->
-    btc += parseFloat($(this).html())
-  )
-  $('#btc').html(btc.toFixed(5))
+    cad = 0
+    $('table.report tbody td:nth-child(4)').each(->
+      cad += parseFloat($(this).html())
+    )
+    $('#cad').html(cad.toFixed(2))
 
-  cad = 0
-  $('table.report tbody td:nth-child(4)').each(->
-    cad += parseFloat($(this).html())
-  )
-  $('#cad').html(cad.toFixed(2))
+    $('.report').fadeIn()
diff --git a/views/transactions/index.html b/views/transactions/index.html
index afbc55ab..633fa212 100644
--- a/views/transactions/index.html
+++ b/views/transactions/index.html
@@ -13,8 +13,9 @@
   <button id="to" name="to" class="btn btn-primary"></button>
 </div>
 
+<p class="alert alert-warning" style="display: none">No transactions were found for the specified time period</p>
 
-<table class="table table-striped report">
+<table class="table table-striped report" style="display: none">
   <thead>
     <tr>
       <th>Time</th>