From e31e76b76e57c094e0a652f51b1294eb98595377 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sun, 17 Jan 2016 20:05:42 +0100 Subject: [PATCH] updated bootstrap, jquery. Added sortable/partially hidable tables --- Handler/Item.hs | 74 +- Handler/Stock.hs | 49 +- Handler/Wallet.hs | 117 +- static/css/bootstrap-theme.css | 587 +++ static/css/bootstrap-theme.css.map | 1 + static/css/bootstrap-theme.min.css | 6 + static/css/bootstrap-theme.min.css.map | 1 + static/css/bootstrap.css | 1236 +++-- static/css/bootstrap.css.map | 1 + static/css/bootstrap.min.css | 6 + static/css/bootstrap.min.css.map | 1 + static/fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 20127 bytes static/fonts/glyphicons-halflings-regular.svg | 485 +- static/fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes static/js/bootstrap.js | 2362 ++++++++- static/js/bootstrap.min.js | 7 + static/js/jquery.js | 4543 ++++++++++------- static/js/neat.js | 45 + static/js/npm.js | 13 + templates/curStock.hamlet | 36 + templates/curStock.julius | 39 + templates/item.hamlet | 77 + templates/item.julius | 39 + templates/wallet.hamlet | 129 + templates/wallet.julius | 79 + 27 files changed, 7182 insertions(+), 2751 deletions(-) create mode 100644 static/css/bootstrap-theme.css create mode 100644 static/css/bootstrap-theme.css.map create mode 100644 static/css/bootstrap-theme.min.css create mode 100644 static/css/bootstrap-theme.min.css.map create mode 100644 static/css/bootstrap.css.map create mode 100644 static/css/bootstrap.min.css create mode 100644 static/css/bootstrap.min.css.map create mode 100644 static/fonts/glyphicons-halflings-regular.woff2 create mode 100644 static/js/bootstrap.min.js create mode 100644 static/js/npm.js create mode 100644 templates/curStock.hamlet create mode 100644 templates/curStock.julius create mode 100644 templates/item.hamlet create mode 100644 templates/item.julius create mode 100644 templates/wallet.hamlet create mode 100644 templates/wallet.julius diff --git a/Handler/Item.hs b/Handler/Item.hs index baa9b7d..3fac24c 100644 --- a/Handler/Item.hs +++ b/Handler/Item.hs @@ -1,6 +1,7 @@ module Handler.Item where import Import +import Yesod.Default.Util (widgetFileReload) itemsPerPage :: Int itemsPerPage = 100 @@ -17,77 +18,6 @@ getItemPagedR tid page let offset = itemsPerPage * page let maxPages = total `div` itemsPerPage let paginatePages = [1..maxPages+1] - loginLayout user $ [whamlet| -
- $if page > 0 -
#{itemsPerPage} Transactions (starting at #{offset}) of #{total} - $else -
#{itemsPerPage} Transactions of #{total} - - - -
Time - P/C - B/S - Item - ## - ISK/Item - ISK total - ISK profit - % - Time - Client - Station - ? - - $forall Entity _ t <- items -
#{showDateTime $ transactionDateTime $ t} - $if transactionTransForCorp t - C - $else - P - $if transactionTransIsSell t - S - $else - B - #{transactionTypeName t} - #{transactionQuantity t} - #{prettyISK $ transactionPriceCents t} - #{prettyISK $ transactionQuantity t * transactionPriceCents t} - $maybe profit <- transRealProfit t - $if (&&) (transactionTransIsSell t) (profit > 0) - - #{prettyISK $ profit} - $elseif (&&) (transactionTransIsSell t) (profit < 0) - - #{prettyISK $ profit} - $elseif not (transactionTransIsSell t) - - #{prettyISK $ profit} - $else - - #{prettyISK $ profit} - - #{profitPercent profit t}% - $nothing - - - - - - $maybe secs <- transactionSecondsToSell t - #{showSecsToSell secs} - $nothing -   - #{transactionClientName t} - #{transactionStationName t} - - -