From 7ceed35c2979de1c6f136f6e21678a4a0316b348 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 20 Nov 2015 15:54:27 -0300 Subject: [PATCH] first step of ui --- public/views/backup.html | 197 +++++++++++++++++------------------ public/views/walletHome.html | 37 ++++--- src/css/main.css | 23 ++++ 3 files changed, 139 insertions(+), 118 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index 65b1da6c1..17f802dae 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -4,7 +4,7 @@ ng-init="titleSection='Backup'; closeToHome = 'true'"> -
+

@@ -12,76 +12,67 @@
-
-
-
- - To restore this {{index.m}}-{{index.n}} shared wallet you will need - : -
    -
  1. Your wallet seed and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.
    2. -
  2. OR the wallet seed of all copayers in the wallet
    3. -
  3. OR 1 wallet export file and the remaining quorum of wallet seeds (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet seeds of any of the other copayers).
    4. -
- -
-
-
-
- - To restore this {{index.m}}-{{index.n}} shared wallet you will need - : -
    -
  1. Your wallet seed and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.
    2. -
  2. OR the wallet seeds of all copayers in the wallet
    3. -
- -
-
-
- -
-
- Wallet seed not available. You can still export it from Advanced > Export. -
-
- -
-
-
- - You need the wallet seed to restore this personal wallet. - - - Write it down and keep them somewhere safe. - -
-
-
-
- - - Show Wallet Seed - -
-
- -
-
- Your Wallet Seed -
-
- - + +
-
+
+
Write your wallet seed
+
+ + To restore this {{index.m}}-{{index.n}} shared wallet you will need + : +
    +
  1. Your wallet seed and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.
    2. +
  2. OR the wallet seed of all copayers in the wallet
    3. +
  3. OR 1 wallet export file and the remaining quorum of wallet seeds (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet seeds of any of the other copayers).
    4. +
+ +
+
+ + To restore this {{index.m}}-{{index.n}} shared wallet you will need + : +
    +
  1. Your wallet seed and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.
    2. +
  2. OR the wallet seeds of all copayers in the wallet
    3. +
+ +
+
+ +
+
+ Wallet seed not available. You can still export it from Advanced > Export. +
+
+ +
+

+ + You need the wallet seed to restore this personal wallet. + + + Write it down and keep them somewhere safe. + +

+
+
+ + + Show Wallet Seed + +
+
+
-
- {{word}}　 +
+ {{word}}　
+
@@ -96,53 +87,53 @@
-
- -
-
-
-
+
+
+
Confirm your wallet seed
+

+ Please tap the words in order to confirm your backup phrase is correctly written. +

+
-
+
- +
-
-
- +
-
-
- Passphrase needed -
-
+
+
Enter your passphrase
+
@@ -150,17 +141,17 @@
- +
@@ -181,16 +172,20 @@
-
-
- Congratulations +
+
+
+
Congratulation
+

+ You backed up your new wallet. You can now restore this wallet at any time. +

- @@ -201,7 +196,7 @@
- You can safely install your wallet on another device and use it from multiple devices at the same time. + You can safely install your wallet on another device and use it from multiple devices at the same time. Learn more about Copay backups diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 2e1004e61..77823d898 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -182,23 +182,18 @@ -->
-
-
-
- - - WARNING: Backup needed - -
-
- Before receiving funds, it is highly recommended you backup your wallet keys. -
- - +
+
+
+
Backup Needed
+

+ Before receiving funds, it is highly recommended you backup your wallet. If you lose this device, it is impossible to access your funds without a backup. +

+
@@ -473,6 +468,14 @@ Transactions Downloaded
+
+ Initial transaction history synchronization can take some minutes for wallets with many transactions.
+ Please stand by. +
+
+ {{index.txProgress}} + Transactions
Downloaded +
@@ -514,7 +517,7 @@
{{btx.message}}
- {{index.addressbook[btx.addressTo] || btx.addressTo}} + To: {{index.addressbook[btx.addressTo] || btx.addressTo}}
diff --git a/src/css/main.css b/src/css/main.css index 274a9da1e..7ee058b8f 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -988,6 +988,29 @@ input.ng-invalid-match, input.ng-invalid-match:focus { padding: 1rem; } +.panel.words { + background: #E6EAEE; + border: 1px dashed #A5B2BF; + min-height: 170px; +} + +.backup .panel { + padding: 0.5rem; +} + +.backup button.words { + background: #FFFFFF; + box-shadow: 0px 0px 4px 0px rgba(0,0,0,0.30); + color: #4B6178; + text-transform: lowercase; + font-size: 0.8rem; + margin: 5px; +} + +.backup button[disabled] { + box-shadow: none; +} + .panel qrcode { background-color: white; }