From aaadb000fd4dc2fb9758ba92d1ea3d15871c096f Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sun, 24 Aug 2014 21:46:41 -0700 Subject: Transaction notes and delete function --- public/assets/css/images/animated-overlay.gif | Bin 0 -> 1738 bytes .../css/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 212 bytes .../css/images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 208 bytes .../css/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 335 bytes .../css/images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 207 bytes .../css/images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 262 bytes .../css/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 262 bytes .../css/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 280 bytes .../assets/css/images/ui-icons_222222_256x240.png | Bin 0 -> 6922 bytes .../assets/css/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes .../assets/css/images/ui-icons_454545_256x240.png | Bin 0 -> 6992 bytes .../assets/css/images/ui-icons_888888_256x240.png | Bin 0 -> 6999 bytes .../assets/css/images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes public/css/calculator.less | 6 +++ public/css/images/animated-overlay.gif | Bin 1738 -> 0 bytes public/css/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes public/css/images/ui-bg_flat_75_ffffff_40x100.png | Bin 208 -> 0 bytes public/css/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 0 bytes public/css/images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 0 bytes public/css/images/ui-bg_glass_75_dadada_1x400.png | Bin 262 -> 0 bytes public/css/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 262 -> 0 bytes public/css/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 0 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 0 bytes public/css/images/ui-icons_222222_256x240.png | Bin 6922 -> 0 bytes public/css/images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 0 bytes public/css/images/ui-icons_454545_256x240.png | Bin 6992 -> 0 bytes public/css/images/ui-icons_888888_256x240.png | Bin 6999 -> 0 bytes public/css/images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 0 bytes public/js/report.coffee | 47 ++++++++++++++++++--- 30 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 public/assets/css/images/animated-overlay.gif create mode 100644 public/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 public/assets/css/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 public/assets/css/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 public/assets/css/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 public/assets/css/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 public/assets/css/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 public/assets/css/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 public/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 public/assets/css/images/ui-icons_222222_256x240.png create mode 100644 public/assets/css/images/ui-icons_2e83ff_256x240.png create mode 100644 public/assets/css/images/ui-icons_454545_256x240.png create mode 100644 public/assets/css/images/ui-icons_888888_256x240.png create mode 100644 public/assets/css/images/ui-icons_cd0a0a_256x240.png delete mode 100644 public/css/images/animated-overlay.gif delete mode 100644 public/css/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100644 public/css/images/ui-bg_flat_75_ffffff_40x100.png delete mode 100644 public/css/images/ui-bg_glass_55_fbf9ee_1x400.png delete mode 100644 public/css/images/ui-bg_glass_65_ffffff_1x400.png delete mode 100644 public/css/images/ui-bg_glass_75_dadada_1x400.png delete mode 100644 public/css/images/ui-bg_glass_75_e6e6e6_1x400.png delete mode 100644 public/css/images/ui-bg_glass_95_fef1ec_1x400.png delete mode 100644 public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png delete mode 100644 public/css/images/ui-icons_222222_256x240.png delete mode 100644 public/css/images/ui-icons_2e83ff_256x240.png delete mode 100644 public/css/images/ui-icons_454545_256x240.png delete mode 100644 public/css/images/ui-icons_888888_256x240.png delete mode 100644 public/css/images/ui-icons_cd0a0a_256x240.png (limited to 'public') diff --git a/public/assets/css/images/animated-overlay.gif b/public/assets/css/images/animated-overlay.gif new file mode 100644 index 00000000..d441f75e Binary files /dev/null and b/public/assets/css/images/animated-overlay.gif differ diff --git a/public/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100644 index 00000000..9aab30b1 Binary files /dev/null and b/public/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png differ diff --git a/public/assets/css/images/ui-bg_flat_75_ffffff_40x100.png b/public/assets/css/images/ui-bg_flat_75_ffffff_40x100.png new file mode 100644 index 00000000..0b2088de Binary files /dev/null and b/public/assets/css/images/ui-bg_flat_75_ffffff_40x100.png differ diff --git a/public/assets/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/assets/css/images/ui-bg_glass_55_fbf9ee_1x400.png new file mode 100644 index 00000000..b1e1380b Binary files /dev/null and b/public/assets/css/images/ui-bg_glass_55_fbf9ee_1x400.png differ diff --git a/public/assets/css/images/ui-bg_glass_65_ffffff_1x400.png b/public/assets/css/images/ui-bg_glass_65_ffffff_1x400.png new file mode 100644 index 00000000..0850cce5 Binary files /dev/null and b/public/assets/css/images/ui-bg_glass_65_ffffff_1x400.png differ diff --git a/public/assets/css/images/ui-bg_glass_75_dadada_1x400.png b/public/assets/css/images/ui-bg_glass_75_dadada_1x400.png new file mode 100644 index 00000000..7d57debb Binary files /dev/null and b/public/assets/css/images/ui-bg_glass_75_dadada_1x400.png differ diff --git a/public/assets/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/assets/css/images/ui-bg_glass_75_e6e6e6_1x400.png new file mode 100644 index 00000000..4061d4a2 Binary files /dev/null and b/public/assets/css/images/ui-bg_glass_75_e6e6e6_1x400.png differ diff --git a/public/assets/css/images/ui-bg_glass_95_fef1ec_1x400.png b/public/assets/css/images/ui-bg_glass_95_fef1ec_1x400.png new file mode 100644 index 00000000..83e61bc8 Binary files /dev/null and b/public/assets/css/images/ui-bg_glass_95_fef1ec_1x400.png differ diff --git a/public/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png new file mode 100644 index 00000000..7d58f386 Binary files /dev/null and b/public/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ diff --git a/public/assets/css/images/ui-icons_222222_256x240.png b/public/assets/css/images/ui-icons_222222_256x240.png new file mode 100644 index 00000000..c1cb1170 Binary files /dev/null and b/public/assets/css/images/ui-icons_222222_256x240.png differ diff --git a/public/assets/css/images/ui-icons_2e83ff_256x240.png b/public/assets/css/images/ui-icons_2e83ff_256x240.png new file mode 100644 index 00000000..84b601bf Binary files /dev/null and b/public/assets/css/images/ui-icons_2e83ff_256x240.png differ diff --git a/public/assets/css/images/ui-icons_454545_256x240.png b/public/assets/css/images/ui-icons_454545_256x240.png new file mode 100644 index 00000000..b6db1acd Binary files /dev/null and b/public/assets/css/images/ui-icons_454545_256x240.png differ diff --git a/public/assets/css/images/ui-icons_888888_256x240.png b/public/assets/css/images/ui-icons_888888_256x240.png new file mode 100644 index 00000000..feea0e20 Binary files /dev/null and b/public/assets/css/images/ui-icons_888888_256x240.png differ diff --git a/public/assets/css/images/ui-icons_cd0a0a_256x240.png b/public/assets/css/images/ui-icons_cd0a0a_256x240.png new file mode 100644 index 00000000..ed5b6b09 Binary files /dev/null and b/public/assets/css/images/ui-icons_cd0a0a_256x240.png differ diff --git a/public/css/calculator.less b/public/css/calculator.less index 4ba5058a..316fd9cd 100644 --- a/public/css/calculator.less +++ b/public/css/calculator.less @@ -53,3 +53,9 @@ td#total { font-weight: bold; text-align: right; } background-image: url('../img/coinos_logo.svg') !important; background-size: 300px 80px; } + +@media screen and (min-width: 768px) { + .modal-dialog { + width: 400px; /* either % (e.g. 60%) or px (400px) */ + } +} diff --git a/public/css/images/animated-overlay.gif b/public/css/images/animated-overlay.gif deleted file mode 100644 index d441f75e..00000000 Binary files a/public/css/images/animated-overlay.gif and /dev/null differ diff --git a/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png deleted file mode 100644 index 9aab30b1..00000000 Binary files a/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ diff --git a/public/css/images/ui-bg_flat_75_ffffff_40x100.png b/public/css/images/ui-bg_flat_75_ffffff_40x100.png deleted file mode 100644 index 0b2088de..00000000 Binary files a/public/css/images/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ diff --git a/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png deleted file mode 100644 index b1e1380b..00000000 Binary files a/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ diff --git a/public/css/images/ui-bg_glass_65_ffffff_1x400.png b/public/css/images/ui-bg_glass_65_ffffff_1x400.png deleted file mode 100644 index 0850cce5..00000000 Binary files a/public/css/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ diff --git a/public/css/images/ui-bg_glass_75_dadada_1x400.png b/public/css/images/ui-bg_glass_75_dadada_1x400.png deleted file mode 100644 index 7d57debb..00000000 Binary files a/public/css/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ diff --git a/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png deleted file mode 100644 index 4061d4a2..00000000 Binary files a/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ diff --git a/public/css/images/ui-bg_glass_95_fef1ec_1x400.png b/public/css/images/ui-bg_glass_95_fef1ec_1x400.png deleted file mode 100644 index 83e61bc8..00000000 Binary files a/public/css/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ diff --git a/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png deleted file mode 100644 index 7d58f386..00000000 Binary files a/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ diff --git a/public/css/images/ui-icons_222222_256x240.png b/public/css/images/ui-icons_222222_256x240.png deleted file mode 100644 index c1cb1170..00000000 Binary files a/public/css/images/ui-icons_222222_256x240.png and /dev/null differ diff --git a/public/css/images/ui-icons_2e83ff_256x240.png b/public/css/images/ui-icons_2e83ff_256x240.png deleted file mode 100644 index 84b601bf..00000000 Binary files a/public/css/images/ui-icons_2e83ff_256x240.png and /dev/null differ diff --git a/public/css/images/ui-icons_454545_256x240.png b/public/css/images/ui-icons_454545_256x240.png deleted file mode 100644 index b6db1acd..00000000 Binary files a/public/css/images/ui-icons_454545_256x240.png and /dev/null differ diff --git a/public/css/images/ui-icons_888888_256x240.png b/public/css/images/ui-icons_888888_256x240.png deleted file mode 100644 index feea0e20..00000000 Binary files a/public/css/images/ui-icons_888888_256x240.png and /dev/null differ diff --git a/public/css/images/ui-icons_cd0a0a_256x240.png b/public/css/images/ui-icons_cd0a0a_256x240.png deleted file mode 100644 index ed5b6b09..00000000 Binary files a/public/css/images/ui-icons_cd0a0a_256x240.png and /dev/null differ diff --git a/public/js/report.coffee b/public/js/report.coffee index 99a0df25..72000fc8 100644 --- a/public/js/report.coffee +++ b/public/js/report.coffee @@ -56,20 +56,57 @@ display = (transactions) -> else $('.alert').hide() $.each(transactions, -> - exchange = parseFloat(this.exchange) - received = parseFloat(this.received) + exchange = parseFloat(@exchange) + received = parseFloat(@received) amount = received * exchange + notes = @notes + txid = @txid + date = moment(@date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma') - $('.report tbody').append(""" - - #{moment(this.date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma')} + row = $(""" + + #{date}   #{exchange.toFixed(2)} #{received.toFixed(8)} #{amount.toFixed(2)} """) + + if notes + row.attr('data-notes', notes) + row.find('span').removeClass('hidden') + + $('.report tbody').append(row) + + row.click(-> + notes = $(this).attr('data-notes') + + $('#modal').modal() + $('#modal textarea').val('') + + $('#modal .btn-danger').off().click(-> + $.ajax(type: 'delete', url: "/#{$('#user').val()}/transactions/#{txid}") + $('#modal').modal('hide') + row.remove() + ) + + $('#modal textarea').off().change(-> + notes = $(this).val() + $.post("/transactions/#{txid}", notes: $(this).val()) if txid + + row.find('span').addClass('hidden') + if notes + row.find('span').removeClass('hidden') + + row.attr('data-notes', $(this).val()) + ) + + if notes + $('#modal textarea').val(notes) + ) ) + btc = 0 $('table.report tbody td:nth-child(3)').each(-> btc += parseFloat($(this).html()) -- cgit v1.2.3