fix layout history, manage and settings

This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-05 17:33:51 -03:00
commit 1e1f39e3b2
3 changed files with 64 additions and 54 deletions

View file

@ -1,5 +1,6 @@
<div class="transactions" data-ng-controller="HistoryController" data-ng-init="update()"> <div class="transactions" data-ng-controller="HistoryController" data-ng-init="update()">
<div ng-show='$root.wallet.isReady()'> <div ng-show='$root.wallet.isReady()'>
<h1 class="hide-for-large-up">{{$root.title}}</h1>
<div ng-if="loading" class="m20b"> <div ng-if="loading" class="m20b">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Loading...</span> <span translate>Loading...</span>
@ -15,20 +16,29 @@
<div class="panel oh" <div class="panel oh"
ng-repeat="btx in blockchain_txs | orderBy: 'time':true" ng-click="btx.showDetails = !btx.showDetails"> ng-repeat="btx in blockchain_txs | orderBy: 'time':true" ng-click="btx.showDetails = !btx.showDetails">
<div class="row size-14"> <div class="row size-14">
<div class="large-2 medium-3 small-12 columns"> <div class="large-2 medium-2 small-12 columns">
<span ng-hide="btx.ts">&nbsp;</span> <div class="tx-date">
<time ng-if="btx.ts">{{btx.ts | amCalendar}}</time> <time ng-if="btx.ts">{{btx.ts | amCalendar}}</time>
<span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)"> <span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
<span translate>Unconfirmed</span> <span translate>Unconfirmed</span>
</span> </span>
</div>
</div> </div>
<div class="large-2 medium-3 small-6 columns text-right"> <div class="large-2 medium-3 small-5 columns text-right">
<div ng-class="{ <div class="tx-amount" ng-class="{
'text-primary' : btx.action == 'received', 'text-primary' : btx.action == 'received',
'text-warning': btx.action == 'sent', 'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}"> 'text-gray': btx.action == 'moved'}">
<b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b> <b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
</div>
</div>
<div class="large-1 medium-1 small-2 columns text-center">
<div ng-class="{
'text-primary' : btx.action == 'received',
'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}">
<i class="m15h" <i class="m15h"
ng-class="{ ng-class="{
'fi-arrow-left' : btx.action == 'received', 'fi-arrow-left' : btx.action == 'received',
@ -37,13 +47,13 @@
</div> </div>
</div> </div>
<div class="large-3 medium-3 small-6 columns text-gray"> <div class="large-3 medium-3 small-5 columns text-gray">
<span ng-hide="btx.labelTo">&nbsp;</span> <span class="ellipsis">{{btx.labelTo || btx.addressTo}}</span>
<span ng-show="btx.labelTo">{{btx.labelTo}}</span>
</div> </div>
<div class="large-4 medium-3 small-12 columns text-gray"> <div class="large-3 medium-3 small-12 columns text-gray">
<span ng-show="btx.comment"><i class="fi-comment-quotes"></i> {{btx.comment}} </span> <div class="tx-comment" ng-show="btx.comment">
<i class="fi-comment-quotes"></i> {{btx.comment}}</div>
</div> </div>
<div class="large-1 columns show-for-large-up text-gray text-right" ng-init="btx.showDetails = false"> <div class="large-1 columns show-for-large-up text-gray text-right" ng-init="btx.showDetails = false">

View file

@ -1,49 +1,49 @@
<div class="backup" ng-controller="ManageController"> <div class="backup" ng-controller="ManageController">
<h1 class="hide-for-large-up">{{$root.title}}</h1> <h1 class="hide-for-large-up">{{$root.title}}</h1>
<div class="row collapse"> <div class="row">
<div class="large-12 columns"> <div class="large-4 columns" >
<div class="large-4 columns" > <div class="panel text-center" ui-route="{{create}}">
<div class="panel text-center" ui-route="{{create}}"> <div><i class="size-72 fi-plus text-gray"></i></div>
<div><i class="size-72 fi-plus text-gray"></i></div> <p class="text-gray">Create a new Wallet</p>
<p class="text-gray">Create a new Wallet</p> <a href="#!/create" class="button primary radius" title="Create"> {{'Create' | translate }} </a>
<a href="#!/create" class="button primary radius" title="Create"> {{'Create' | translate }} </a>
</div>
</div> </div>
<div class="large-4 columns" ui-route="{{create}}"> </div>
<div class="panel text-center"> <div class="large-4 columns" ui-route="{{create}}">
<div><i class="size-72 fi-torsos-all text-gray"></i></div> <div class="panel text-center">
<p class="text-gray">Join an existent Wallet</p> <div><i class="size-72 fi-torsos-all text-gray"></i></div>
<a href="#!/join" class="button secondary radius" title="Join"> {{'Join' | translate }} </a> <p class="text-gray">Join an existent Wallet</p>
</div> <a href="#!/join" class="button secondary radius" title="Join"> {{'Join' | translate }} </a>
</div> </div>
<div class="large-4 columns" ui-route="{{create}}"> </div>
<div class="panel text-center"> <div class="large-4 columns" ui-route="{{create}}">
<div><i class="size-72 fi-download text-gray"></i></div> <div class="panel text-center">
<p class="text-gray">Import a Wallet to Copay</p> <div><i class="size-72 fi-download text-gray"></i></div>
<a href="#!/import" class="button black radius" title="Import"> {{'Import wallet' | translate }}</a> <p class="text-gray">Import a Wallet to Copay</p>
</div> <a href="#!/import" class="button black radius" title="Import"> {{'Import wallet' | translate }}</a>
</div> </div>
</div> </div>
</div> </div>
<div class="line-dashed-h m30v"></div>
<div class="large-12 columns line-dashed-h m30v"></div> <div class="row">
<div class="oh large-12 columns panel"> <div class="large-12 columns">
<h3><i class="fi-download m10r"></i> <span translate>Backup Profile</span> </h3> <div class="panel">
<p translate class="large-8 columns text-gray">It's important to backup your profile so that you can recover it in case of disaster. The backup will include all your profile's wallets</p> <h2><i class="fi-download m10r"></i> <span translate>Backup Profile</span></h2>
<div class="large-4 columns"> <p translate class="text-gray">It's important to backup your profile so that you can recover it in case of disaster. The backup will include all your profile's wallets</p>
<a translate class="button primary m0" ng-click="downloadBackup()" <a translate class="button primary m0" ng-click="downloadBackup()"
ng-show="!isSafari">Backup profile</a> ng-show="!isSafari">Backup profile</a>
<a translate class="button primary m0" ng-click="viewBackup()" <a translate class="button primary m0" ng-click="viewBackup()"
ng-show="isSafari && !hideViewBackup">View profile backup</a> ng-show="isSafari && !hideViewBackup">View profile backup</a>
</div> <div ng-show="backupPlainText">
<div ng-show="backupPlainText"> <textarea rows="5">{{backupPlainText}}</textarea>
<textarea readonly rows="5">{{backupPlainText}}</textarea> <div class="show-for-large-up">
<div class="show-for-large-up"> <span translate class="size-12">Copy to clipboard</span> <span class="btn-copy" clip-copy="backupPlainText"> </span>
<span translate class="size-12">Copy to clipboard</span> <span class="btn-copy" clip-copy="backupPlainText"> </span> </div>
</div> <div class="hide-for-large-up">
<div class="hide-for-large-up"> <span translate class="size-12">Copy this text as it is in a safe place (notepad or email)</span>
<span translate class="size-12">Copy this text as it is in a safe place (notepad or email)</span> </div>
</div>
</div> </div>
</div> </div>
</div> </div>

View file

@ -1,5 +1,5 @@
<div class="backup" ng-controller="MoreController"> <div class="backup" ng-controller="MoreController">
<h1 class="hide-for-large-up">{{$root.title}} </h1> <h1 class="hide-for-large-up">{{$root.title}}</h1>
<div class="row"> <div class="row">
<form name="settingsForm"> <form name="settingsForm">
<div class="large-6 medium-6 columns"> <div class="large-6 medium-6 columns">