This commit is contained in:
Matias Alejo Garcia 2016-08-24 17:54:01 -03:00
commit 7229adf08a
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
8 changed files with 335 additions and 64 deletions

View file

@ -0,0 +1,32 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-title>Recent Activity</ion-nav-title>
</ion-nav-bar>
<ion-content class="padding" ng-controller="activityController" ng-init="init()">
<div ng-if="fetchingNotifications" class="updatingHistory">
<div class="row" >
<ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
</div>
<div class="row" >
<div class="col" translate>Updating activity. Please stand by.</div>
</div>
</div>
</div>
<div ng-if="!fetchingNotifications">
<div class="list card" ng-if="!fetchingNotifications">
<ul>
<li ng-repeat="x in notifications" class="item item-icon-left" ng-click="x.action()">
<span ng-include="'views/includes/walletActivity.html'"></span>
</li>
<li class="item" ng-show="!notifications[0]">
No recent activity
</li>
</ul>
</div>
</div>
</ion-content>
</ion-view>

View file

@ -0,0 +1,38 @@
<span ng-if="x.types.indexOf('NewIncomingTx')>=0">
<i class="icon ion-arrow-down-c size-21" ng-style="{'color':x.wallet.color}"></i>
{{x.amountStr}}
</span>
<span ng-if="x.types.indexOf('TxProposalRemoved')>=0">
<i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
Proposal Deleted
</span>
<span ng-if="x.types.indexOf('TxProposalRejected')>=0">
<i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
Proposal Rejected
</span>
<span ng-if="x.types.indexOf('TxProposalRemoved') == -1 && x.types.indexOf('TxProposalRejected') == -1">
<span ng-if="x.types.indexOf('NewTxProposal')>=0 ">
<i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
{{x.message}}
</span>
<span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1 ">
<i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
Proposal Accepted
</span>
</span>
<div class="item-note">
<!-- {{x.types}} -->
&middot;
<i class="ion-briefcase" ng-style="{'color':x.wallet.color}"></i>
{{ x.creatorName}}@{{x.wallet.name}}
&middot; <time>{{ x.createdOn * 1000 | amTimeAgo}}</time>
</div>

View file

@ -6,30 +6,36 @@
<ion-content class="padding" ng-controller="tabHomeController">
<div ng-if="events[0]">
<h3 class="title m0" translate>Activity</h3>
<div class="list card">
<h2 translate>Activity</h2>
<div ng-if="fetchingNotifications" class="updatingHistory">
<div class="row" >
<ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
</div>
<div class="row" >
<div class="col" translate>Updating activity. Please stand by.</div>
</div>
</div>
</div>
<div ng-if="!fetchingNotifications">
<div class="list card" ng-if="!fetchingNotifications">
<ul>
<li ng-repeat="tx in txps" class="item item-icon-left" ng-click="xxx(tx)">
<span >
bla bla
</span>
<div class="item-note">
blo blo &middot; <time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
</div>
<li ng-repeat="x in notifications" class="item item-icon-left" ng-click="x.action()">
<span ng-include="'views/includes/walletActivity.html'"></span>
</li>
<li class="item " ng-click="xxx(tx)" ng-show="1">
<li class="item " ui-sref="activity" ng-show="notificationsMore">
<button class="button button-block button-passive">
More (5)
More ({{notificationsMore}})
</button>
</li>
<li class="item" ng-show="!notifications[0]">
No recent activity
</li>
</ul>
</div>
</div>
<div class="row">
<div class="col col-80">
<h2>Wallets </h2>