From 9fcfbeb153b996a314042d2778643b8ef4d6b809 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 10 Dec 2014 22:58:11 -0300 Subject: [PATCH] simpler tx history --- css/src/main.css | 36 +------ css/src/mobile.css | 5 - views/history.html | 64 +++++------- views/homeWallet.html | 2 +- views/includes/transaction.html | 106 ++++---------------- views/modals/tx-details.html | 168 ++++++++++++++------------------ 6 files changed, 120 insertions(+), 261 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 8c80a1286..1cfd78f0a 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -452,47 +452,17 @@ ul.tx-copayers { border-bottom: 1px solid #CAD2DA; } -.last-transactions-header { - background: #2C3E50; - padding: 0.6rem; - color: #fff; - box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); - -moz-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); - -o-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); -} .last-transactions-content { - padding: 0.8rem 0; - color: #7A8C9E; -} - -.last-transactions-footer { - background: #E4E8EC; padding: 0.8rem; - overflow: hidden; + cursor:pointer; } -.last-transactions-content .box-status { - font-size: 13px; - width: 30px; -} - -.last-transactions-content .box-copayer { - width: 100px; - margin-right: 20px; - float: left; - text-align: center; +.last-transactions-content:hover { + background: #eee; } -.last-transactions-content .copayer-ico { - width: 45px; - height: 45px; - border: 2px solid #7A8C9B; -} -.last-transactions-content .icon-active { - color: #fff; -} .sign-action { background: #E4E8EC; diff --git a/css/src/mobile.css b/css/src/mobile.css index 9c42e6f76..0674b49f4 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -116,11 +116,6 @@ display: none; } - .reveal-modal, dialog { - padding: 0; - } - - .tab-bar h1 { font-weight: 100; text-align: center; diff --git a/views/history.html b/views/history.html index 16e63cb49..54d0ee72b 100644 --- a/views/history.html +++ b/views/history.html @@ -13,51 +13,39 @@
-
-
+
+
-
-
- - - Unconfirmed - -
-
- -
- - {{btx.amount}} {{$root.wallet.settings.unitName}} - - {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}} - +
+
+
+ + + Unconfirmed - - - -
- -
-
- {{btx.comment}} -
+
+
+ + + +-{{btx.amount}} + + {{$root.wallet.settings.unitName}} + + + {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}} + +
+
+
+
diff --git a/views/homeWallet.html b/views/homeWallet.html index d5d4c8725..49d9aff7c 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -34,7 +34,7 @@
-
+
Personal Wallet Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ] diff --git a/views/includes/transaction.html b/views/includes/transaction.html index 51b41242f..a61ba08ce 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -1,102 +1,32 @@ -
-
-
- - {{tx.comment}} -
-
-
- {{tx.createdTs | amCalendar}} -
-
-
+ +
-
- {{out.value}} {{$root.wallet.settings.unitName}} - - {{out.alternativeAmount}} {{out.alternativeIsoCode}} - -
-
- -
-
-
+
+
+ To: + {{tx.merchant.domain}} {{tx.merchant.domain}} + +
-
-
-
-
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
- -
- -
-
-
- - One signature missing - - - - {{tx.missingSignatures}} signatures missing - - - - Approved +
+
+ + + {{out.value}} -
+ {{$root.wallet.settings.unitName}} + + + {{out.alternativeAmount}} {{out.alternativeIsoCode}} +
-
-
- - - One signature missing - - - - {{tx.missingSignatures}} signatures missing - - - Approved - -
-
- diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html index 2da6c8c54..5a2a81261 100644 --- a/views/modals/tx-details.html +++ b/views/modals/tx-details.html @@ -1,103 +1,79 @@ × - -
-
-
- -
-
-
-
- {{btx.amount}} {{$root.wallet.settings.unitName}} - - {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}} - -
-
- - -
-

Transaction Details

- -
- {{btx.comment}} -
- -
- Date: - - - [ - ] -
- -
- - Unconfirmed +
+
+ +-{{btx.amount}} + {{$root.wallet.settings.unitName}} + + {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}} - - Confirmations: - {{btx.confirmations}} - -
- -
- - To: - - {{btx.merchant.domain}} - {{btx.merchant.domain}} - - - - {{btx.labelTo || btx.addressTo}} - - -
- -
- {{btx.merchant.pr.pd.memo}} -
- -
- Signatures -
    -
  • - - - - - - - - - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} -
    • -
-
- -
-
ID: {{btx.txid}} -
- - - See it on the blockchain -
+
+
+ + +
+ +
+ Note: {{btx.comment}} +
+ +
+ + To: + + {{btx.merchant.domain}} + {{btx.merchant.domain}} + + + + {{btx.labelTo || btx.addressTo}} + + +
+ +
+ {{btx.merchant.pr.pd.memo}} +
+ +
+ + Unconfirmed + + + Confirmations: + {{btx.confirmations}} + +
+ +
+ Signatures +
    +
  • + + + + + + + + {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} +
    • +
+
+ +
ID: {{btx.txid}} +
+ +
+ + See it on the blockchain + +
+