From e0cb29917fc03a4a5bed660a1cb8d9578cabb006 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Tue, 7 Feb 2017 17:39:01 +0100
Subject: [PATCH] - Peers: fix icons - Block entity: clean raw attribute (not
used)
---
www/js/entities/block.js | 4 +++
www/templates/network/items_peers.html | 2 +-
www/templates/network/view_peer.html | 39 +++++++++++++-------------
3 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/www/js/entities/block.js b/www/js/entities/block.js
index f157ca10c..fd3658fee 100644
--- a/www/js/entities/block.js
+++ b/www/js/entities/block.js
@@ -51,6 +51,8 @@ Block.prototype.parseData = function() {
// TX
this.transactions = this.parseTransactions(this.transactions);
+
+ delete this.raw; // not need
};
Block.prototype.cleanData = function() {
@@ -62,6 +64,8 @@ Block.prototype.cleanData = function() {
delete this.excluded;
delete this.certifications;
delete this.transactions;
+
+ delete this.raw; // not need
};
Block.prototype.parseArrayValues = function(array, itemObjProperties){
diff --git a/www/templates/network/items_peers.html b/www/templates/network/items_peers.html
index c38c71f28..315e941e9 100644
--- a/www/templates/network/items_peers.html
+++ b/www/templates/network/items_peers.html
@@ -26,7 +26,7 @@
ng-click="selectPeer(peer)">
<i class="icon ion-android-desktop"></i>
- <b class="positive" ng-class="{'ion-android-person': peer.uid}" style="position: absolute; top: 11px; left: 27px;"></b>
+ <b class="ion-android-person" ng-if="peer.uid" style="position: absolute; top: 11px; left: 27px;"></b>
<div class="row no-padding">
<div class="col no-padding">
diff --git a/www/templates/network/view_peer.html b/www/templates/network/view_peer.html
index 918789c06..753d540c5 100644
--- a/www/templates/network/view_peer.html
+++ b/www/templates/network/view_peer.html
@@ -4,26 +4,27 @@
</ion-nav-title>
<ion-content class="has-header padding">
- <div class="list">
+ <div class="list">
- <div class="item item-divider">
- <h2 translate>PEER.KNOWN_PEERS</h2>
- </div>
+ <div class="item item-divider">
+ <h2 translate>PEER.KNOWN_PEERS</h2>
+ </div>
- <div class="item center" ng-if="!loaded">
- <ion-spinner class="icon" icon="android"></ion-spinner>
- </div>
+ <div class="item center" ng-if="!loaded">
+ <ion-spinner class="icon" icon="android"></ion-spinner>
+ </div>
- <a class="peer-item item item-icon-left"
- collection-repeat="peer in peers"
- ng-class="{ assertive: !peer.online, balanced: peer.online }"
- target="_blank"
- ng-href="{{peer.getURL()}}/blockchain/current">
- <i class="icon ion-android-globe"></i>
- <h3><span ng-class="{ positive: peer.uid }">{{peer.uid || peer.pubkey.substr(0,8)}}</span> <span class="gray">{{peer.dns && ' | ' + peer.dns}}</span></h3>
- <h4>{{peer.getServer()}} <span class="gray">| {{'PEER.SIGNED_ON_BLOCK' | translate}}</span> #{{peer.blockNumber}}</h4>
- <span class="badge" ng-class="{ 'badge-balanced': peer.hasMainConsensusBlock, 'badge-energized': peer.hasConsensusBlock }">{{peer.current.number}}</span>
- </a>
- </div>
- </ion-content>
+ <a class="peer-item item item-icon-left"
+ collection-repeat="peer in peers"
+ ng-class="{ assertive: !peer.online, balanced: peer.online }"
+ target="_blank"
+ ng-href="{{peer.getURL()}}/blockchain/current">
+ <i class="icon ion-android-desktop"></i>
+ <b class="ion-android-person" ng-if="peer.uid" style="position: absolute; top: 13px; left: 27px;"></b>
+ <h3><span ng-class="{ positive: peer.uid }">{{peer.uid || peer.pubkey.substr(0,8)}}</span> <span class="gray">{{peer.dns && ' | ' + peer.dns}}</span></h3>
+ <h4>{{peer.getServer()}} <span class="gray">| {{'PEER.SIGNED_ON_BLOCK' | translate}}</span> #{{peer.blockNumber}}</h4>
+ <span class="badge" ng-class="{ 'badge-balanced': peer.hasMainConsensusBlock, 'badge-energized': peer.hasConsensusBlock }">{{peer.current.number}}</span>
+ </a>
+ </div>
+ </ion-content>
</ion-view>
--
GitLab