diff --git a/public/views/activity.html b/public/views/activity.html index 8a1738373..5465609ad 100644 --- a/public/views/activity.html +++ b/public/views/activity.html @@ -2,11 +2,8 @@ Recent Activity - - - + + @@ -19,7 +16,7 @@
-
+
diff --git a/public/views/add.html b/public/views/add.html index 95230a314..25c3e39c5 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -2,7 +2,6 @@ {{'Add wallet' | translate}} - diff --git a/public/views/addressbook.add.html b/public/views/addressbook.add.html index bd8307fd0..453cb9a29 100644 --- a/public/views/addressbook.add.html +++ b/public/views/addressbook.add.html @@ -1,7 +1,6 @@ - Add entry diff --git a/public/views/addressbook.html b/public/views/addressbook.html index 88b5869ab..fea7fcf67 100644 --- a/public/views/addressbook.html +++ b/public/views/addressbook.html @@ -1,7 +1,6 @@ - Addressbook diff --git a/public/views/addressbook.view.html b/public/views/addressbook.view.html index 6b215612e..15022a146 100644 --- a/public/views/addressbook.view.html +++ b/public/views/addressbook.view.html @@ -1,7 +1,6 @@ - Addressbook diff --git a/public/views/amazon.html b/public/views/amazon.html index acc17ea58..285725c86 100644 --- a/public/views/amazon.html +++ b/public/views/amazon.html @@ -1,7 +1,6 @@ - Amazon.com Gift Cards diff --git a/public/views/amount.html b/public/views/amount.html index 7a1b1f613..575706ef2 100644 --- a/public/views/amount.html +++ b/public/views/amount.html @@ -1,7 +1,6 @@ - diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html index 6fea44d8d..4d62b34e8 100644 --- a/public/views/buyAmazon.html +++ b/public/views/buyAmazon.html @@ -1,7 +1,6 @@ - Buy @@ -45,6 +44,7 @@ max="500" ng-model="fiat" ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/" + step="0.01" autocomplete="off" ignore-mouse-wheel required> USD diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index f315aa11f..c06787829 100644 --- a/public/views/buyGlidera.html +++ b/public/views/buyGlidera.html @@ -1,7 +1,6 @@ - Buy diff --git a/public/views/buyandsell.html b/public/views/buyandsell.html index 3a06db502..05fcb2313 100644 --- a/public/views/buyandsell.html +++ b/public/views/buyandsell.html @@ -1,10 +1,7 @@ - - - + + Buy and sell diff --git a/public/views/confirm.html b/public/views/confirm.html index f8998594b..0964d1e89 100644 --- a/public/views/confirm.html +++ b/public/views/confirm.html @@ -1,7 +1,6 @@ - diff --git a/public/views/copayers.html b/public/views/copayers.html index 4ece2b49e..122be4007 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -2,7 +2,6 @@ - diff --git a/public/views/export.html b/public/views/export.html index 0d17c0124..56d0d84ce 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -2,7 +2,6 @@ {{'Export wallet' | translate}} - diff --git a/public/views/glidera.html b/public/views/glidera.html index c68df1e87..33b67f386 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -1,7 +1,6 @@ - Glidera diff --git a/public/views/glideraUri.html b/public/views/glideraUri.html index 453da1668..1d4b4294f 100644 --- a/public/views/glideraUri.html +++ b/public/views/glideraUri.html @@ -1,10 +1,7 @@ - - - + + Glidera diff --git a/public/views/import.html b/public/views/import.html index aa6d916a2..81c80f651 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -2,7 +2,6 @@ {{'Import Wallet' | translate}} - diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html index ed0f57e07..0e9fceb76 100644 --- a/public/views/includes/walletActivity.html +++ b/public/views/includes/walletActivity.html @@ -1,65 +1,65 @@ -
- Copayer joined +
+ Copayer joined
-
+
Wallet created
-
+
Payment Sent
- {{x.amountStr}} + {{notification.amountStr}}
-
+
Payment Received
- {{x.amountStr}} + {{notification.amountStr}}
-
- Proposal Deleted: - {{x.message}} +
+ Proposal Deleted: + {{notification.message}}
- {{x.amountStr}}: + {{notification.amountStr}}:
-
+
Proposal Rejected: - {{x.message}} + {{notification.message}}
- {{x.amountStr}}: + {{notification.amountStr}}:
- + New Proposal: - {{x.message}} + {{notification.message}}
- {{x.amountStr}} + {{notification.amountStr}}
- + Proposal Accepted: - {{x.message}} + {{notification.message}}
- {{x.amountStr}} + {{notification.amountStr}}

- - - {{ x.creatorName}}@ - {{x.wallet.name}} - + + + {{ notification.creatorName}}@ + {{notification.wallet.name}} +

diff --git a/public/views/join.html b/public/views/join.html index 6798b95bb..f21080820 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -1,7 +1,6 @@ - {{'Join shared wallet' | translate}} diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index d7145f679..e1e2c3640 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -1,5 +1,5 @@ - + @@ -9,11 +9,11 @@ -
+
- +
@@ -30,23 +30,23 @@
-
- Sent from {{wallet.credentials.walletName}} -
- -
+
+ Sent from {{wallet.credentials.walletName}} +
+
+
-
-
- -
- Received Funds +
+
+
+ Received Funds +
-
- Moved Funds -
+
+ Moved Funds +
- @@ -75,14 +75,22 @@
-
Created by
- {{btx.creatorName}} - - - +
+ Date + + + +
+
+
Created by
+ {{btx.creatorName}} + + + +
-
+
Fee
{{btx.feeLevel}} ({{btx.feeStr}}) diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html index ed1dede89..8308826d7 100644 --- a/public/views/paperWallet.html +++ b/public/views/paperWallet.html @@ -2,7 +2,6 @@ {{'Sweep paper wallet' | translate}} - diff --git a/public/views/preferences.html b/public/views/preferences.html index fa1b74027..18b7c15e0 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index 3449b8f1e..f16c2f83a 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 1fcc94c14..e17faed43 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -2,7 +2,6 @@ {{'Advanced Preferences' | translate}} - diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html index 053986d67..281c1ec09 100644 --- a/public/views/preferencesAlias.html +++ b/public/views/preferencesAlias.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesAltCurrency.html b/public/views/preferencesAltCurrency.html index 446a50074..bf500edde 100644 --- a/public/views/preferencesAltCurrency.html +++ b/public/views/preferencesAltCurrency.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesBitpayCard.html b/public/views/preferencesBitpayCard.html index c3dfe26c0..12ae0a455 100644 --- a/public/views/preferencesBitpayCard.html +++ b/public/views/preferencesBitpayCard.html @@ -1,10 +1,7 @@ - - - + + Preferences diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html index 4cb483b88..1c0f36a73 100644 --- a/public/views/preferencesBwsUrl.html +++ b/public/views/preferencesBwsUrl.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html index c0790e3ea..838973f1f 100644 --- a/public/views/preferencesColor.html +++ b/public/views/preferencesColor.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index 0cc6f099b..62a7e7e84 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesDeleteWords.html b/public/views/preferencesDeleteWords.html index 25a3eaedc..989fd06e5 100644 --- a/public/views/preferencesDeleteWords.html +++ b/public/views/preferencesDeleteWords.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html index d7a81e90e..428864ff6 100644 --- a/public/views/preferencesEmail.html +++ b/public/views/preferencesEmail.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index fb178fbf8..a0b0b98b0 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesGlidera.html b/public/views/preferencesGlidera.html index 2f04020a1..8e87c02be 100644 --- a/public/views/preferencesGlidera.html +++ b/public/views/preferencesGlidera.html @@ -1,7 +1,6 @@ - Preferences diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html index 1118a2a99..d27db7837 100644 --- a/public/views/preferencesHistory.html +++ b/public/views/preferencesHistory.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index 2fe6298ce..ca7397013 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html index df04e0160..53da39d3e 100644 --- a/public/views/preferencesLanguage.html +++ b/public/views/preferencesLanguage.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html index 8d2d1311b..080f52223 100644 --- a/public/views/preferencesLogs.html +++ b/public/views/preferencesLogs.html @@ -1,7 +1,6 @@ - diff --git a/public/views/preferencesUnit.html b/public/views/preferencesUnit.html index 520f43fce..102964d6b 100644 --- a/public/views/preferencesUnit.html +++ b/public/views/preferencesUnit.html @@ -1,7 +1,6 @@ - diff --git a/public/views/proposals.html b/public/views/proposals.html index 0f3306ddc..5599b8559 100644 --- a/public/views/proposals.html +++ b/public/views/proposals.html @@ -1,12 +1,11 @@ - Pending Proposals - - - + + {{'Pending Proposals'|translate}} + + + diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index cb2bc0f77..75a12c8c3 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -1,7 +1,6 @@ - Sell diff --git a/public/views/starting.html b/public/views/starting.html deleted file mode 100644 index e73578b58..000000000 --- a/public/views/starting.html +++ /dev/null @@ -1,3 +0,0 @@ -

Starting...

- -Splash screen me... diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html index 754afc81d..506709f63 100644 --- a/public/views/tab-create-personal.html +++ b/public/views/tab-create-personal.html @@ -2,7 +2,6 @@ {{'Create Personal Wallet' | translate}} - diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html index db6420a7a..914976dc2 100644 --- a/public/views/tab-create-shared.html +++ b/public/views/tab-create-shared.html @@ -2,7 +2,6 @@ {{'Create Shared Wallet' | translate}} - diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 21645bc2d..f74d9d9cd 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -29,12 +29,12 @@ {{txpsN}} - +
-
+ diff --git a/public/views/termsOfUse.html b/public/views/termsOfUse.html index 7fd05725a..0d1241741 100644 --- a/public/views/termsOfUse.html +++ b/public/views/termsOfUse.html @@ -1,7 +1,6 @@ - diff --git a/public/views/translators.html b/public/views/translators.html index cb865e3eb..5fbbdd44e 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -2,7 +2,6 @@ {{'Translators' | translate}} - diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html index dd4394ad1..74ab1f04e 100644 --- a/public/views/walletDetails.html +++ b/public/views/walletDetails.html @@ -2,7 +2,6 @@ {{walletDetailsName}} -