Merge pull request #2310 from cmgustavo/ux/wallet-info01
Removes "Manage wallets" and moves info to "Settings"
This commit is contained in:
Matias Alejo Garcia
commit
373f12c2a0
19 changed files with 288 additions and 310 deletions
|
|
@ -49,6 +49,32 @@
|
|||
</div>
|
||||
</div>
|
||||
<!-- end of row -->
|
||||
<div class="row">
|
||||
<div class="large-12 columns size-12">
|
||||
<button class="warning" ng-show="!confirmDelete" ng-click="confirmDelete=!confirmDelete">
|
||||
<i class="fi-trash"></i> Cancel
|
||||
</button>
|
||||
<div ng-show="confirmDelete">
|
||||
<h2>Are you sure you want to cancel and delete this wallet</h2>
|
||||
<div class="row">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<button class="gray" ng-disabled="loading"
|
||||
ng-click="confirmDelete=!confirmDelete">No</button>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<button class="warning" ng-disabled="loading" ng-click="deleteWallet()">
|
||||
<span ng-show="!loading">
|
||||
<i class="fi-trash"></i> Yes
|
||||
</span>
|
||||
<span ng-show="loading">
|
||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="extra-margin-bottom"></div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<div ng-controller="CreateController">
|
||||
<div data-alert ng-show="loading">
|
||||
<div ng-show="$root.starting">
|
||||
<div ng-include="'views/includes/loading.html'" ng-init="title = 'Creating wallet'"></div>
|
||||
</div>
|
||||
<div class="setup" ng-show="!loading && !$root.starting">
|
||||
<div class="setup" ng-show="!$root.starting">
|
||||
<form name="setupForm" ng-submit="create(setupForm)" novalidate>
|
||||
<div class="row">
|
||||
<div class="large-12 columns">
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
|
||||
|
||||
<div class="text-right">
|
||||
<button translate type="submit" class="button primary expand m0" ng-disabled="setupForm.$invalid || loading">
|
||||
<button translate type="submit" class="button primary expand m0" ng-disabled="setupForm.$invalid">
|
||||
Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<div ng-include="'views/includes/loading.html'" ng-init="title = 'Creating profile'"></div>
|
||||
</div>
|
||||
|
||||
<div class="large-4 large-centered medium-7 medium-centered columns m20b" ng-show="!$root.starting && !askForPin">
|
||||
<div class="large-4 large-centered medium-7 medium-centered columns m20b" ng-show="!$root.starting && !askForPin">
|
||||
<div class="logo-setup hide-for-small-only" ng-hide="hideForWP">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay" width="100">
|
||||
</div>
|
||||
|
|
@ -205,39 +205,38 @@
|
|||
<img src="img/clipo-pin.png" alt="clipo" width="380">
|
||||
</div>
|
||||
|
||||
<div class="box-notification" ng-show="error && !passwordStrength">
|
||||
<div class="box-notification" ng-show="error && !passwordStrength">
|
||||
<div class="box-icon error">
|
||||
<i class="fi-x size-24"></i>
|
||||
</div>
|
||||
<span class="text-warning size-14">
|
||||
{{error|translate}}
|
||||
</span>
|
||||
{{error|translate}}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<form name="setPinForm" novalidate>
|
||||
<form name="setPinForm" ng-model="setPinForm" novalidate>
|
||||
<div class="input" ng-if="askForPin == 1">
|
||||
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1 && !isWindowsPhoneApp" ng-focus="formFocus()">
|
||||
<i class="icon-locked" ng-hide="isWindowsPhoneApp"></i>
|
||||
<i class="icon-locked" ng-hide="isWindowsPhoneApp"></i>
|
||||
</div>
|
||||
<div class="input" ng-if="askForPin == 2">
|
||||
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2 && !isWindowsPhoneApp" ng-focus="formFocus()">
|
||||
<i class="icon-locked" ng-hide="isWindowsPhoneApp"></i>
|
||||
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2 && !isWindowsPhoneApp" ng-focus="formFocus()">
|
||||
<i class="icon-locked"></i>
|
||||
</div>
|
||||
<div class="box-setup-footer row collapse">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<a class="button secondary radius m0" ng-click="createDefaultWallet()">
|
||||
<span translate>Skip</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<button translate ng-click="createPin(setPinForm.repeatpin.$modelValue)" class="button primary radius expand m0"
|
||||
ng-disabled="setPinForm.$invalid || error">
|
||||
OK
|
||||
</button>
|
||||
</div>
|
||||
<div class="box-setup-footer row collapse">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<a class="button secondary radius m0" ng-click="createDefaultWallet()">
|
||||
<span translate>Skip</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<button translate ng-click="createPin(setPinForm.repeatpin.$modelValue)" class="button primary radius expand m0"
|
||||
ng-disabled="setPinForm.$invalid || error">
|
||||
OK
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<div ng-init="$root.title = 'Page not found'"
|
||||
ng-class="{'wide-page':!$root.wallet}">
|
||||
ng-class="{'wide-page':!$root.iden}">
|
||||
<div class="text-center">
|
||||
<img ng-show="$root.wallet" src="img/logo.svg" alt="Copay">
|
||||
<img ng-show="!$root.wallet" src="img/logo-negative.svg" alt="Copay">
|
||||
<img ng-show="$root.iden" src="img/logo.svg" alt="Copay">
|
||||
<img ng-show="!$root.iden" src="img/logo-negative.svg" alt="Copay">
|
||||
</div>
|
||||
<h1 class="text-center" ng-class="{'text-white': !$root.wallet}">404</h1>
|
||||
<h3 translate class="text-center" ng-class="{'text-white': !$root.wallet}">Page not found</h3>
|
||||
<h1 class="text-center" ng-class="{'text-white': !$root.iden}">404</h1>
|
||||
<h3 translate class="text-center" ng-class="{'text-white': !$root.iden}">Page not found</h3>
|
||||
<p class="text-center"><a href="#!/">« <span translate>Back</span></a></p>
|
||||
</div>
|
||||
<div class="extra-margin-bottom"></div>
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
</div>
|
||||
</header>
|
||||
<div class="scroll-section">
|
||||
<ul class="sidebar-mobile-wallets oh off-canvas-list m10b" ng-show="wallets[0]">
|
||||
<li
|
||||
<ul class="sidebar-mobile-wallets oh off-canvas-list m10b">
|
||||
<li ng-show="wallets[0]"
|
||||
ng-repeat="item in wallets track by $index"
|
||||
ng-class="{'selected': item.id == $root.wallet.id}"
|
||||
class="nav-item" ng-click="switchWallet(item.id)" >
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<div class="join" ng-controller="JoinController">
|
||||
<div ng-show="loading">
|
||||
<div ng-show="$root.starting">
|
||||
<div ng-include="'views/includes/loading.html'" ng-init="title = 'Connecting to Insight Wallet Server'"></div>
|
||||
</div>
|
||||
|
||||
<div ng-show="!loading">
|
||||
<div ng-show="!$root.starting">
|
||||
<div class="row hide-for-large-up">
|
||||
<div class="large-12 medium-12 small-12 columns">
|
||||
<h1>{{$root.title}}</h1>
|
||||
|
|
@ -73,7 +73,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- End !loading -->
|
||||
</div>
|
||||
|
||||
<div class="extra-margin-bottom"></div>
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
<div class="text-center" ng-init="isComplete = item.isComplete(); networkName = item.getNetworkName()">
|
||||
<div ng-show="!confirmDelete">
|
||||
<h1>{{item.name || item.id }}</h1>
|
||||
<h3>
|
||||
{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}
|
||||
, {{isComplete ? 'Complete' : 'Waiting for copayers...'}}
|
||||
</h3>
|
||||
<div class="m10b" ng-if="isComplete">
|
||||
<b>{{item.balanceInfo.totalBalance || 0}} {{item.settings.unitName}}</b>
|
||||
</div>
|
||||
<div class="m20b">
|
||||
Approximate size: {{item.kb}} kB
|
||||
<span ng-if="item.usage">({{item.usage}}%) </span>
|
||||
</div>
|
||||
|
||||
<div class="box-notification" ng-show="error">
|
||||
<div class="box-icon error">
|
||||
<i class="fi-x size-24"></i>
|
||||
</div>
|
||||
<span class="text-warning size-14">
|
||||
{{error|translate}}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="row" ng-show="!backupWalletPlainText && !error">
|
||||
<div class="large-6 medium-6 small-12 columns">
|
||||
<button class="primary expand" ng-click="downloadWalletBackup()" ng-disabled="loading"
|
||||
ng-show="!isSafari && !isCordova"><i class="fi-download"></i> Download backup</button>
|
||||
<button class="primary expand" ng-click="viewWalletBackup()" ng-disabled="loading"
|
||||
ng-show="isSafari || isCordova"><i class="fi-eye"></i> View Backup</button>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-12 columns">
|
||||
<button class="warning expand" ng-click="confirmDelete=!confirmDelete">
|
||||
<i class="fi-trash"></i> Delete
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-show="backupWalletPlainText">
|
||||
<h3>Copy backup in a safe place</h3>
|
||||
<div class="input">
|
||||
<textarea class="show-for-large-up" readonly rows="7">{{backupWalletPlainText}}</textarea>
|
||||
<textarea class="hide-for-large-up" rows="12">{{backupWalletPlainText}}</textarea>
|
||||
<i class="icon-compose"></i>
|
||||
</div>
|
||||
<div translate class="m10t size-12 text-gray text-right">
|
||||
Copy this text as it is in a safe place (notepad or email)
|
||||
</div>
|
||||
</div>
|
||||
<a class="close-reveal-modal" ng-click="close()"><i class="fi-x size-18"></i></a>
|
||||
</div>
|
||||
<div class="row" ng-show="confirmDelete">
|
||||
<h1>Are you sure you want to delete the wallet
|
||||
<strong>{{(item.name || item.id)}}</strong>
|
||||
</h1>
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<button class="gray" ng-disabled="loading"
|
||||
ng-click="confirmDelete=!confirmDelete">Cancel</button>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<button class="warning" ng-disabled="loading" ng-click="deleteWallet()">
|
||||
<span ng-show="!loading">
|
||||
<i class="fi-trash"></i> Delete
|
||||
</span>
|
||||
<span ng-show="loading">
|
||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -22,7 +22,58 @@
|
|||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
<div class="row" ng-init="isComplete = wallet.isComplete(); networkName = wallet.getNetworkName()">
|
||||
<div class="large-12 columns">
|
||||
<h4>Wallet info</h4>
|
||||
<table>
|
||||
<tr>
|
||||
<td><strong>Name:</strong></td>
|
||||
<td>{{wallet.name || wallet.id }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Status:</strong></td>
|
||||
<td>{{isComplete ? 'Complete' : 'Waiting for copayers...'}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Type:</strong></td>
|
||||
<td>{{wallet.requiredCopayers}} of {{wallet.totalCopayers}} - {{networkName}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Balance:</strong></td>
|
||||
<td><span ng-if="isComplete">{{wallet.balanceInfo.totalBalance || 0}} {{wallet.settings.unitName}}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Aprox. size:</strong></td>
|
||||
<td>{{wallet.kb}} kB <span ng-if="wallet.usage">({{wallet.usage}}%)</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" ng-show="!backupWalletPlainText && !error">
|
||||
<div class="large-12 medium-12 small-12 columns">
|
||||
<button class="primary expand" ng-click="downloadWalletBackup()" ng-disabled="loading"
|
||||
ng-show="!isSafari && !isCordova"><i class="fi-download"></i> Download backup</button>
|
||||
<button class="primary expand" ng-click="viewWalletBackup()" ng-disabled="loading"
|
||||
ng-show="isSafari || isCordova"><i class="fi-eye"></i> View Backup</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" ng-show="backupWalletPlainText">
|
||||
<div class="large-12 columns">
|
||||
<h3>Copy backup in a safe place</h3>
|
||||
<div class="input">
|
||||
<textarea class="show-for-large-up" readonly rows="7">{{backupWalletPlainText}}</textarea>
|
||||
<textarea class="hide-for-large-up" rows="12">{{backupWalletPlainText}}</textarea>
|
||||
<i class="icon-compose"></i>
|
||||
</div>
|
||||
<div translate class="m10t size-12 text-gray text-right">
|
||||
Copy this text as it is in a safe place (notepad or email)
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="m20b row">
|
||||
<div class="large-12 columns">
|
||||
<a class="small left button-setup" ng-click="hideAdv=!hideAdv">
|
||||
|
|
@ -37,6 +88,45 @@
|
|||
</div>
|
||||
|
||||
<div ng-hide="hideAdv" class="row">
|
||||
<div class="large-12 columns">
|
||||
<div class="panel">
|
||||
<h2><i class="fi-minus-circle m10r"></i>
|
||||
<span translate>Delete wallet</span>
|
||||
</h2>
|
||||
<div class="box-notification" ng-show="error">
|
||||
<div class="box-icon error">
|
||||
<i class="fi-x size-24"></i>
|
||||
</div>
|
||||
<span class="text-warning size-14">
|
||||
{{error|translate}}
|
||||
</span>
|
||||
</div>
|
||||
<p translate class="text-gray">Permanently delete this wallet. WARNING: this action cannot be reversed.</p>
|
||||
<div ng-show="!confirmDelete">
|
||||
<a translate class="button warning m0" ng-click="confirmDelete=!confirmDelete">Delete wallet
|
||||
</a>
|
||||
</div>
|
||||
<div class="text-center" ng-show="confirmDelete">
|
||||
<h2>Are you sure you want to delete this wallet?</h2>
|
||||
<div class="row">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<button class="gray" ng-disabled="loading"
|
||||
ng-click="confirmDelete=!confirmDelete">Cancel</button>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<button class="warning" ng-disabled="loading" ng-click="deleteWallet()">
|
||||
<span ng-show="!loading">
|
||||
<i class="fi-trash"></i> Delete
|
||||
</span>
|
||||
<span ng-show="loading">
|
||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="large-12 columns">
|
||||
<div class="panel">
|
||||
<h2><i class="fi-minus-circle m10r"></i>
|
||||
|
|
|
|||
|
|
@ -35,75 +35,20 @@
|
|||
|
||||
<div class="line-dashed-h m20b"></div>
|
||||
|
||||
<div class="row" ng-init="setWallets()">
|
||||
<div class="row size-12 m20b">
|
||||
<div class="large-12 columns">
|
||||
<h2>Manage wallets</h2>
|
||||
|
||||
<div class="box-notification" ng-show="success">
|
||||
<div class="box-icon success">
|
||||
<i class="fi-check size-24"></i>
|
||||
</div>
|
||||
<span class="text-success size-14">
|
||||
{{success|translate}}
|
||||
</span>
|
||||
<a href ng-click="success=false" class="close-notification success">×</a>
|
||||
<div ng-if="perItem">
|
||||
Your current server usage quotas are: <b>{{perItem}}kB</b> per wallet and up to <b>{{nrWallets}}</b> wallets.
|
||||
</div>
|
||||
|
||||
<table class="manage-wallets">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Type</th>
|
||||
<th class="hide-for-small-only">Status</th>
|
||||
<th class="hide-for-small-only">Balance</th>
|
||||
<th class="hide-for-small-only">Approx Size</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
data-ng-repeat="item in wallets | orderBy:'name'"
|
||||
ng-init="isComplete = item.isComplete(); networkName = item.getNetworkName()"
|
||||
ng-click="showWalletInfo(item)">
|
||||
<td>
|
||||
<span ng-show="loading == item.id"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
|
||||
<span ng-show="loading != item.id">
|
||||
{{item.name || item.id }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}</td>
|
||||
<td class="hide-for-small-only">
|
||||
{{isComplete ? 'Complete' : 'Waiting for copayers...'}}
|
||||
</td>
|
||||
<td class="hide-for-small-only">
|
||||
<span ng-if="!isComplete">-</span>
|
||||
<span ng-if="isComplete">
|
||||
{{item.balanceInfo.totalBalance || 0}} {{item.settings.unitName}}
|
||||
</span>
|
||||
</td>
|
||||
<td class="hide-for-small-only">
|
||||
<span>
|
||||
{{item.kb}} kB
|
||||
<span ng-if="item.usage">({{item.usage}}%) </span>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="size-12">
|
||||
<div ng-if="perItem">
|
||||
Your current server usage quotas are: <b>{{perItem}}kB</b> per wallet and up to <b>{{nrWallets}}</b> wallets.
|
||||
</div>
|
||||
<div ng-if="$root.needsEmailConfirmation" class="m10t">
|
||||
<i class="fi-alert"></i> Confirm your email address to increase storage usage limits.
|
||||
</div>
|
||||
<div ng-if="$root.needsEmailConfirmation" class="m10t">
|
||||
<i class="fi-alert"></i> Confirm your email address to increase storage usage limits.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="line-dashed-h m20b"></div>
|
||||
|
||||
<div class="row oh">
|
||||
<div class="row oh m20b">
|
||||
<div class="large-12 columns">
|
||||
<a class="small left button-setup" ng-click="hideAdv=!hideAdv">
|
||||
<i class="fi-widget m3r"></i>
|
||||
|
|
@ -131,10 +76,18 @@
|
|||
<h2>Are you sure you want to delete this profile?</h2>
|
||||
<div class="row">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<a translate class="button gray m0" ng-click="confirmDelete=!confirmDelete">Cancel</a>
|
||||
<button class="gray" ng-disabled="loading"
|
||||
ng-click="confirmDelete=!confirmDelete">Cancel</button>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<a translate class="button warning m0" ng-click="deleteProfile()">Delete</a>
|
||||
<button class="warning" ng-disabled="loading" ng-click="deleteProfile()">
|
||||
<span ng-show="!loading">
|
||||
<i class="fi-trash"></i> Delete
|
||||
</span>
|
||||
<span ng-show="loading">
|
||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue