Merge pull request #1913 from matiu/feature/quota

Feature/quota
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-02 09:46:11 -03:00
commit 17614d2968
13 changed files with 162 additions and 32 deletions

View file

@ -19,6 +19,16 @@
<form name="setupForm" ng-submit="create(setupForm)" novalidate>
<div class="row">
<div class="large-12 columns">
<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="panel">
<label><span translate>Wallet name</span>
<div class="input">

View file

@ -47,7 +47,6 @@
<a class="text-white" href="#!/createProfile">creating your profile</a>
</div>
<div class="box-setup">
<h1><span translate>Sign in to</span> <b>Copay</b></h1>
<form name="loginForm" ng-submit="openProfile(loginForm)" novalidate>

View file

@ -1,4 +1,4 @@
<div class="backup" ng-controller="ProfileController" ng-init="setWallets()">
<div class="backup" ng-controller="ProfileController" ng-init="init()">
<div class="row hide-for-large-up">
<div class="large-12 medium-12 small-12 columns">
<h1>{{$root.title}}</h1>
@ -40,7 +40,7 @@
<div class="line-dashed-h m20b"></div>
<div class="row" ng-init="getWallets()">
<div class="row" ng-init="setWallets()">
<div class="large-12 columns">
<h2>Manage wallets</h2>
<table>
@ -73,7 +73,8 @@
</td>
<td>
<span>
{{item.sizes().total/1000}} kB
{{item.kb}} kB
<span ng-if="item.usage">({{item.usage}}%) </span>
</span>
</td>
@ -93,6 +94,15 @@
</tr>
</tbody>
</table>
<div class="size-12">
<div ng-if="perItem">
<p> Your current Insight server usage quotas are: {{perItem}}kB per walelt and up to {{nrWallets}} wallets.
</div>
<div ng-if="$root.needsEmailConfirmation">
<p> <i class="fi-alert"></i> Confirming for email with increase your storage usage limits.
</div>
</div>
</div>
</div>