Merge pull request #1420 from bechi/bugs/ui-mobile-02

Bugs/ui mobile 02
This commit is contained in:
Matias Alejo Garcia 2014-09-17 06:30:28 -03:00
commit 533e554341
4 changed files with 45 additions and 36 deletions

View File

@ -122,13 +122,13 @@
display: block;
float: none;
margin: 0 auto;
width: 210px;
height: 210px;
width: 160px;
height: 160px;
}
.panel qrcode canvas {
width: 200px;
height: 200px;
width: 150px;
height: 150px;
}
.addresses .panel {

View File

@ -7,10 +7,10 @@
<div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
<div class="large-12 medium-12" ng-init="showAll=0">
<div class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
<div class="row collapse">
<div class="large-10 medium-9 small-8 column">
<div class="show-for-large-up list-addr">
<div class="oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
<div class="panel radius row show-for-large-up">
<div class="large-9 medium-9 column">
<div class="list-addr">
<i class="fi-thumbnails size-48" ng-click="openAddressModal(addr)">&nbsp;</i>
<span>
<contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right">
@ -18,22 +18,30 @@
<span class="btn-copy" clip-copy="addr.address"> </span>
<small translate class="label" ng-if="addr.isChange">change</small>
</div>
<div class="ellipsis hide-for-large-up list-addr" ng-click="openAddressModal(addr)">
<span>
<contact address="{{addr.address}}">
</span>
<small translate class="label" ng-if="addr.isChange">change</small>
</div>
</div>
<div class="large-2 medium-3 small-4 column text-right">
<div class="large-3 medium-3 column text-right">
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span class="size-12" ng-if="!$root.updatingBalance">
{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
</span>
<p class="size-14" ng-if="!$root.updatingBalance">
<b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
</p>
</div>
</div>
</div> <!-- end of panel large screen -->
<a class="db text-black panel radius row hide-for-large-up list-addr" ng-click="openAddressModal(addr)">
<div class="ellipsis m5b">
<span><contact address="{{addr.address}}"></span>
<small translate class="m0 label" ng-if="addr.isChange">change</small>
</div>
<div class="text-left">
<p class="small-12 columns m15t" ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</p>
<p class="size-14" ng-if="!$root.updatingBalance">
<b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
</p>
</div>
</a> <!-- end of panel mobile -->
</div>
</div>
</div>
@ -45,5 +53,4 @@
</a>
</div>
</div>
</div>

View File

@ -1,20 +1,22 @@
<div class="text-center">
<qrcode size="250" data="bitcoin:{{address.address}}"></qrcode>
<qrcode size="220" data="bitcoin:{{address.address}}"></qrcode>
<div class="m10t">
<h4>{{address.address}} <span class="btn-copy" clip-copy="address.address"></span></h4>
<h4 class="size-12">{{address.address}} <span class="btn-copy" clip-copy="address.address"></span></h4>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<p class="m15b" ng-if="!$root.updatingBalance">
<p class="m15b size-18" ng-if="!$root.updatingBalance">
{{address.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
</p>
<button class="m15t button secondary" open-external address="{{address.address}}">
<i class="fi-link">&nbsp;</i> <span translate>Open in external application</span>
</button><br><br>
<button class="m15t button secondary" ng-show="isMobile" ng-click="mobileCopy(address.address)">
<i class="fi-link">&nbsp;</i> <span translate>Copy to clipboard</span>
</button>
<div class="small-10 columns small-centered">
<button class="m15t button secondary hide-for-large-up" ng-show="isMobile" ng-click="mobileCopy(address.address)">
<i class="fi-link">&nbsp;</i> <span translate>Copy to clipboard</span>
</button>
<a class="m15t secondary" open-external address="{{address.address}}">
<span translate>Open in external application</span>
</a>
</div>
</div>
</div>
<a class="close-reveal-modal" ng-click="cancel()">&#215;</a>

View File

@ -181,9 +181,9 @@
<tr>
<th translate>Label</th>
<th translate>Address</th>
<th translate>Creator</th>
<th translate>Date</th>
<th>&nbsp;</th>
<th class="hide-for-small-only" translate>Creator</th>
<th class="hide-for-small-only" translate>Date</th>
<th class="hide-for-small-only">&nbsp;</th>
</tr>
</thead>
<tbody>
@ -191,10 +191,10 @@
ng-repeat="(addr, info) in $root.wallet.addressBook"
ng-class="{'addressbook-disabled': info.hidden}">
<td><a ng-click="copyAddress(addr)" title="Copy address">{{info.label}}</a></td>
<td class="ellipsis">{{addr}} <span class="btn-copy" clip-copy="addr"></span></td>
<td>{{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}}</td>
<td><time>{{info.createdTs | amCalendar}}</time></td>
<td width="5"><a ng-click="toggleAddressBookEntry(addr)">{{info.hidden ?
<td class="size-12">{{addr}} <span class="btn-copy" clip-copy="addr"></span></td>
<td class="hide-for-small-only">{{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}}</td>
<td class="hide-for-small-only"><time>{{info.createdTs | amCalendar}}</time></td>
<td class="hide-for-small-only" width="5"><a ng-click="toggleAddressBookEntry(addr)">{{info.hidden ?
'Enable' : 'Disable'}}</a></td>
</tr>
</tbody>